Add microVM setup files

.deepsource.toml

@@ -0,0 +1,7 @@
+version = 1
+
+[[analyzers]]
+name = "go"
+
+  [analyzers.meta]
+  import_root = "github.com/Sudo-Ivan/Reticulum-Go"

.dockerignore

@@ -1,37 +0,0 @@
-# Binaries and build folders
-bin/
-*.exe
-*.dll
-*.so
-*.dylib
-
-# Go modules' cache
-/pkg/
-vendor/
-
-# Local test/coverage/log artifacts
-*.test
-*.out
-*.log
-logs/
-coverage.out
-
-# Environment and secret files
-.env
-
-# User/IDE/Editor config
-.idea/
-.vscode/
-*.swp
-.DS_Store
-Thumbs.db
-
-# Example and generated files
-examples/
-*.json
-
-# SBOM and analysis artifacts
-bom.json
-dependency-results.sbom.json
-*.sbom.json
-

.gitea/workflows/bearer.yml

@@ -1,27 +0,0 @@
-name: Bearer
-
-on:
-  push:
-    branches:
-      - main
-      - master
-  pull_request:
-    branches:
-      - main
-      - master
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  scan:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Source
-        uses: https://git.quad4.io/actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - name: Run Bearer Security Scanner
-        uses: https://git.quad4.io/actions/bearer-action@828eeb928ce2f4a7ca5ed57fb8b59508cb8c79bc # v2
-        with:
-          path: ./
-

.gitea/workflows/sbom.yml

@@ -1,54 +0,0 @@
-name: Generate SBOM
-
-on:
-  push:
-    tags:
-      - 'v*'
-  workflow_dispatch:
-
-jobs:
-  generate-sbom:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: https://git.quad4.io/actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-        with:
-          fetch-depth: 0
-          ref: ${{ github.ref }}
-
-      - name: Setup Go
-        uses: https://git.quad4.io/actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
-        with:
-          go-version: '1.25.5'
-
-      - name: Setup Task
-        uses: https://git.quad4.io/actions/setup-task@0ab1b2a65bc55236a3bc64cde78f80e20e8885c2 # v1
-        with:
-          version: '3.46.3'
-
-      - name: Install dependencies
-        run: task deps
-
-      - name: Download Trivy
-        run: |
-          curl -L -o /tmp/trivy.deb https://git.quad4.io/Quad4-Extra/assets/raw/commit/90fdcea1bb71d91df2de6ff2e3897f278413f300/bin/trivy_0.68.2_Linux-64bit.deb
-          sudo dpkg -i /tmp/trivy.deb || sudo apt-get install -f -y
-
-      - name: Generate SBOM
-        run: |
-          mkdir -p sbom
-          trivy fs --format spdx-json --include-dev-deps --output sbom/sbom.spdx.json .
-          trivy fs --format cyclonedx --include-dev-deps --output sbom/sbom.cyclonedx.json .
-
-      - name: Commit and Push Changes
-        run: |
-          git config --global user.name "Gitea Action"
-          git config --global user.email "actions@noreply.quad4.io"
-          git remote set-url origin https://${{ secrets.GITEA_TOKEN }}@git.quad4.io/${{ github.repository }}.git
-          git fetch origin main
-          git checkout main
-          git add sbom/
-          git diff --quiet && git diff --staged --quiet || (git commit -m "Auto-update SBOM [skip ci]" && git push origin main)
-        env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-

.github/workflows/benchmark-gc.yml

@@ -0,0 +1,43 @@
+name: Benchmark GC Performance
+
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  actions: write
+
+jobs:
+  benchmark:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+    - name: Set up Go
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+      with:
+        go-version: '1.25'
+
+    - name: Cache Go modules
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+      with:
+        path: |
+          ~/.cache/go-build
+          ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+
+    - name: Install dependencies
+      run: go mod download
+
+    - name: Run benchmark (standard GC)
+      run: make bench
+
+    - name: Run benchmark (experimental GC)
+      run: make bench-experimental

.github/workflows/build.yml

@@ -16,9 +16,6 @@ jobs:
       matrix:
         goos: [linux, windows, darwin, freebsd]
         goarch: [amd64, arm64, arm]
-        include:
-          - goos: js
-            goarch: wasm
         exclude:
           - goos: darwin
             goarch: arm
@@ -30,38 +27,25 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: https://git.quad4.io/actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Set up Go
-      uses: https://git.quad4.io/actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
         go-version: '1.25'
 
-    - name: Setup Task
-      uses: https://git.quad4.io/actions/setup-task@0ab1b2a65bc55236a3bc64cde78f80e20e8885c2 # v1
-      with:
-        version: '3.46.3'
-
     - name: Build
       id: build_step
       env:
         GOOS: ${{ matrix.goos }}
         GOARCH: ${{ matrix.goarch }}
         GOARM: ${{ matrix.goarch == 'arm' && '6' || '' }}
-        CGO_ENABLED: '0'
       run: |
         output_name="reticulum-go-${GOOS}-${GOARCH}"
-        if [ "$GOOS" = "js" ] && [ "$GOARCH" = "wasm" ]; then
+        if [ "$GOOS" = "windows" ]; then
-          task build-wasm
+          output_name+=".exe"
-          output_name+=".wasm"
-          mv bin/reticulum-go.wasm "${output_name}"
-        else
-          task build
-          if [ "$GOOS" = "windows" ]; then
-            output_name+=".exe"
-          fi
-          mv bin/reticulum-go "${output_name}"
         fi
+        go build -v -ldflags="-s -w" -o "${output_name}" ./cmd/reticulum-go
         echo "Built: ${output_name}"
 
     - name: Calculate SHA256 Checksum
@@ -69,17 +53,15 @@ jobs:
         output_name="reticulum-go-${{ matrix.goos }}-${{ matrix.goarch }}"
         if [ "${{ matrix.goos }}" = "windows" ]; then
           output_name+=".exe"
-        elif [ "${{ matrix.goos }}" = "js" ] && [ "${{ matrix.goarch }}" = "wasm" ]; then
-          output_name+=".wasm"
         fi
-        BINARY_PATH="${output_name}" task checksum
+        sha256sum "${output_name}" > "${output_name}.sha256"
+        echo "Calculated SHA256 for ${output_name}"
 
     - name: Upload Artifact
-      uses: https://git.quad4.io/actions/upload-artifact@ff15f0306b3f739f7b6fd43fb5d26cd321bd4de5 # v3.2.1
+      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
       with:
         name: reticulum-go-${{ matrix.goos }}-${{ matrix.goarch }}
-        path: |
+        path: reticulum-go-${{ matrix.goos }}-${{ matrix.goarch }}*
-          reticulum-go-${{ matrix.goos }}-${{ matrix.goarch }}*
 
   release:
     name: Create Release
@@ -92,14 +74,14 @@ jobs:
 
     steps:
       - name: Download All Build Artifacts
-        uses: https://git.quad4.io/actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           path: ./release-assets
 
       - name: List downloaded files (for debugging)
         run: ls -R ./release-assets
 
-      - name: Create Gitea Release
+      - name: Create GitHub Release
-        uses: https://git.quad4.io/actions/gitea-release-action@4875285c0950474efb7ca2df55233c51333eeb74
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
         with:
           files: ./release-assets/*/*

.github/workflows/go-test.yml

@@ -19,31 +19,32 @@ jobs:
     strategy:
       matrix:
         include:
-          # AMD64 testing on Linux
+          # AMD64 testing across major platforms
           - os: ubuntu-latest
             goarch: amd64
-          # ARM64 testing on Linux
+          - os: windows-latest
+            goarch: amd64
+          - os: macos-latest
+            goarch: amd64
+          # ARM64 testing on supported platforms
           - os: ubuntu-latest
             goarch: arm64
+          - os: macos-latest
+            goarch: arm64
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout Source
-        uses: https://git.quad4.io/actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up Go 1.25
-        uses: https://git.quad4.io/actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: '1.25'
 
-      - name: Setup Task
-        uses: https://git.quad4.io/actions/setup-task@0ab1b2a65bc55236a3bc64cde78f80e20e8885c2 # v1
-        with:
-          version: '3.46.3'
-
       - name: Cache Go modules
-        uses: https://git.quad4.io/actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: |
             ~/go/pkg/mod
@@ -52,28 +53,41 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-${{ matrix.goarch }}-
 
-      - name: Run tests
+      - name: Run Go tests
-        run: task test
+        run: go test -v ./...
 
-      - name: Run tests with race detector (Linux AMD64 only)
+      - name: Run Go tests with race detector (Linux AMD64 only)
         if: matrix.os == 'ubuntu-latest' && matrix.goarch == 'amd64'
-        run: task test-race
+        run: go test -race -v ./...
 
       - name: Test build (ensure compilation works)
         run: |
+          # Test that we can build for the current platform
           echo "Testing build for current platform (${{ matrix.os }}, ${{ matrix.goarch }})..."
-          task build
+          go build -v ./cmd/reticulum-go
 
-      - name: Test binary execution
+      - name: Test binary execution (Linux/macOS)
+        if: matrix.os != 'windows-latest'
         run: |
           echo "Testing binary execution on (${{ matrix.os }}, ${{ matrix.goarch }})..."
-          timeout 5s ./bin/reticulum-go || echo "Binary started successfully (timeout expected)"
+          timeout 5s ./reticulum-go || echo "Binary started successfully (timeout expected)"
+
+      - name: Test binary execution (Windows)
+        if: matrix.os == 'windows-latest'
+        run: |
+          echo "Testing binary execution on (${{ matrix.os }}, ${{ matrix.goarch }})..."
+          # Start the binary and kill after 5 seconds to verify it can start
+          Start-Process -FilePath ".\reticulum-go.exe" -NoNewWindow
+          Start-Sleep -Seconds 5
+          Stop-Process -Name "reticulum-go" -Force -ErrorAction SilentlyContinue
+          echo "Binary started successfully"
+        shell: pwsh
 
       - name: Test cross-compilation (AMD64 runners only)
         if: matrix.goarch == 'amd64'
         run: |
           echo "Testing ARM64 cross-compilation from AMD64..."
-          GOOS=linux GOARCH=arm64 task build
+          go build -v ./cmd/reticulum-go
         env:
           GOOS: linux
           GOARCH: arm64
@@ -82,7 +96,7 @@ jobs:
         if: matrix.goarch == 'amd64'
         run: |
           echo "Testing ARMv6 cross-compilation from AMD64..."
-          GOOS=linux GOARCH=arm GOARM=6 task build
+          go build -v ./cmd/reticulum-go
         env:
           GOOS: linux
           GOARCH: arm

.github/workflows/gosec.yml

@@ -20,8 +20,8 @@ jobs:
       GO111MODULE: on
     steps:
       - name: Checkout Source
-        uses: https://git.quad4.io/actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Run Gosec Security Scanner
-        uses: https://git.quad4.io/actions/gosec@c073629009897d89e03229bc81232c7375892086
+        uses: securego/gosec@master
         with:
           args: ./...

.github/workflows/performance-monitor.yml

@@ -0,0 +1,31 @@
+name: Performance Monitor
+
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+  workflow_dispatch:
+
+jobs:
+  performance-monitor:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+    - name: Set up Go
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+      with:
+        go-version: '1.25'
+
+    - name: Build
+      run: |
+        go build -o bin/reticulum-go ./cmd/reticulum-go
+
+    - name: Run Performance Monitor
+      id: monitor
+      run: |
+        cp tests/scripts/monitor_performance.sh .
+        chmod +x monitor_performance.sh
+        ./monitor_performance.sh

.github/workflows/revive.yml

@@ -14,20 +14,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: https://git.quad4.io/actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Set up Go
-      uses: https://git.quad4.io/actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
         go-version: '1.25'
 
-    - name: Setup Task
-      uses: https://git.quad4.io/actions/setup-task@0ab1b2a65bc55236a3bc64cde78f80e20e8885c2 # v1
-      with:
-        version: '3.46.3'
-
     - name: Install revive
       run: go install github.com/mgechev/revive@latest
 
-    - name: Run lint
+    - name: Run revive
-      run: task lint
+      run: |
+        revive -config revive.toml -formatter stylish ./...

.github/workflows/tinygo.yml

@@ -30,10 +30,10 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: https://git.quad4.io/actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Set up Go
-      uses: https://git.quad4.io/actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
       with:
         go-version: '1.24'
 
@@ -58,7 +58,7 @@ jobs:
         fi
 
     - name: Upload Artifact
-      uses: https://git.quad4.io/actions/upload-artifact@ff15f0306b3f739f7b6fd43fb5d26cd321bd4de5
+      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
       with:
         name: ${{ matrix.name }}
         path: bin/${{ matrix.output }}*

.gitignore

@@ -1,30 +1,9 @@
-# Build artifacts
+logs/
+*.log
+
+.env
+.json
+
 bin/
 
-# Test coverage reports
+examples/
-coverage.out
-
-# Log files
-*.log
-logs/
-
-# Local environment variables
-.env
-
-# JSON assets and auto-generated exports
-*.json
-
-# Example files, not adding them just yet.
-examples/
-
-# OS / Editor files
-.DS_Store       # macOS Finder metadata
-Thumbs.db       # Windows Explorer thumbnail cache
-
-# IDE / Editor config directories
-.idea/          # JetBrains IDEs
-.vscode/        # Visual Studio Code
-
-# Swap and test binaries
-*.swp           # Swap files (e.g. vim)
-*.test          # Go test binaries

CONTRIBUTING.md

@@ -1,7 +1,35 @@
 # Contributing
 
-Send issues, suggestions, `.patch` files, or any feedback to one of the preferred methods:
+Be good to each other.
+
+## Communication
+
+Feel free to join our telegram or matrix channels for this implementation.
+
+- [Matrix](https://matrix.to/#/#reticulum-go-dev:matrix.org)
+- [Telegram](https://t.me/reticulum_go)
+
+## Usage of LLMs and other Generative AI tools
+
+You should not use LLMs and other generative AI tools to write critical parts of the code. They can produce lots of security issues and outdated code when used incorrectly. You are not required to report that you are using these tools. 
+
+## Static Analysis Tools
+
+You are welcome to use the following tools, however there are actions in place to ensure the code is linted and checked with gosec.
+
+### Linting (optional)
+
+[Revive](https://github.com/mgechev/revive)
+
+```bash
+revive -config revive.toml -formatter friendly ./pkg/* ./cmd/* ./internal/*
+```
+
+### Security (optional)
+
+[Gosec](https://github.com/securego/gosec)
+
+```bash
+gosec ./...
+```
 
-1. Reticulum LXMF: `7cc8d66b4f6a0e0e49d34af7f6077b5a` - Ivan (main developer)
-2. XMPP: `ivan@chat.quad4.io` - Ivan (main developer)
-3. Email: `team@quad4.io` - Quad4 Team

LICENSE

@@ -1,12 +1,9 @@
-Copyright (c) 2024-2025 Sudo-Ivan / Quad4.io
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+Copyright 2024-2025 Sudo-Ivan / Quad4.io
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+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:
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+
-PERFORMANCE OF THIS 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.

Makefile

@@ -1,8 +1,7 @@
 GOCMD=go
 GOBUILD=$(GOCMD) build
-GOBUILD_DEBUG=$(GOCMD) build
-GOBUILD_RELEASE=CGO_ENABLED=0 $(GOCMD) build -ldflags="-s -w"
 GOBUILD_EXPERIMENTAL=GOEXPERIMENT=greenteagc $(GOCMD) build
+GOBUILD_RELEASE=CGO_ENABLED=0 $(GOCMD) build -ldflags="-s -w"
 GOCLEAN=$(GOCMD) clean
 GOTEST=$(GOCMD) test
 GOGET=$(GOCMD) get
@@ -16,17 +15,13 @@ MAIN_PACKAGE=./cmd/reticulum-go
 
 ALL_PACKAGES=$$(go list ./... | grep -v /vendor/)
 
-.PHONY: all build build-experimental experimental release debug lint bench bench-experimental bench-compare clean test coverage deps help tinygo-build tinygo-wasm run
+.PHONY: all build build-experimental experimental release lint bench bench-experimental bench-compare clean test coverage deps help tinygo-build tinygo-wasm
 
 all: clean deps build test
 
 build:
 	@mkdir -p $(BUILD_DIR)
-	$(GOBUILD_RELEASE) -o $(BUILD_DIR)/$(BINARY_NAME) $(MAIN_PACKAGE)
+	$(GOBUILD) -o $(BUILD_DIR)/$(BINARY_NAME) $(MAIN_PACKAGE)
-
-debug:
-	@mkdir -p $(BUILD_DIR)
-	$(GOBUILD_DEBUG) -o $(BUILD_DIR)/$(BINARY_NAME) $(MAIN_PACKAGE)
 
 build-experimental:
 	@mkdir -p $(BUILD_DIR)
@@ -61,11 +56,7 @@ coverage:
 	$(GOCMD) tool cover -html=coverage.out
 
 deps:
-	@GOPROXY=$${GOPROXY:-https://proxy.golang.org,direct}; \
-	export GOPROXY; \
 	$(GOMOD) download
-	@GOPROXY=$${GOPROXY:-https://proxy.golang.org,direct}; \
-	export GOPROXY; \
 	$(GOMOD) verify
 
 build-linux:
@@ -112,7 +103,7 @@ build-riscv:
 build-all: build-linux build-windows build-darwin build-freebsd build-openbsd build-netbsd build-arm build-riscv
 
 run:
-	$(GOCMD) run $(MAIN_PACKAGE)
+	@./$(BUILD_DIR)/$(BINARY_NAME)
 
 tinygo-build:
 	@mkdir -p $(BUILD_DIR)
@@ -128,11 +119,10 @@ install:
 help:
 	@echo "Available targets:"
 	@echo "  all                - Clean, download dependencies, build and test"
-	@echo "  build              - Build release binary (no debug symbols, static)"
+	@echo "  build              - Build binary"
-	@echo "  debug              - Build debug binary"
 	@echo "  build-experimental - Build binary with experimental features (GOEXPERIMENT=greenteagc)"
 	@echo "  experimental       - Alias for build-experimental"
-	@echo "  release            - Build stripped static binary for release (alias for build)"
+	@echo "  release            - Build stripped static binary for release"
 	@echo "  lint               - Run revive linter"
 	@echo "  bench              - Run benchmarks with standard GC"
 	@echo "  bench-experimental - Run benchmarks with experimental GC"
@@ -150,7 +140,7 @@ help:
 	@echo "  build-arm    - Build for ARM architectures (arm, arm64)"
 	@echo "  build-riscv  - Build for RISC-V architecture (riscv64)"
 	@echo "  build-all    - Build for all platforms and architectures"
-	@echo "  run                - Run with go run"
+	@echo "  run          - Run reticulum binary"
 	@echo "  tinygo-build - Build binary with TinyGo compiler"
 	@echo "  tinygo-wasm  - Build WebAssembly binary with TinyGo compiler"
 	@echo "  install      - Install dependencies" 

README.md

@@ -1,208 +1,64 @@
+[![Socket Badge](https://socket.dev/api/badge/go/package/github.com/sudo-ivan/reticulum-go?version=v0.4.0)](https://socket.dev/go/package/github.com/sudo-ivan/reticulum-go)
+![Multi-Platform Tests](https://github.com/Sudo-Ivan/Reticulum-Go/actions/workflows/go-test.yml/badge.svg)
+![Gosec Scan](https://github.com/Sudo-Ivan/Reticulum-Go/actions/workflows/gosec.yml/badge.svg)
+[![Multi-Platform Build](https://github.com/Sudo-Ivan/Reticulum-Go/actions/workflows/build.yml/badge.svg)](https://github.com/Sudo-Ivan/Reticulum-Go/actions/workflows/build.yml)
+[![Revive Linter](https://github.com/Sudo-Ivan/Reticulum-Go/actions/workflows/revive.yml/badge.svg)](https://github.com/Sudo-Ivan/Reticulum-Go/actions/workflows/revive.yml)
+
 # Reticulum-Go
 
-[![Revive Lint](https://git.quad4.io/Networks/Reticulum-Go/actions/workflows/revive.yml/badge.svg?branch=main)](https://git.quad4.io/Networks/Reticulum-Go/actions/workflows/revive.yml)
+A Go implementation of the [Reticulum Network Protocol](https://github.com/markqvist/Reticulum).
-[![Go Build](https://git.quad4.io/Networks/Reticulum-Go/actions/workflows/build.yml/badge.svg?branch=main)](https://git.quad4.io/Networks/Reticulum-Go/actions/workflows/build.yml)
-[![Go Test](https://git.quad4.io/Networks/Reticulum-Go/actions/workflows/go-test.yml/badge.svg?branch=main)](https://git.quad4.io/Networks/Reticulum-Go/actions/workflows/go-test.yml)
-[![Gosec](https://git.quad4.io/Networks/Reticulum-Go/actions/workflows/gosec.yml/badge.svg?branch=main)](https://git.quad4.io/Networks/Reticulum-Go/actions/workflows/gosec.yml)
-[![Bearer](https://git.quad4.io/Networks/Reticulum-Go/actions/workflows/bearer.yml/badge.svg?branch=main)](https://git.quad4.io/Networks/Reticulum-Go/actions/workflows/bearer.yml)
 
-A high-performance Go implementation of the [Reticulum Network Stack](https://github.com/markqvist/Reticulum)
+> [!WARNING]  
+> This project is currently in development and is not yet compatible with the Python reference implementation.
 
-## Project Goals:
+## Goals
 
-- **Full Protocol Compatibility**: Maintain complete interoperability with the Python reference implementation
+- To be fully compatible with the Python reference implementation.
-- **Cross-Platform Support**: Support for legacy and modern platforms across multiple architectures
+- Additional privacy and security features.
-- **Performance**: Leverage Go's concurrency model and runtime for improved throughput and latency
+- Support for a broader range of platforms and architectures old and new.
-- **More Privacy and Security**: Additional privacy and security features beyond the base specification
-
-## Prerequisites
-
-- Go 1.24 or later
-- [Task](https://taskfile.dev/) for build automation
-
-Note: You may need to set `alias task='go-task'` in your shell configuration to use `task` instead of `go-task`.
-
-### Nix
-
-If you have Nix installed, you can use the development shell which automatically provides all dependencies including Task:
-
-```bash
-nix develop
-```
-
-This will enter a development environment with Go and Task pre-configured.
 
 ## Quick Start
 
-### Building the Binary
+### Prerequisites
+
+- Go 1.24 or later
+
+### Build
 
 ```bash
-task build
+make build
 ```
 
-The compiled binary will be located in `bin/reticulum-go`.
+### Run
-
-### Running the Application
 
 ```bash
-task run
+make run
 ```
 
-### Running Tests
+### Test
 
 ```bash
-task test
+make test
 ```
 
-## Development
+## Embedded systems and WebAssembly
 
-### Code Quality
+For building for WebAssembly and embedded systems, see the [tinygo branch](https://github.com/Sudo-Ivan/Reticulum-Go/tree/tinygo). Requires TinyGo 0.37.0+.
-
-Format code:
 
 ```bash
-task fmt
+make tinygo-build
+make tinygo-wasm
 ```
 
-Run static analysis checks (formatting, vet, linting):
+### Experimental Features
+
+Build with experimental Green Tea GC (Go 1.25+):
 
 ```bash
-task check
+make build-experimental
 ```
 
-### Testing
+## Official Channels
 
-Run all tests:
+- [Telegram](https://t.me/reticulum_go)
-
+- [Matrix](https://matrix.to/#/#reticulum-go-dev:matrix.org)
-```bash
-task test
-```
-
-Run short tests only:
-
-```bash
-task test-short
-```
-
-Generate coverage report:
-
-```bash
-task coverage
-```
-
-### Benchmarking
-
-Run benchmarks with standard GC:
-
-```bash
-task bench
-```
-
-Run benchmarks with experimental Green Tea GC:
-
-```bash
-task bench-experimental
-```
-
-Compare both GC implementations:
-
-```bash
-task bench-compare
-```
-
-## Tasks
-
-The project uses [Task](https://taskfile.dev/) for all development and build operations.
-
-```
-| Task                | Description                                          |
-|---------------------|------------------------------------------------------|
-| default             | Show available tasks                                 |
-| all                 | Clean, download dependencies, build and test         |
-| build               | Build release binary (stripped, static)              |
-| debug               | Build debug binary                                   |
-| build-experimental  | Build with experimental Green Tea GC (Go 1.25+)      |
-| experimental        | Alias for build-experimental                         |
-| release             | Build stripped static binary for release             |
-| fmt                 | Format Go code                                       |
-| fmt-check           | Check if code is formatted (CI-friendly)             |
-| vet                 | Run go vet                                           |
-| lint                | Run revive linter                                    |
-| scan                | Run gosec security scanner                           |
-| check               | Run fmt-check, vet, and lint                         |
-| bench               | Run benchmarks with standard GC                      |
-| bench-experimental  | Run benchmarks with experimental GC                  |
-| bench-compare       | Run benchmarks with both GC settings                 |
-| clean               | Remove build artifacts                               |
-| test                | Run all tests                                        |
-| test-short          | Run short tests only                                 |
-| test-race           | Run tests with race detector                         |
-| coverage            | Generate test coverage report                        |
-| checksum            | Generate SHA256 checksum for binary                  |
-| deps                | Download and verify dependencies                     |
-| mod-tidy            | Tidy go.mod file                                     |
-| mod-verify          | Verify dependencies                                  |
-| build-linux         | Build for Linux (amd64, arm64, arm, riscv64)         |
-| build-all           | Build for all Linux architectures                    |
-| build-wasm          | Build WebAssembly binary with standard Go compiler   |
-| run                 | Run with go run                                      |
-| tinygo-build        | Build binary with TinyGo compiler                    |
-| tinygo-wasm         | Build WebAssembly binary with TinyGo                 |
-| install             | Install dependencies                                 |
-
-example: task build
-```
-
-## Cross-Platform Builds
-
-### Linux Builds
-
-Build for all Linux architectures:
-
-```bash
-task build-all
-```
-
-Build for specific Linux architecture:
-
-```bash
-task build-linux
-```
-
-## Embedded Systems and WebAssembly
-
-For building for embedded systems, see the [tinygo branch](https://git.quad4.io/Networks/Reticulum-Go/src/branch/tinygo/). Requires TinyGo 0.37.0+.
-
-Build WebAssembly binary with standard Go compiler:
-
-```bash
-task build-wasm
-```
-
-Build with TinyGo:
-
-```bash
-task tinygo-build
-```
-
-Build WebAssembly binary with TinyGo:
-
-```bash
-task tinygo-wasm
-```
-
-## Experimental Features
-
-### Green Tea Garbage Collector
-
-Build with experimental Green Tea GC (requires Go 1.25+):
-
-```bash
-task build-experimental
-```
-
-This enables the experimental garbage collector for performance evaluation and testing.
-
-## License
-
-This project is licensed under the [0BSD](LICENSE) license.

SECURITY.md

@@ -1,13 +1,14 @@
 # Security Policy
 
+We use [Socket](https://socket.dev/), [Deepsource](https://deepsource.com/) and [gosec](https://github.com/securego/gosec) for this project.
+
 ## Supply Chain Security
 
-- All actions are pinned to a full-length commit hash and have been forked to my Gitea instance in https://git.quad4.io/actions
+- All actions are pinned to a commit hash. 
-- BOM generation using CycloneDX
 
 ## Cryptography Dependencies
 
-- golang.org/x/crypto `v0.46.0` for core cryptographic primitives
+- golang.org/x/crypto for core cryptographic primitives
   - hkdf
   - curve25519
 
@@ -21,4 +22,4 @@
 
 ## Reporting a Vulnerability
 
-Refer to [https://quad4.io/security](https://quad4.io/security) for how to report vulnerabilities.
+Please report any security vulnerabilities using Github reporting tool or email to [rns@quad4.io](mailto:rns@quad4.io)

TODO.md

@@ -1,11 +1,172 @@
-Working on creating a project and issues to better track things. Check out https://git.quad4.io/Networks/Reticulum-Go/projects/2
+### Core Components (In Progress) 
 
-## Todo
+*Needs verification with Reticulum 1.0.0.*
 
-- Created dedicated constants.go for each section.
+Last Updated: 2025-09-25
-- Link Request/Response System (in-progress)
+
-- Resource Transfer System  (in-progress)
+- [x] Basic Configuration System
-- Link Keep-Alive & Timeout (in-progress)
+  - [x] Basic config structure
-- Examples (in-progress)
+  - [x] Default settings
-- Tests
+  - [x] Config file loading/saving
-- Documentation
+  - [x] Path management
+
+- [x] Constants Definition (Testing required)
+  - [x] Packet constants
+  - [x] MTU constants
+  - [x] Header types
+  - [x] Additional protocol constants
+
+- [x] Identity Management (Testing required)
+  - [x] Identity creation
+  - [x] Key pair generation
+  - [x] Identity storage/recall
+  - [x] Public key handling
+  - [x] Signature verification
+  - [x] Hash functions
+
+- [x] Cryptographic Primitives (Testing required)
+  - [x] Ed25519
+  - [x] Curve25519
+  - [x] ~~AES-128-CBC~~ (Deprecated)
+  - [x] AES-256-CBC
+  - [x] SHA-256
+  - [x] HKDF
+  - [x] Secure random number generation
+  - [x] HMAC
+
+- [x] Packet Handling (In Progress)
+  - [x] Packet creation
+  - [x] Packet validation
+  - [x] Basic proof system
+  - [x] Packet encryption/decryption
+  - [x] Signature verification
+  - [x] Announce packet structure
+  - [ ] Testing of packet encrypt/decrypt/sign/proof
+  - [ ] Cross-client packet compatibility
+
+- [x] Transport Layer (In Progress)
+  - [x] Path management
+  - [x] Basic packet routing
+  - [x] Announce handling
+  - [x] Link management
+  - [x] Resource cleanup
+  - [x] Network layer integration
+  - [x] Basic announce implementation
+  - [ ] Testing announce from go client to python client
+  - [ ] Testing path finding and caching
+  - [ ] Announce propagation optimization
+
+- [x] Channel System (Testing Required)
+  - [x] Channel creation and management
+  - [x] Message handling
+  - [x] Channel encryption
+  - [x] Channel authentication
+  - [x] Channel callbacks
+  - [x] Integration with Buffer system
+  - [ ] Testing with real network conditions
+  - [ ] Cross-client compatibility testing
+
+- [x] Buffer System (Testing Required)
+  - [x] Raw channel reader/writer
+  - [x] Buffered stream implementation
+  - [x] Compression support
+  - [ ] Testing with Channel system
+  - [ ] Cross-client compatibility testing
+
+- [x] Resolver System (Testing Required)
+  - [x] Name resolution
+  - [x] Cache management
+  - [x] Announce handling
+  - [x] Path resolution
+  - [x] Integration with Transport layer
+  - [ ] Testing with live network
+  - [ ] Cross-client compatibility testing
+
+### Interface Implementation (In Progress)
+- [x] UDP Interface
+- [x] TCP Interface
+- [x] Auto Interface
+- [ ] Local Interface (In Progress)
+- [ ] I2P Interface
+- [ ] Pipe Interface
+- [ ] RNode Interface
+- [ ] RNode Multiinterface
+- [ ] Serial Interface
+- [ ] AX25KISS Interface
+- [ ] Interface Discovery
+- [ ] Interface Modes
+  - [ ] Full mode
+  - [ ] Gateway mode
+  - [ ] Access point mode
+  - [ ] Roaming mode
+  - [ ] Boundary mode
+
+- [ ] Hot reloading interfaces
+
+### Destination System (Testing required)
+- [x] Destination creation
+- [x] Destination types (IN/OUT)
+- [x] Destination aspects
+- [ ] Announce implementation (Fixing)
+- [x] Ratchet support
+- [x] Request handlers
+
+### Link System (Testing required)
+- [x] Link establishment
+- [x] Link teardown
+- [x] Basic packet transfer
+- [x] Encryption/Decryption
+- [x] Identity verification
+- [x] Request/Response handling
+- [x] Session key management
+- [x] Link state tracking
+
+### Resource System (Testing required)
+- [x] Resource creation
+- [x] Resource transfer
+- [x] Compression
+- [x] Progress tracking
+- [x] Segmentation
+- [x] Cleanup routines
+
+### Compatibility
+- [ ] RNS Utilities.
+- [ ] Reticulum config.
+
+### Testing & Validation (Priority)
+- [ ] Unit tests for all components
+  - [ ] Identity tests
+  - [ ] Packet tests
+  - [ ] Transport tests
+  - [ ] Interface tests
+  - [ ] Announce tests
+  - [ ] Channel tests
+  - [ ] Buffer tests
+  - [ ] Resolver tests
+  - [ ] Link tests
+  - [ ] Resource tests
+- [ ] Integration tests
+  - [ ] Go client to Go client
+  - [ ] Go client to Python client
+  - [ ] Interface compatibility
+  - [ ] Path finding and resolution
+  - [ ] Channel system end-to-end
+  - [ ] Buffer system performance
+- [ ] Cross-client compatibility tests
+- [ ] Performance and memory benchmarks
+
+### Documentation
+- [ ] API documentation
+- [ ] Usage examples
+
+### Cleanup
+- [ ] Separate Cryptography from identity.go to their own files
+- [ ] Move constants to their own files
+- [ ] Remove default community interfaces in default config creation after testing
+- [ ] Optimize announce packet creation and caching
+- [ ] Improve debug logging system
+
+### Experimental Features
+- [x] Experimental Green Tea GC (build option) (Go 1.25+)
+- [ ] MicroVM (firecracker)
+- [ ] Kata Container Support

Taskfile.yml

@@ -1,287 +0,0 @@
-version: '3'
-
-vars:
-  GOCMD: go
-  BINARY_NAME: reticulum-go
-  BUILD_DIR: bin
-  MAIN_PACKAGE: ./cmd/reticulum-go
-
-tasks:
-  default:
-    desc: Show available tasks
-    cmds:
-      - task --list
-
-  all:
-    desc: Clean, download dependencies, build and test
-    deps: [clean, deps, build, test]
-
-  build:
-    desc: Build release binary (no debug symbols, static)
-    env:
-      CGO_ENABLED: '0'
-    cmds:
-      - mkdir -p {{.BUILD_DIR}}
-      - '{{.GOCMD}} build -ldflags="-s -w" -o {{.BUILD_DIR}}/{{.BINARY_NAME}} {{.MAIN_PACKAGE}}'
-
-  debug:
-    desc: Build debug binary
-    cmds:
-      - mkdir -p {{.BUILD_DIR}}
-      - '{{.GOCMD}} build -o {{.BUILD_DIR}}/{{.BINARY_NAME}} {{.MAIN_PACKAGE}}'
-
-  build-experimental:
-    desc: Build binary with experimental features (GOEXPERIMENT=greenteagc)
-    env:
-      GOEXPERIMENT: greenteagc
-    cmds:
-      - mkdir -p {{.BUILD_DIR}}
-      - '{{.GOCMD}} build -o {{.BUILD_DIR}}/{{.BINARY_NAME}}-experimental {{.MAIN_PACKAGE}}'
-
-  experimental:
-    desc: Alias for build-experimental
-    cmds:
-      - task: build-experimental
-
-  release:
-    desc: Build stripped static binary for release (alias for build)
-    cmds:
-      - task: build
-
-  fmt:
-    desc: Format Go code
-    cmds:
-      - '{{.GOCMD}} fmt ./...'
-
-  fmt-check:
-    desc: Check if code is formatted (useful for CI)
-    cmds:
-      - '{{.GOCMD}} fmt -d ./... > fmt.diff 2>&1 || true'
-      - 'test -s fmt.diff && (echo "Code is not formatted. Run ''task fmt'' to fix." && cat fmt.diff && rm -f fmt.diff && exit 1) || (rm -f fmt.diff && exit 0)'
-
-  vet:
-    desc: Run go vet
-    cmds:
-      - '{{.GOCMD}} vet ./...'
-
-  lint:
-    desc: Run revive linter
-    cmds:
-      - revive -config revive.toml -formatter friendly ./pkg/* ./cmd/* ./internal/*
-
-  scan:
-    desc: Run gosec security scanner
-    cmds:
-      - gosec ./...
-
-  check:
-    desc: Run fmt-check, vet, and lint
-    deps: [fmt-check, vet, lint]
-
-  bench:
-    desc: Run benchmarks with standard GC
-    cmds:
-      - '{{.GOCMD}} test -bench=. -benchmem ./...'
-
-  bench-experimental:
-    desc: Run benchmarks with experimental GC
-    env:
-      GOEXPERIMENT: greenteagc
-    cmds:
-      - '{{.GOCMD}} test -bench=. -benchmem ./...'
-
-  bench-compare:
-    desc: Run benchmarks with both GC settings
-    deps: [bench, bench-experimental]
-
-  clean:
-    desc: Remove build artifacts
-    cmds:
-      - '{{.GOCMD}} clean'
-      - rm -rf {{.BUILD_DIR}}
-
-  test:
-    desc: Run tests
-    cmds:
-      - '{{.GOCMD}} test -v ./...'
-
-  test-short:
-    desc: Run short tests
-    cmds:
-      - '{{.GOCMD}} test -short -v ./...'
-
-  test-race:
-    desc: Run tests with race detector
-    cmds:
-      - '{{.GOCMD}} test -race -v ./...'
-
-  coverage:
-    desc: Generate test coverage report
-    cmds:
-      - '{{.GOCMD}} test -coverprofile=coverage.out ./...'
-      - '{{.GOCMD}} tool cover -html=coverage.out'
-
-  deps:
-    desc: Download and verify dependencies
-    env:
-      GOPROXY: '{{.GOPROXY | default "https://proxy.golang.org,direct"}}'
-    cmds:
-      - '{{.GOCMD}} mod download'
-      - '{{.GOCMD}} mod verify'
-
-  mod-tidy:
-    desc: Tidy go.mod file
-    cmds:
-      - '{{.GOCMD}} mod tidy'
-
-  mod-verify:
-    desc: Verify dependencies
-    cmds:
-      - '{{.GOCMD}} mod verify'
-
-  build-linux:
-    desc: Build for Linux (amd64, arm64, arm, riscv64)
-    env:
-      CGO_ENABLED: '0'
-    cmds:
-      - mkdir -p {{.BUILD_DIR}}
-      - 'GOOS=linux GOARCH=amd64 {{.GOCMD}} build -o {{.BUILD_DIR}}/{{.BINARY_NAME}}-linux-amd64 {{.MAIN_PACKAGE}}'
-      - 'GOOS=linux GOARCH=arm64 {{.GOCMD}} build -o {{.BUILD_DIR}}/{{.BINARY_NAME}}-linux-arm64 {{.MAIN_PACKAGE}}'
-      - 'GOOS=linux GOARCH=arm {{.GOCMD}} build -o {{.BUILD_DIR}}/{{.BINARY_NAME}}-linux-arm {{.MAIN_PACKAGE}}'
-      - 'GOOS=linux GOARCH=riscv64 {{.GOCMD}} build -o {{.BUILD_DIR}}/{{.BINARY_NAME}}-linux-riscv64 {{.MAIN_PACKAGE}}'
-
-  build-all:
-    desc: Build for all Linux architectures
-    deps: [build-linux]
-
-  run:
-    desc: Run with go run
-    cmds:
-      - '{{.GOCMD}} run {{.MAIN_PACKAGE}}'
-
-  tinygo-build:
-    desc: Build binary with TinyGo compiler
-    cmds:
-      - mkdir -p {{.BUILD_DIR}}
-      - tinygo build -o {{.BUILD_DIR}}/{{.BINARY_NAME}}-tinygo -size short {{.MAIN_PACKAGE}}
-
-  tinygo-wasm:
-    desc: Build WebAssembly binary with TinyGo compiler
-    cmds:
-      - mkdir -p {{.BUILD_DIR}}
-      - tinygo build -target wasm -o {{.BUILD_DIR}}/{{.BINARY_NAME}}.wasm ./cmd/reticulum-wasm
-
-  build-wasm:
-    desc: Build WebAssembly binary with standard Go compiler
-    env:
-      CGO_ENABLED: '0'
-    cmds:
-      - mkdir -p {{.BUILD_DIR}}
-      - 'GOOS=js GOARCH=wasm {{.GOCMD}} build -ldflags="-s -w" -o {{.BUILD_DIR}}/{{.BINARY_NAME}}.wasm ./cmd/reticulum-wasm'
-
-  build-wasm-example:
-    desc: Build WebAssembly example
-    env:
-      CGO_ENABLED: '0'
-    cmds:
-      - mkdir -p examples/wasm/public/static
-      - 'cd examples/wasm && GOOS=js GOARCH=wasm {{.GOCMD}} build -o public/static/reticulum-go.wasm .'
-      - |
-        GOROOT=$({{.GOCMD}} env GOROOT)
-        if [ -f "$GOROOT/lib/wasm/wasm_exec.js" ]; then
-          cp "$GOROOT/lib/wasm/wasm_exec.js" examples/wasm/public/js/
-          echo "wasm_exec.js copied successfully from $GOROOT/lib/wasm/"
-        elif [ -f "$GOROOT/misc/wasm/wasm_exec.js" ]; then
-          cp "$GOROOT/misc/wasm/wasm_exec.js" examples/wasm/public/js/
-          echo "wasm_exec.js copied successfully from $GOROOT/misc/wasm/"
-        else
-          echo "Warning: wasm_exec.js not found"
-          exit 1
-        fi
-
-  install:
-    desc: Install dependencies
-    cmds:
-      - '{{.GOCMD}} mod download'
-
-  checksum:
-    desc: Generate SHA256 checksum for binary (uses BINARY_PATH env var if set, otherwise defaults to bin/reticulum-go)
-    cmds:
-      - |
-        BINARY_PATH="${BINARY_PATH:-{{.BUILD_DIR}}/{{.BINARY_NAME}}}"
-        if [ -f "$BINARY_PATH" ]; then
-          sha256sum "$BINARY_PATH" > "${BINARY_PATH}.sha256"
-          echo "Generated checksum: ${BINARY_PATH}.sha256"
-        else
-          echo "Error: Binary not found at $BINARY_PATH"
-          exit 1
-        fi
-
-  example:announce:
-    desc: Run announce example
-    cmds:
-      - 'cd examples/announce && {{.GOCMD}} run .'
-
-  example:minimal:
-    desc: Run minimal example
-    cmds:
-      - 'cd examples/minimal && {{.GOCMD}} run .'
-
-  example:pageserver:
-    desc: Run pageserver example
-    cmds:
-      - 'cd examples/pageserver && {{.GOCMD}} run .'
-
-  example:echo-listen:
-    desc: Run echo example (waits for incoming connections, P2P peer)
-    cmds:
-      - 'cd examples/echo && {{.GOCMD}} run . --server'
-
-  example:echo-connect:
-    desc: Run echo example (initiates connection to peer, requires DESTINATION env var)
-    cmds:
-      - |
-        if [ -z "${DESTINATION}" ]; then
-          echo "Error: DESTINATION environment variable required (hexadecimal hash of peer)"
-          echo "Example: DESTINATION=abc123... task example:echo-connect"
-          exit 1
-        fi
-        cd examples/echo && {{.GOCMD}} run . --destination="${DESTINATION}"
-
-  example:link-listen:
-    desc: Run link example (waits for incoming link requests, P2P peer)
-    cmds:
-      - 'cd examples/link && {{.GOCMD}} run . --server'
-
-  example:link-connect:
-    desc: Run link example (initiates link to peer, requires DESTINATION env var)
-    cmds:
-      - |
-        if [ -z "${DESTINATION}" ]; then
-          echo "Error: DESTINATION environment variable required (hexadecimal hash of peer)"
-          echo "Example: DESTINATION=abc123... task example:link-connect"
-          exit 1
-        fi
-        cd examples/link && {{.GOCMD}} run . --destination="${DESTINATION}"
-
-  example:filetransfer-share:
-    desc: Run filetransfer example (shares files from directory, P2P peer)
-    cmds:
-      - |
-        if [ -z "${SERVE_PATH}" ]; then
-          echo "Error: SERVE_PATH environment variable required (directory to share)"
-          echo "Example: SERVE_PATH=/path/to/files task example:filetransfer-share"
-          exit 1
-        fi
-        cd examples/filetransfer && {{.GOCMD}} run . --server --serve="${SERVE_PATH}"
-
-  example:filetransfer-fetch:
-    desc: Run filetransfer example (fetches files from peer, requires DESTINATION env var)
-    cmds:
-      - |
-        if [ -z "${DESTINATION}" ]; then
-          echo "Error: DESTINATION environment variable required (hexadecimal hash of peer)"
-          echo "Example: DESTINATION=abc123... task example:filetransfer-fetch"
-          exit 1
-        fi
-        cd examples/filetransfer && {{.GOCMD}} run . --destination="${DESTINATION}"

cmd/reticulum-go/main.go

@@ -6,23 +6,21 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
-	"path/filepath"
 	"runtime"
 	"sync"
 	"syscall"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/internal/config"
+	"github.com/Sudo-Ivan/reticulum-go/internal/config"
-	"git.quad4.io/Networks/Reticulum-Go/internal/storage"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/buffer"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/buffer"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/channel"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/channel"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/debug"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/destination"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/destination"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/identity"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/interfaces"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/interfaces"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/packet"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/packet"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/transport"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/transport"
 )
 
 var (
@@ -35,7 +33,7 @@ const (
 	ANNOUNCE_RATE_GRACE   = 3    // Number of grace announces before enforcing rate
 	ANNOUNCE_RATE_PENALTY = 7200 // Additional penalty time for rate violations
 	MAX_ANNOUNCE_HOPS     = 128  // Maximum number of hops for announces
-	APP_NAME              = "Reticulum-Go Test Node"
+	APP_NAME              = "Go-Client"
 	APP_ASPECT            = "node" // Always use "node" for node announces
 )
 
@@ -50,7 +48,6 @@ type Reticulum struct {
 	announceHistoryMu sync.RWMutex
 	identity          *identity.Identity
 	destination       *destination.Destination
-	storage           *storage.Manager
 
 	// Node-specific information
 	maxTransferSize int16 // Max transfer size in KB
@@ -81,48 +78,19 @@ func NewReticulum(cfg *common.ReticulumConfig) (*Reticulum, error) {
 	}
 	debug.Log(debug.DEBUG_INFO, "Directories initialized")
 
-	// Initialize storage manager
-	storageMgr, err := storage.NewManager()
-	if err != nil {
-		return nil, fmt.Errorf("failed to initialize storage manager: %v", err)
-	}
-	debug.Log(debug.DEBUG_INFO, "Storage manager initialized")
-
 	t := transport.NewTransport(cfg)
 	debug.Log(debug.DEBUG_INFO, "Transport initialized")
 
-	// Load or create identity
+	identity, err := identity.NewIdentity()
-	identityPath := storageMgr.GetIdentityPath()
+	if err != nil {
-
+		return nil, fmt.Errorf("failed to create identity: %v", err)
-	var ident *identity.Identity
-
-	if _, err := os.Stat(identityPath); err == nil {
-		// Identity file exists, load it
-		ident, err = identity.FromFile(identityPath)
-		if err != nil {
-			return nil, fmt.Errorf("failed to load identity: %v", err)
-		}
-		debug.Log(debug.DEBUG_ERROR, "Loaded existing identity", common.STR_HASH, fmt.Sprintf(common.STR_FMT_HEX_LOW, ident.Hash()))
-	} else {
-		// Create new identity
-		ident, err = identity.NewIdentity()
-		if err != nil {
-			return nil, fmt.Errorf("failed to create identity: %v", err)
-		}
-		debug.Log(debug.DEBUG_ERROR, "Created new identity", common.STR_HASH, fmt.Sprintf(common.STR_FMT_HEX_LOW, ident.Hash()))
-
-		// Save it to disk
-		if err := ident.ToFile(identityPath); err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Failed to save identity to file", common.STR_ERROR, err)
-		} else {
-			debug.Log(debug.DEBUG_INFO, "Identity saved to file", "path", identityPath)
-		}
 	}
+	debug.Log(debug.DEBUG_ERROR, "Created new identity", "hash", fmt.Sprintf("%x", identity.Hash()))
 
 	// Create destination
 	debug.Log(debug.DEBUG_INFO, "Creating destination...")
 	dest, err := destination.New(
-		ident,
+		identity,
 		destination.IN,
 		destination.SINGLE,
 		"nomadnetwork",
@@ -132,7 +100,7 @@ func NewReticulum(cfg *common.ReticulumConfig) (*Reticulum, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to create destination: %v", err)
 	}
-	debug.Log(debug.DEBUG_INFO, "Created destination with hash", common.STR_HASH, fmt.Sprintf(common.STR_FMT_HEX_LOW, dest.GetHash()))
+	debug.Log(debug.DEBUG_INFO, "Created destination with hash", "hash", fmt.Sprintf("%x", dest.GetHash()))
 
 	// Set node metadata
 	nodeTimestamp := time.Now().Unix()
@@ -145,13 +113,12 @@ func NewReticulum(cfg *common.ReticulumConfig) (*Reticulum, error) {
 		buffers:         make(map[string]*buffer.Buffer),
 		pathRequests:    make(map[string]*common.PathRequest),
 		announceHistory: make(map[string]announceRecord),
-		identity:        ident,
+		identity:        identity,
 		destination:     dest,
-		storage:         storageMgr,
 
 		// Node-specific information
-		maxTransferSize: common.NUM_500, // Default 500KB
+		maxTransferSize: 500,  // Default 500KB
-		nodeEnabled:     true,           // Enabled by default
+		nodeEnabled:     true, // Enabled by default
 		nodeTimestamp:   nodeTimestamp,
 	}
 
@@ -159,10 +126,9 @@ func NewReticulum(cfg *common.ReticulumConfig) (*Reticulum, error) {
 	dest.AcceptsLinks(true)
 	// Enable ratchets and point to a file for persistence.
 	// The actual path should probably be configurable.
-	ratchetPath := ".git.quad4.io/Networks/Reticulum-Go/storage/ratchets/" + r.identity.GetHexHash()
+	ratchetPath := ".reticulum-go/storage/ratchets/" + r.identity.GetHexHash()
 	dest.EnableRatchets(ratchetPath)
 	dest.SetProofStrategy(destination.PROVE_APP)
-
 	debug.Log(debug.DEBUG_VERBOSE, "Configured destination features")
 
 	// Initialize interfaces from config
@@ -175,7 +141,7 @@ func NewReticulum(cfg *common.ReticulumConfig) (*Reticulum, error) {
 		var err error
 
 		switch ifaceConfig.Type {
-		case common.STR_TCP_CLIENT:
+		case "TCPClientInterface":
 			iface, err = interfaces.NewTCPClientInterface(
 				name,
 				ifaceConfig.TargetHost,
@@ -194,7 +160,7 @@ func NewReticulum(cfg *common.ReticulumConfig) (*Reticulum, error) {
 		case "AutoInterface":
 			iface, err = interfaces.NewAutoInterface(name, ifaceConfig)
 		default:
-			debug.Log(debug.DEBUG_CRITICAL, "Unknown interface type", common.STR_TYPE, ifaceConfig.Type)
+			debug.Log(debug.DEBUG_CRITICAL, "Unknown interface type", "type", ifaceConfig.Type)
 			continue
 		}
 
@@ -202,13 +168,13 @@ func NewReticulum(cfg *common.ReticulumConfig) (*Reticulum, error) {
 			if cfg.PanicOnInterfaceErr {
 				return nil, fmt.Errorf("failed to create interface %s: %v", name, err)
 			}
-			debug.Log(debug.DEBUG_CRITICAL, "Error creating interface", common.STR_NAME, name, common.STR_ERROR, err)
+			debug.Log(debug.DEBUG_CRITICAL, "Error creating interface", "name", name, "error", err)
 			continue
 		}
 
 		// Set packet callback
 		iface.SetPacketCallback(func(data []byte, ni common.NetworkInterface) {
-			debug.Log(debug.DEBUG_INFO, "Packet callback called for interface", common.STR_NAME, ni.GetName(), "data_len", len(data))
+			debug.Log(debug.DEBUG_INFO, "Packet callback called for interface", "name", ni.GetName(), "data_len", len(data))
 			if r.transport != nil {
 				r.transport.HandlePacket(data, ni)
 			} else {
@@ -216,16 +182,16 @@ func NewReticulum(cfg *common.ReticulumConfig) (*Reticulum, error) {
 			}
 		})
 
-		debug.Log(debug.DEBUG_ERROR, "Configuring interface", common.STR_NAME, name, common.STR_TYPE, ifaceConfig.Type)
+		debug.Log(debug.DEBUG_ERROR, "Configuring interface", "name", name, "type", ifaceConfig.Type)
 		r.interfaces = append(r.interfaces, iface)
-		debug.Log(debug.DEBUG_INFO, "Interface started successfully", common.STR_NAME, name)
+		debug.Log(debug.DEBUG_INFO, "Interface started successfully", "name", name)
 	}
 
 	return r, nil
 }
 
 func (r *Reticulum) handleInterface(iface common.NetworkInterface) {
-	debug.Log(debug.DEBUG_INFO, "Setting up interface", common.STR_NAME, iface.GetName(), common.STR_TYPE, fmt.Sprintf("%T", iface))
+	debug.Log(debug.DEBUG_INFO, "Setting up interface", "name", iface.GetName(), "type", fmt.Sprintf("%T", iface))
 
 	ch := channel.NewChannel(&transportWrapper{r.transport})
 	r.channels[iface.GetName()] = ch
@@ -236,11 +202,11 @@ func (r *Reticulum) handleInterface(iface common.NetworkInterface) {
 		ch,
 		func(size int) {
 			data := make([]byte, size)
-			debug.Log(debug.DEBUG_PACKETS, "Interface reading bytes from buffer", common.STR_NAME, iface.GetName(), "size", size)
+			debug.Log(debug.DEBUG_PACKETS, "Interface reading bytes from buffer", "name", iface.GetName(), "size", size)
 			iface.ProcessIncoming(data)
 
-			if len(data) > common.ZERO {
+			if len(data) > 0 {
-				debug.Log(debug.DEBUG_TRACE, "Interface received packet type", common.STR_NAME, iface.GetName(), common.STR_TYPE, fmt.Sprintf("0x%02x", data[0]))
+				debug.Log(debug.DEBUG_TRACE, "Interface received packet type", "name", iface.GetName(), "type", fmt.Sprintf("0x%02x", data[0]))
 				r.transport.HandlePacket(data, iface)
 			}
 		},
@@ -284,7 +250,7 @@ func main() {
 
 	cfg, err := config.InitConfig()
 	if err != nil {
-		debug.GetLogger().Error("Failed to initialize config", common.STR_ERROR, err)
+		debug.GetLogger().Error("Failed to initialize config", "error", err)
 		os.Exit(1)
 	}
 	debug.Log(debug.DEBUG_ERROR, "Configuration loaded", "path", cfg.ConfigPath)
@@ -301,25 +267,25 @@ func main() {
 		}
 
 		cfg.Interfaces["Go-RNS-Testnet"] = &common.InterfaceConfig{
-			Type:       common.STR_TCP_CLIENT,
+			Type:       "TCPClientInterface",
 			Enabled:    false,
 			TargetHost: "127.0.0.1",
-			TargetPort: common.NUM_4242,
+			TargetPort: 4242,
 			Name:       "Go-RNS-Testnet",
 		}
 
 		cfg.Interfaces["Quad4 TCP"] = &common.InterfaceConfig{
-			Type:       common.STR_TCP_CLIENT,
+			Type:       "TCPClientInterface",
 			Enabled:    true,
-			TargetHost: "rns2.quad4.io",
+			TargetHost: "rns.quad4.io",
-			TargetPort: common.NUM_4242,
+			TargetPort: 4242,
 			Name:       "Quad4 TCP",
 		}
 	}
 
 	r, err := NewReticulum(cfg)
 	if err != nil {
-		debug.GetLogger().Error("Failed to create Reticulum instance", common.STR_ERROR, err)
+		debug.GetLogger().Error("Failed to create Reticulum instance", "error", err)
 		os.Exit(1)
 	}
 
@@ -332,7 +298,7 @@ func main() {
 
 	// Start Reticulum
 	if err := r.Start(); err != nil {
-		debug.GetLogger().Error("Failed to start Reticulum", common.STR_ERROR, err)
+		debug.GetLogger().Error("Failed to start Reticulum", "error", err)
 		os.Exit(1)
 	}
 
@@ -342,7 +308,7 @@ func main() {
 
 	debug.Log(debug.DEBUG_CRITICAL, "Shutting down...")
 	if err := r.Stop(); err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "Error during shutdown", common.STR_ERROR, err)
+		debug.Log(debug.DEBUG_CRITICAL, "Error during shutdown", "error", err)
 	}
 	debug.Log(debug.DEBUG_CRITICAL, "Goodbye!")
 }
@@ -359,7 +325,7 @@ func (tw *transportWrapper) RTT() float64 {
 	return tw.GetRTT()
 }
 
-func (tw *transportWrapper) GetStatus() byte {
+func (tw *transportWrapper) GetStatus() int {
 	return transport.STATUS_ACTIVE
 }
 
@@ -395,38 +361,17 @@ func (tw *transportWrapper) SetPacketDelivered(packet interface{}, callback func
 	callback(packet)
 }
 
-func (tw *transportWrapper) GetLinkID() []byte {
-	return nil
-}
-
-func (tw *transportWrapper) HandleInbound(pkt *packet.Packet) error {
-	return nil
-}
-
-func (tw *transportWrapper) ValidateLinkProof(pkt *packet.Packet, networkIface common.NetworkInterface) error {
-	return nil
-}
-
 func initializeDirectories() error {
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		return fmt.Errorf("failed to get home directory: %v", err)
-	}
-
-	basePath := filepath.Join(homeDir, ".reticulum-go")
 	dirs := []string{
-		basePath,
+		".reticulum-go",
-		filepath.Join(basePath, common.STR_STORAGE),
+		".reticulum-go/storage",
-		filepath.Join(basePath, common.STR_STORAGE, "destinations"),
+		".reticulum-go/storage/destinations",
-		filepath.Join(basePath, common.STR_STORAGE, "identities"),
+		".reticulum-go/storage/identities",
-		filepath.Join(basePath, common.STR_STORAGE, "ratchets"),
+		".reticulum-go/storage/ratchets",
-		filepath.Join(basePath, common.STR_STORAGE, "cache"),
-		filepath.Join(basePath, common.STR_STORAGE, "cache", "announces"),
-		filepath.Join(basePath, common.STR_STORAGE, "resources"),
 	}
 
 	for _, dir := range dirs {
-		if err := os.MkdirAll(dir, common.NUM_0700); err != nil { // #nosec G301
+		if err := os.MkdirAll(dir, 0700); err != nil { // #nosec G301
 			return fmt.Errorf("failed to create directory %s: %v", dir, err)
 		}
 	}
@@ -469,9 +414,8 @@ func (r *Reticulum) Start() error {
 
 	// Send initial announce
 	debug.Log(debug.DEBUG_ERROR, "Sending initial announce")
-	nodeName := "Reticulum-Go Test Node"
+	nodeName := "Go-Client"
-	r.destination.SetDefaultAppData([]byte(nodeName))
+	if err := r.destination.Announce([]byte(nodeName)); err != nil {
-	if err := r.destination.Announce(false, nil, nil); err != nil {
 		debug.Log(debug.DEBUG_CRITICAL, "Failed to send initial announce", "error", err)
 	}
 
@@ -482,7 +426,7 @@ func (r *Reticulum) Start() error {
 
 		for {
 			debug.Log(debug.DEBUG_INFO, "Announcing destination...")
-			err := r.destination.Announce(false, nil, nil)
+			err := r.destination.Announce([]byte(nodeName))
 			if err != nil {
 				debug.Log(debug.DEBUG_CRITICAL, "Could not send announce", "error", err)
 			}
@@ -553,15 +497,15 @@ func (h *AnnounceHandler) ReceivedAnnounce(destHash []byte, id interface{}, appD
 	var nodeMaxSize int16
 
 	// Parse msgpack appData from transport announce format
-	if len(appData) > common.ZERO {
+	if len(appData) > 0 {
 		// appData is msgpack array [name, customData]
-		if appData[0] == common.HEX_0x92 { // array of 2 elements
+		if appData[0] == 0x92 { // array of 2 elements
 			// Skip array header and first element (name)
-			pos := common.ONE
+			pos := 1
-			if pos < len(appData) && appData[pos] == common.HEX_0xC4 { // bin 8
+			if pos < len(appData) && appData[pos] == 0xc4 { // bin 8
 				nameLen := int(appData[pos+1])
-				pos += common.TWO + nameLen
+				pos += 2 + nameLen
-				if pos < len(appData) && appData[pos] == common.HEX_0xC4 { // bin 8
+				if pos < len(appData) && appData[pos] == 0xc4 { // bin 8
 					dataLen := int(appData[pos+1])
 					if pos+2+dataLen <= len(appData) {
 						customData := appData[pos+2 : pos+2+dataLen]
@@ -629,26 +573,26 @@ func (r *Reticulum) GetDestination() *destination.Destination {
 func (r *Reticulum) createNodeAppData() []byte {
 	// Create a msgpack array with 3 elements
 	// [Bool, Int32, Int16] for [enable, timestamp, max_transfer_size]
-	appData := []byte{common.HEX_0x93} // Array with 3 elements
+	appData := []byte{0x93} // Array with 3 elements
 
 	// Element 0: Boolean for enable/disable peer
 	if r.nodeEnabled {
-		appData = append(appData, common.HEX_0xC3) // true
+		appData = append(appData, 0xc3) // true
 	} else {
-		appData = append(appData, common.HEX_0xC2) // false
+		appData = append(appData, 0xc2) // false
 	}
 
 	// Element 1: Int32 timestamp (current time)
 	// Update the timestamp when creating new announcements
 	r.nodeTimestamp = time.Now().Unix()
-	appData = append(appData, common.HEX_0xD2) // int32 format
+	appData = append(appData, 0xd2) // int32 format
-	timeBytes := make([]byte, common.FOUR)
+	timeBytes := make([]byte, 4)
 	binary.BigEndian.PutUint32(timeBytes, uint32(r.nodeTimestamp)) // #nosec G115
 	appData = append(appData, timeBytes...)
 
 	// Element 2: Int16 max transfer size in KB
-	appData = append(appData, common.HEX_0xD1) // int16 format
+	appData = append(appData, 0xd1) // int16 format
-	sizeBytes := make([]byte, common.TWO)
+	sizeBytes := make([]byte, 2)
 	binary.BigEndian.PutUint16(sizeBytes, uint16(r.maxTransferSize)) // #nosec G115
 	appData = append(appData, sizeBytes...)
 

cmd/reticulum-go/reticulum_test.go

@@ -1,61 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"git.quad4.io/Networks/Reticulum-Go/internal/config"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
-)
-
-func TestNewReticulum(t *testing.T) {
-	// Set up a temporary home directory for testing
-	tmpDir := t.TempDir()
-	originalHome := os.Getenv(common.STR_HOME)
-	os.Setenv(common.STR_HOME, tmpDir)
-	defer os.Setenv(common.STR_HOME, originalHome)
-
-	cfg := config.DefaultConfig()
-	// Disable interfaces for simple test
-	cfg.Interfaces = make(map[string]*common.InterfaceConfig)
-
-	r, err := NewReticulum(cfg)
-	if err != nil {
-		t.Fatalf("NewReticulum failed: %v", err)
-	}
-	if r == nil {
-		t.Fatal("NewReticulum returned nil")
-	}
-
-	if r.identity == nil {
-		t.Error("Reticulum identity should not be nil")
-	}
-	if r.destination == nil {
-		t.Error("Reticulum destination should not be nil")
-	}
-
-	// Verify directories were created
-	basePath := filepath.Join(tmpDir, ".reticulum-go")
-	if _, err := os.Stat(basePath); os.IsNotExist(err) {
-		t.Error("Base directory not created")
-	}
-}
-
-func TestNodeAppData(t *testing.T) {
-	tmpDir := t.TempDir()
-	os.Setenv(common.STR_HOME, tmpDir)
-
-	r := &Reticulum{
-		nodeEnabled:     true,
-		maxTransferSize: common.NUM_500,
-	}
-
-	data := r.createNodeAppData()
-	if len(data) == common.ZERO {
-		t.Error("createNodeAppData returned empty data")
-	}
-	if data[0] != common.HEX_0x93 {
-		t.Errorf("Expected array header 0x93, got 0x%x", data[0])
-	}
-}

cmd/reticulum-wasm/main.go

@@ -1,25 +0,0 @@
-//go:build js && wasm
-// +build js,wasm
-
-package main
-
-import (
-	"syscall/js"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/wasm"
-)
-
-func main() {
-	debug.Init()
-	debug.SetDebugLevel(debug.DEBUG_INFO)
-
-	wasm.RegisterJSFunctions()
-
-	// Notify JS that reticulum is ready
-	js.Global().Call("reticulumReady")
-
-	// Keep the Go program running
-	select {}
-}
-

flake.lock

@@ -1,61 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1766902085,
-        "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,48 +0,0 @@
-{
-  description = "Reticulum-Go development environment";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-        };
-
-        go = pkgs.go_1_24;
-      in
-      {
-        devShells.default = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            go
-            go-task
-            revive
-            gosec
-            gnumake
-          ];
-
-          shellHook = ''
-            echo "Reticulum-Go development environment"
-            echo "Go version: $(go version)"
-            echo "Task version: $(task --version 2>/dev/null || echo 'not available')"
-            echo "Revive version: $(revive --version 2>/dev/null || echo 'not available')"
-            echo "Gosec version: $(gosec --version 2>/dev/null || echo 'not available')"
-          '';
-        };
-
-        packages.default = pkgs.buildGoModule {
-          pname = "reticulum-go";
-          version = "dev";
-          src = ./.;
-          vendorHash = "";
-          subPackages = [ "cmd/reticulum-go" ];
-          ldflags = [ "-s" "-w" ];
-          CGO_ENABLED = "0";
-        };
-      });
-}
-

go.mod

@@ -1,10 +1,10 @@
-module git.quad4.io/Networks/Reticulum-Go
+module github.com/Sudo-Ivan/reticulum-go
 
 go 1.24.0
 
 require (
 	github.com/vmihailenco/msgpack/v5 v5.4.1
-	golang.org/x/crypto v0.46.0
+	golang.org/x/crypto v0.43.0
 )
 
 require github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect

go.sum

@@ -8,7 +8,7 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
 github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/config/config.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
 )
 
 const (
@@ -70,7 +70,6 @@ func parseValue(value string) interface{} {
 
 // LoadConfig loads the configuration from the specified path
 func LoadConfig(path string) (*common.ReticulumConfig, error) {
-	// bearer:disable go_gosec_filesystem_filereadtaint
 	file, err := os.Open(path) // #nosec G304
 	if err != nil {
 		return nil, err

internal/config/config_test.go

@@ -1,136 +0,0 @@
-package config
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
-)
-
-func TestDefaultConfig(t *testing.T) {
-	cfg := DefaultConfig()
-	if cfg == nil {
-		t.Fatal("DefaultConfig() returned nil")
-	}
-	if !cfg.EnableTransport {
-		t.Error("EnableTransport should be true by default")
-	}
-	if cfg.LogLevel != DefaultLogLevel {
-		t.Errorf("LogLevel should be %d, got %d", DefaultLogLevel, cfg.LogLevel)
-	}
-}
-
-func TestParseValue(t *testing.T) {
-	tests := []struct {
-		input    string
-		expected interface{}
-	}{
-		{"true", true},
-		{"false", false},
-		{"123", 123},
-		{"hello", "hello"},
-		{"  456  ", 456},
-		{"  world  ", "world"},
-	}
-
-	for _, tt := range tests {
-		result := parseValue(tt.input)
-		if result != tt.expected {
-			t.Errorf("parseValue(%q) = %v; want %v", tt.input, result, tt.expected)
-		}
-	}
-}
-
-func TestLoadSaveConfig(t *testing.T) {
-	tmpDir := t.TempDir()
-	configPath := filepath.Join(tmpDir, "config")
-
-	cfg := DefaultConfig()
-	cfg.ConfigPath = configPath
-	cfg.LogLevel = 1
-	cfg.EnableTransport = false
-	cfg.Interfaces["TestInterface"] = &common.InterfaceConfig{
-		Name:    "TestInterface",
-		Type:    "UDPInterface",
-		Enabled: true,
-		Address: "1.2.3.4",
-		Port:    1234,
-	}
-
-	err := SaveConfig(cfg)
-	if err != nil {
-		t.Fatalf("SaveConfig failed: %v", err)
-	}
-
-	loadedCfg, err := LoadConfig(configPath)
-	if err != nil {
-		t.Fatalf("LoadConfig failed: %v", err)
-	}
-
-	if loadedCfg.LogLevel != 1 {
-		t.Errorf("Expected LogLevel 1, got %d", loadedCfg.LogLevel)
-	}
-	if loadedCfg.EnableTransport {
-		t.Error("Expected EnableTransport false")
-	}
-
-	iface, ok := loadedCfg.Interfaces["TestInterface"]
-	if !ok {
-		t.Fatal("TestInterface not found in loaded config")
-	}
-	if iface.Type != "UDPInterface" {
-		t.Errorf("Expected type UDPInterface, got %s", iface.Type)
-	}
-	if iface.Address != "1.2.3.4" {
-		t.Errorf("Expected address 1.2.3.4, got %s", iface.Address)
-	}
-	if iface.Port != 1234 {
-		t.Errorf("Expected port 1234, got %d", iface.Port)
-	}
-}
-
-func TestCreateDefaultConfig(t *testing.T) {
-	tmpDir := t.TempDir()
-	configPath := filepath.Join(tmpDir, "config")
-
-	err := CreateDefaultConfig(configPath)
-	if err != nil {
-		t.Fatalf("CreateDefaultConfig failed: %v", err)
-	}
-
-	if _, err := os.Stat(configPath); os.IsNotExist(err) {
-		t.Fatal("Config file was not created")
-	}
-
-	cfg, err := LoadConfig(configPath)
-	if err != nil {
-		t.Fatalf("LoadConfig failed: %v", err)
-	}
-
-	if _, ok := cfg.Interfaces["Auto Discovery"]; !ok {
-		t.Error("Auto Discovery interface missing")
-	}
-}
-
-func TestGetConfigPath(t *testing.T) {
-	path, err := GetConfigPath()
-	if err != nil {
-		t.Fatalf("GetConfigPath failed: %v", err)
-	}
-	if path == "" {
-		t.Error("GetConfigPath returned empty string")
-	}
-}
-
-func TestEnsureConfigDir(t *testing.T) {
-	// This might modify the actual home directory if not careful,
-	// but EnsureConfigDir uses os.UserHomeDir().
-	// For testing purposes, we can't easily mock os.UserHomeDir() without
-	// changing the code or environment variables.
-	// Since we are in a sandbox, it should be fine.
-	err := EnsureConfigDir()
-	if err != nil {
-		t.Errorf("EnsureConfigDir failed: %v", err)
-	}
-}

internal/storage/storage.go

@@ -1,189 +0,0 @@
-package storage
-
-import (
-	"encoding/hex"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-	"github.com/vmihailenco/msgpack/v5"
-)
-
-type Manager struct {
-	basePath          string
-	ratchetsPath      string
-	identitiesPath    string
-	destinationTable  string
-	knownDestinations string
-	transportIdentity string
-	mutex             sync.RWMutex
-}
-
-type RatchetData struct {
-	RatchetKey []byte `msgpack:"ratchet_key"`
-	Received   int64  `msgpack:"received"`
-}
-
-func NewManager() (*Manager, error) {
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get home directory: %w", err)
-	}
-
-	basePath := filepath.Join(homeDir, ".reticulum-go", "storage")
-
-	m := &Manager{
-		basePath:          basePath,
-		ratchetsPath:      filepath.Join(basePath, "ratchets"),
-		identitiesPath:    filepath.Join(basePath, "identities"),
-		destinationTable:  filepath.Join(basePath, "destination_table"),
-		knownDestinations: filepath.Join(basePath, "known_destinations"),
-		transportIdentity: filepath.Join(basePath, "transport_identity"),
-	}
-
-	if err := m.initializeDirectories(); err != nil {
-		return nil, err
-	}
-
-	return m, nil
-}
-
-func (m *Manager) initializeDirectories() error {
-	dirs := []string{
-		m.basePath,
-		m.ratchetsPath,
-		m.identitiesPath,
-		filepath.Join(m.basePath, "cache"),
-		filepath.Join(m.basePath, "cache", "announces"),
-		filepath.Join(m.basePath, "resources"),
-	}
-
-	for _, dir := range dirs {
-		if err := os.MkdirAll(dir, 0700); err != nil {
-			return fmt.Errorf("failed to create directory %s: %w", dir, err)
-		}
-	}
-
-	return nil
-}
-
-func (m *Manager) SaveRatchet(identityHash []byte, ratchetKey []byte) error {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-
-	hexHash := hex.EncodeToString(identityHash)
-	ratchetDir := filepath.Join(m.ratchetsPath, hexHash)
-
-	if err := os.MkdirAll(ratchetDir, 0700); err != nil {
-		return fmt.Errorf("failed to create ratchet directory: %w", err)
-	}
-
-	ratchetData := RatchetData{
-		RatchetKey: ratchetKey,
-		Received:   time.Now().Unix(),
-	}
-
-	data, err := msgpack.Marshal(ratchetData)
-	if err != nil {
-		return fmt.Errorf("failed to marshal ratchet data: %w", err)
-	}
-
-	ratchetHash := hex.EncodeToString(ratchetKey[:16])
-	outPath := filepath.Join(ratchetDir, ratchetHash+".out")
-	finalPath := filepath.Join(ratchetDir, ratchetHash)
-
-	if err := os.WriteFile(outPath, data, 0600); err != nil {
-		return fmt.Errorf("failed to write ratchet file: %w", err)
-	}
-
-	if err := os.Rename(outPath, finalPath); err != nil {
-		_ = os.Remove(outPath)
-		return fmt.Errorf("failed to move ratchet file: %w", err)
-	}
-
-	debug.Log(debug.DEBUG_VERBOSE, "Saved ratchet to storage", "identity", hexHash, "ratchet", ratchetHash)
-	return nil
-}
-
-func (m *Manager) LoadRatchets(identityHash []byte) (map[string][]byte, error) {
-	m.mutex.RLock()
-	defer m.mutex.RUnlock()
-
-	hexHash := hex.EncodeToString(identityHash)
-	ratchetDir := filepath.Join(m.ratchetsPath, hexHash)
-
-	ratchets := make(map[string][]byte)
-
-	if _, err := os.Stat(ratchetDir); os.IsNotExist(err) {
-		debug.Log(debug.DEBUG_VERBOSE, "No ratchet directory found", "identity", hexHash)
-		return ratchets, nil
-	}
-
-	entries, err := os.ReadDir(ratchetDir)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read ratchet directory: %w", err)
-	}
-
-	now := time.Now().Unix()
-	expiry := int64(2592000) // 30 days
-
-	for _, entry := range entries {
-		if entry.IsDir() {
-			continue
-		}
-
-		filePath := filepath.Join(ratchetDir, entry.Name())
-		// bearer:disable go_gosec_filesystem_filereadtaint
-		data, err := os.ReadFile(filePath) // #nosec G304 - reading from controlled directory
-		if err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Failed to read ratchet file", "file", entry.Name(), "error", err)
-			continue
-		}
-
-		var ratchetData RatchetData
-		if err := msgpack.Unmarshal(data, &ratchetData); err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Corrupted ratchet data", "file", entry.Name(), "error", err)
-			_ = os.Remove(filePath)
-			continue
-		}
-
-		if now > ratchetData.Received+expiry {
-			debug.Log(debug.DEBUG_VERBOSE, "Removing expired ratchet", "file", entry.Name())
-			_ = os.Remove(filePath)
-			continue
-		}
-
-		ratchetHash := entry.Name()
-		ratchets[ratchetHash] = ratchetData.RatchetKey
-	}
-
-	debug.Log(debug.DEBUG_VERBOSE, "Loaded ratchets from storage", "identity", hexHash, "count", len(ratchets))
-	return ratchets, nil
-}
-
-func (m *Manager) GetBasePath() string {
-	return m.basePath
-}
-
-func (m *Manager) GetRatchetsPath() string {
-	return m.ratchetsPath
-}
-
-func (m *Manager) GetIdentityPath() string {
-	return filepath.Join(m.basePath, "identity")
-}
-
-func (m *Manager) GetTransportIdentityPath() string {
-	return m.transportIdentity
-}
-
-func (m *Manager) GetDestinationTablePath() string {
-	return m.destinationTable
-}
-
-func (m *Manager) GetKnownDestinationsPath() string {
-	return m.knownDestinations
-}

internal/storage/storage_test.go

@@ -1,117 +0,0 @@
-package storage
-
-import (
-	"bytes"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestNewManager(t *testing.T) {
-	tmpDir := t.TempDir()
-	originalHome := os.Getenv("HOME")
-	os.Setenv("HOME", tmpDir)
-	defer os.Setenv("HOME", originalHome)
-
-	m, err := NewManager()
-	if err != nil {
-		t.Fatalf("NewManager failed: %v", err)
-	}
-	if m == nil {
-		t.Fatal("NewManager returned nil")
-	}
-
-	expectedBase := filepath.Join(tmpDir, ".reticulum-go", "storage")
-	if m.basePath != expectedBase {
-		t.Errorf("Expected basePath %s, got %s", expectedBase, m.basePath)
-	}
-
-	// Verify directories were created
-	dirs := []string{
-		m.basePath,
-		m.ratchetsPath,
-		m.identitiesPath,
-		filepath.Join(m.basePath, "cache"),
-		filepath.Join(m.basePath, "cache", "announces"),
-		filepath.Join(m.basePath, "resources"),
-	}
-
-	for _, dir := range dirs {
-		if _, err := os.Stat(dir); os.IsNotExist(err) {
-			t.Errorf("Directory %s was not created", dir)
-		}
-	}
-}
-
-func TestSaveLoadRatchets(t *testing.T) {
-	tmpDir := t.TempDir()
-	originalHome := os.Getenv("HOME")
-	os.Setenv("HOME", tmpDir)
-	defer os.Setenv("HOME", originalHome)
-
-	m, err := NewManager()
-	if err != nil {
-		t.Fatalf("NewManager failed: %v", err)
-	}
-
-	identityHash := []byte("test-identity-hash")
-	ratchetKey := make([]byte, 32)
-	for i := range ratchetKey {
-		ratchetKey[i] = byte(i)
-	}
-
-	err = m.SaveRatchet(identityHash, ratchetKey)
-	if err != nil {
-		t.Fatalf("SaveRatchet failed: %v", err)
-	}
-
-	ratchets, err := m.LoadRatchets(identityHash)
-	if err != nil {
-		t.Fatalf("LoadRatchets failed: %v", err)
-	}
-
-	if len(ratchets) != 1 {
-		t.Errorf("Expected 1 ratchet, got %d", len(ratchets))
-	}
-
-	// The key in the map is the hex of first 16 bytes of ratchetKey
-	found := false
-	for _, key := range ratchets {
-		if bytes.Equal(key, ratchetKey) {
-			found = true
-			break
-		}
-	}
-
-	if !found {
-		t.Error("Saved ratchet key not found in loaded ratchets")
-	}
-}
-
-func TestGetters(t *testing.T) {
-	tmpDir := t.TempDir()
-	originalHome := os.Getenv("HOME")
-	os.Setenv("HOME", tmpDir)
-	defer os.Setenv("HOME", originalHome)
-
-	m, _ := NewManager()
-
-	if m.GetBasePath() == "" {
-		t.Error("GetBasePath returned empty string")
-	}
-	if m.GetRatchetsPath() == "" {
-		t.Error("GetRatchetsPath returned empty string")
-	}
-	if m.GetIdentityPath() == "" {
-		t.Error("GetIdentityPath returned empty string")
-	}
-	if m.GetTransportIdentityPath() == "" {
-		t.Error("GetTransportIdentityPath returned empty string")
-	}
-	if m.GetDestinationTablePath() == "" {
-		t.Error("GetDestinationTablePath returned empty string")
-	}
-	if m.GetKnownDestinationsPath() == "" {
-		t.Error("GetKnownDestinationsPath returned empty string")
-	}
-}

microvm/.gitignore

@@ -0,0 +1,5 @@
+firecracker-config.json
+rootfs.ext4
+vmlinux.bin
+reticulum-go
+vsock.sock

microvm/README.md

@@ -0,0 +1,121 @@
+# Reticulum-Go MicroVM
+
+Minimal Firecracker microVM setup for running Reticulum-Go.
+
+## Prerequisites
+
+- Firecracker binary installed
+- Go compiler
+- Root privileges (for network setup and KVM access)
+- Linux host system with KVM support
+- Access to `/dev/kvm`
+
+## Important: Nested Virtualization
+
+**If running inside a QEMU/KVM VM**, nested virtualization must be enabled:
+
+1. **Host QEMU configuration**: Start your QEMU VM with nested KVM:
+   ```bash
+   qemu-system-x86_64 -cpu host -enable-kvm -machine q35,accel=kvm ...
+   ```
+
+2. **Enable nested KVM on host** (if not already):
+   ```bash
+   # Check if nested is enabled
+   cat /sys/module/kvm_intel/parameters/nested  # Intel
+   cat /sys/module/kvm_amd/parameters/nested    # AMD
+   
+   # Enable nested (Intel)
+   echo "options kvm_intel nested=1" | sudo tee /etc/modprobe.d/kvm.conf
+   
+   # Enable nested (AMD)
+   echo "options kvm_amd nested=1" | sudo tee /etc/modprobe.d/kvm.conf
+   
+   # Reboot host
+   ```
+
+3. **Inside the VM**, check if `/dev/kvm` exists:
+   ```bash
+   ls -l /dev/kvm
+   ```
+
+**Alternative**: If nested virtualization isn't available, consider:
+- Running Firecracker directly on the host machine
+- Using QEMU directly instead of Firecracker
+- Using Docker/LXC containers instead
+
+## KVM Setup
+
+Ensure your user has access to `/dev/kvm`:
+
+```bash
+# Check if /dev/kvm exists
+ls -l /dev/kvm
+
+# Add your user to the kvm group (recommended)
+sudo usermod -aG kvm $USER
+
+# Or set ACL (alternative)
+sudo setfacl -m u:$USER:rw /dev/kvm
+
+# Log out and back in for group changes to take effect
+```
+
+## Setup
+
+Run the setup script:
+
+```bash
+./setup.sh
+```
+
+This will:
+- Check for Firecracker installation
+- Download vmlinux.bin kernel
+- Build Reticulum-Go binary
+- Create rootfs.ext4 disk image
+- Generate firecracker-config.json
+
+## Running
+
+1. Create tap interface:
+```bash
+sudo ip tuntap add tap0 mode tap
+sudo ip addr add 172.16.0.1/24 dev tap0
+sudo ip link set tap0 up
+```
+
+2. Enable IP forwarding:
+```bash
+sudo sysctl -w net.ipv4.ip_forward=1
+```
+
+3. Start Firecracker:
+```bash
+# Clean up any old socket files first
+rm -f /tmp/firecracker.sock microvm/vsock.sock
+
+firecracker --api-sock /tmp/firecracker.sock --config-file firecracker-config.json
+```
+
+4. Connect to console (in another terminal):
+```bash
+firecracker --api-sock /tmp/firecracker.sock
+```
+
+## Configuration
+
+- **CPU**: 1 vCPU
+- **Memory**: 128 MiB
+- **Network**: tap0 interface
+- **Disk**: rootfs.ext4 (100MB)
+
+Modify `firecracker-config.json` to adjust resources.
+
+## Files
+
+- `vmlinux.bin` - Linux kernel
+- `rootfs.ext4` - Root filesystem with binary
+- `firecracker-config.json` - Firecracker configuration
+- `reticulum-go` - Compiled binary
+

microvm/setup.sh

@@ -0,0 +1,198 @@
+#!/bin/sh
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+MICROVM_DIR="$SCRIPT_DIR"
+BINARY_NAME="reticulum-go"
+FIRECRACKER_VERSION="v1.8.0"
+FIRECRACKER_REPO="firecracker-microvm/firecracker"
+VMLINUX_URL="https://s3.amazonaws.com/spec.ccfc.min/img/hello/kernel/hello-vmlinux.bin"
+
+check_command() {
+    if ! command -v "$1" >/dev/null 2>&1; then
+        echo "Error: $1 is not installed" >&2
+        exit 1
+    fi
+}
+
+check_firecracker() {
+    if ! command -v firecracker >/dev/null 2>&1; then
+        echo "Error: firecracker binary is not installed" >&2
+        echo "Install from: https://github.com/firecracker-microvm/firecracker/releases" >&2
+        exit 1
+    fi
+    echo "Firecracker found: $(firecracker --version 2>&1 || echo 'version check failed')"
+}
+
+download_vmlinux() {
+    VMLINUX_PATH="$MICROVM_DIR/vmlinux.bin"
+    if [ -f "$VMLINUX_PATH" ]; then
+        echo "vmlinux.bin already exists, skipping download"
+        return
+    fi
+    
+    echo "Downloading vmlinux.bin from AWS S3..."
+    if ! command -v curl >/dev/null 2>&1; then
+        echo "Error: curl required to download vmlinux.bin" >&2
+        exit 1
+    fi
+    
+    curl -fsSL -o "$VMLINUX_PATH" "$VMLINUX_URL"
+    chmod +x "$VMLINUX_PATH"
+    echo "Downloaded: $VMLINUX_PATH"
+}
+
+build_binary() {
+    echo "Building binary..."
+    cd "$PROJECT_ROOT"
+    GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o "$MICROVM_DIR/$BINARY_NAME" ./cmd/reticulum-go
+    echo "Binary built: $MICROVM_DIR/$BINARY_NAME"
+}
+
+create_rootfs() {
+    ROOTFS_PATH="$MICROVM_DIR/rootfs.ext4"
+    if [ -f "$ROOTFS_PATH" ]; then
+        echo "rootfs.ext4 already exists, skipping creation"
+        return
+    fi
+    
+    echo "Creating rootfs..."
+    TMP_DIR=$(mktemp -d)
+    trap "rm -rf $TMP_DIR" EXIT
+    
+    mkdir -p "$TMP_DIR/bin" "$TMP_DIR/etc" "$TMP_DIR/dev" "$TMP_DIR/proc" "$TMP_DIR/sys" "$TMP_DIR/tmp"
+    
+    cp "$MICROVM_DIR/$BINARY_NAME" "$TMP_DIR/bin/"
+    chmod +x "$TMP_DIR/bin/$BINARY_NAME"
+    
+    cat > "$TMP_DIR/etc/inittab" <<EOF
+::sysinit:/bin/sh /etc/rc
+::respawn:/bin/sh
+ttyS0::respawn:/bin/sh
+EOF
+    
+    cat > "$TMP_DIR/etc/rc" <<EOF
+#!/bin/sh
+mount -t proc proc /proc
+mount -t sysfs sysfs /sys
+/bin/$BINARY_NAME
+EOF
+    chmod +x "$TMP_DIR/etc/rc"
+    
+    ROOTFS_SIZE_MB=100
+    dd if=/dev/zero of="$ROOTFS_PATH" bs=1M count="$ROOTFS_SIZE_MB" 2>/dev/null
+    mkfs.ext4 -F "$ROOTFS_PATH" >/dev/null 2>&1
+    
+    TMP_MOUNT=$(mktemp -d)
+    mount -o loop "$ROOTFS_PATH" "$TMP_MOUNT" 2>/dev/null || {
+        echo "Error: Failed to mount rootfs. You may need root privileges or use a different method." >&2
+        rm -rf "$TMP_DIR" "$TMP_MOUNT"
+        exit 1
+    }
+    trap "umount $TMP_MOUNT 2>/dev/null; rm -rf $TMP_DIR $TMP_MOUNT" EXIT
+    
+    cp -r "$TMP_DIR"/* "$TMP_MOUNT/"
+    umount "$TMP_MOUNT"
+    rm -rf "$TMP_DIR" "$TMP_MOUNT"
+    echo "Rootfs created: $ROOTFS_PATH"
+}
+
+create_config() {
+    CONFIG_PATH="$MICROVM_DIR/firecracker-config.json"
+    API_SOCK="${API_SOCK:-/tmp/firecracker.sock}"
+    VSOCK_SOCK="${VSOCK_SOCK:-$MICROVM_DIR/vsock.sock}"
+    
+    cat > "$CONFIG_PATH" <<EOF
+{
+  "boot-source": {
+    "kernel_image_path": "$MICROVM_DIR/vmlinux.bin",
+    "boot_args": "console=ttyS0 reboot=k panic=1 pci=off root=/dev/vda rw"
+  },
+  "drives": [
+    {
+      "drive_id": "rootfs",
+      "path_on_host": "$MICROVM_DIR/rootfs.ext4",
+      "is_root_device": true,
+      "is_read_only": false
+    }
+  ],
+  "machine-config": {
+    "vcpu_count": 1,
+    "mem_size_mib": 128,
+    "smt": false
+  },
+  "network-interfaces": [
+    {
+      "iface_id": "eth0",
+      "guest_mac": "AA:FC:00:00:00:01",
+      "host_dev_name": "tap0"
+    }
+  ],
+  "vsock": {
+    "guest_cid": 3,
+    "uds_path": "$VSOCK_SOCK"
+  }
+}
+EOF
+    echo "Config created: $CONFIG_PATH"
+    echo "API socket: $API_SOCK"
+    echo "VSock socket: $VSOCK_SOCK"
+}
+
+check_firecracker() {
+    if ! command -v firecracker >/dev/null 2>&1; then
+        echo "Error: firecracker binary is not installed" >&2
+        echo "Install from: https://github.com/firecracker-microvm/firecracker/releases" >&2
+        exit 1
+    fi
+    echo "Firecracker found: $(firecracker --version 2>&1 || echo 'version check failed')"
+}
+
+check_kvm() {
+    if [ ! -c /dev/kvm ]; then
+        echo "Warning: /dev/kvm not found. KVM may not be available." >&2
+        return
+    fi
+    
+    if [ ! -r /dev/kvm ] || [ ! -w /dev/kvm ]; then
+        echo "Warning: /dev/kvm exists but you may not have read/write access." >&2
+        echo "Add yourself to the kvm group: sudo usermod -aG kvm $USER" >&2
+        echo "Or set ACL: sudo setfacl -m u:$USER:rw /dev/kvm" >&2
+    else
+        echo "KVM access OK"
+    fi
+}
+
+cleanup_sockets() {
+    echo "Cleaning up old socket files..."
+    rm -f /tmp/firecracker.sock "$MICROVM_DIR/vsock.sock"
+    echo "Cleanup complete"
+}
+
+main() {
+    echo "Setting up microVM..."
+    
+    cleanup_sockets
+    
+    check_command go
+    check_firecracker
+    check_kvm
+    
+    download_vmlinux
+    build_binary
+    create_rootfs
+    create_config
+    
+    echo ""
+    echo "Setup complete!"
+    echo "Files created in: $MICROVM_DIR"
+    echo ""
+    echo "To run the microVM:"
+    echo "  1. Ensure KVM access: sudo usermod -aG kvm $USER (then logout/login)"
+    echo "  2. Create tap interface: sudo ip tuntap add tap0 mode tap"
+    echo "  3. Start firecracker: firecracker --api-sock /tmp/firecracker.sock --config-file $CONFIG_PATH"
+}
+
+main "$@"
+

pkg/announce/announce.go

@@ -6,12 +6,12 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"log"
 	"sync"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/identity"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
 	"golang.org/x/crypto/curve25519"
 )
 
@@ -87,17 +87,17 @@ func New(dest *identity.Identity, destinationHash []byte, destinationName string
 	}
 
 	a := &Announce{
-		mutex:           &sync.RWMutex{},
+		mutex:            &sync.RWMutex{},
-		identity:        dest,
+		identity:         dest,
-		destinationHash: destinationHash,
+		destinationHash:  destinationHash,
-		destinationName: destinationName,
+		destinationName:  destinationName,
-		appData:         appData,
+		appData:          appData,
-		config:          config,
+		config:           config,
-		hops:            0,
+		hops:             0,
-		timestamp:       time.Now().Unix(),
+		timestamp:        time.Now().Unix(),
-		pathResponse:    pathResponse,
+		pathResponse:     pathResponse,
-		retries:         0,
+		retries:          0,
-		handlers:        make([]AnnounceHandler, 0),
+		handlers:         make([]AnnounceHandler, 0),
 	}
 
 	// Get current ratchet ID if enabled
@@ -123,34 +123,34 @@ func (a *Announce) Propagate(interfaces []common.NetworkInterface) error {
 	a.mutex.RLock()
 	defer a.mutex.RUnlock()
 
-	debug.Log(debug.DEBUG_TRACE, "Propagating announce across interfaces", "count", len(interfaces))
+	log.Printf("[DEBUG-7] Propagating announce across %d interfaces", len(interfaces))
 
 	var packet []byte
 	if a.packet != nil {
-		debug.Log(debug.DEBUG_TRACE, "Using cached packet", "bytes", len(a.packet))
+		log.Printf("[DEBUG-7] Using cached packet (%d bytes)", len(a.packet))
 		packet = a.packet
 	} else {
-		debug.Log(debug.DEBUG_TRACE, "Creating new packet")
+		log.Printf("[DEBUG-7] Creating new packet")
 		packet = a.CreatePacket()
 		a.packet = packet
 	}
 
 	for _, iface := range interfaces {
 		if !iface.IsEnabled() {
-			debug.Log(debug.DEBUG_TRACE, "Skipping disabled interface", "name", iface.GetName())
+			log.Printf("[DEBUG-7] Skipping disabled interface: %s", iface.GetName())
 			continue
 		}
 		if !iface.GetBandwidthAvailable() {
-			debug.Log(debug.DEBUG_TRACE, "Skipping interface with insufficient bandwidth", "name", iface.GetName())
+			log.Printf("[DEBUG-7] Skipping interface with insufficient bandwidth: %s", iface.GetName())
 			continue
 		}
 
-		debug.Log(debug.DEBUG_TRACE, "Sending announce on interface", "name", iface.GetName())
+		log.Printf("[DEBUG-7] Sending announce on interface %s", iface.GetName())
 		if err := iface.Send(packet, ""); err != nil {
-			debug.Log(debug.DEBUG_TRACE, "Failed to send on interface", "name", iface.GetName(), "error", err)
+			log.Printf("[DEBUG-7] Failed to send on interface %s: %v", iface.GetName(), err)
 			return fmt.Errorf("failed to propagate on interface %s: %w", iface.GetName(), err)
 		}
-		debug.Log(debug.DEBUG_TRACE, "Successfully sent announce on interface", "name", iface.GetName())
+		log.Printf("[DEBUG-7] Successfully sent announce on interface %s", iface.GetName())
 	}
 
 	return nil
@@ -177,13 +177,13 @@ func (a *Announce) HandleAnnounce(data []byte) error {
 	a.mutex.Lock()
 	defer a.mutex.Unlock()
 
-	debug.Log(debug.DEBUG_TRACE, "Handling announce packet", "bytes", len(data))
+	log.Printf("[DEBUG-7] Handling announce packet of %d bytes", len(data))
 
 	// Minimum packet size validation
 	// header(2) + desthash(16) + context(1) + enckey(32) + signkey(32) + namehash(10) +
 	// randomhash(10) + signature(64) + min app data(3)
 	if len(data) < 170 {
-		debug.Log(debug.DEBUG_TRACE, "Invalid announce data length", "bytes", len(data), "minimum", 170)
+		log.Printf("[DEBUG-7] Invalid announce data length: %d bytes (minimum 170)", len(data))
 		return errors.New("invalid announce data length")
 	}
 
@@ -196,7 +196,7 @@ func (a *Announce) HandleAnnounce(data []byte) error {
 	// Get hop count
 	hopCount := header[1]
 	if hopCount > MAX_HOPS {
-		debug.Log(debug.DEBUG_TRACE, "Announce exceeded max hops", "hops", hopCount)
+		log.Printf("[DEBUG-7] Announce exceeded max hops: %d", hopCount)
 		return errors.New("announce exceeded maximum hop count")
 	}
 
@@ -215,7 +215,8 @@ func (a *Announce) HandleAnnounce(data []byte) error {
 		contextByte = data[34]
 		packetData = data[35:]
 
-		debug.Log(debug.DEBUG_TRACE, "Header type 2 announce", "destHash", fmt.Sprintf("%x", destHash), "transportID", fmt.Sprintf("%x", transportID), "context", contextByte)
+		log.Printf("[DEBUG-7] Header type 2 announce: destHash=%x, transportID=%x, context=%d",
+			destHash, transportID, contextByte)
 	} else {
 		// Header type 1 format: header(2) + desthash(16) + context(1) + data
 		if len(data) < 19 {
@@ -225,7 +226,8 @@ func (a *Announce) HandleAnnounce(data []byte) error {
 		contextByte = data[18]
 		packetData = data[19:]
 
-		debug.Log(debug.DEBUG_TRACE, "Header type 1 announce", "destHash", fmt.Sprintf("%x", destHash), "context", contextByte)
+		log.Printf("[DEBUG-7] Header type 1 announce: destHash=%x, context=%d",
+			destHash, contextByte)
 	}
 
 	// Now parse the data portion according to the spec
@@ -244,10 +246,10 @@ func (a *Announce) HandleAnnounce(data []byte) error {
 	signature := packetData[116:180]
 	appData := packetData[180:]
 
-	debug.Log(debug.DEBUG_TRACE, "Announce fields", "encKey", fmt.Sprintf("%x", encKey), "signKey", fmt.Sprintf("%x", signKey))
+	log.Printf("[DEBUG-7] Announce fields: encKey=%x, signKey=%x", encKey, signKey)
-	debug.Log(debug.DEBUG_TRACE, "Name and random hash", "nameHash", fmt.Sprintf("%x", nameHash), "randomHash", fmt.Sprintf("%x", randomHash))
+	log.Printf("[DEBUG-7] Name hash=%x, random hash=%x", nameHash, randomHash)
-	debug.Log(debug.DEBUG_TRACE, "Ratchet data", "ratchet", fmt.Sprintf("%x", ratchetData[:8]))
+	log.Printf("[DEBUG-7] Ratchet=%x", ratchetData[:8])
-	debug.Log(debug.DEBUG_TRACE, "Signature and app data", "signature", fmt.Sprintf("%x", signature[:8]), "appDataLen", len(appData))
+	log.Printf("[DEBUG-7] Signature=%x, appDataLen=%d", signature[:8], len(appData))
 
 	// Get the destination hash from header
 	var destHash []byte
@@ -302,7 +304,11 @@ func (a *Announce) RequestPath(destHash []byte, onInterface common.NetworkInterf
 	packet = append(packet, byte(0)) // Initial hop count
 
 	// Send path request
-	return onInterface.Send(packet, "")
+	if err := onInterface.Send(packet, ""); err != nil {
+		return err
+	}
+
+	return nil
 }
 
 // CreateHeader creates a Reticulum packet header according to spec
@@ -322,40 +328,36 @@ func CreateHeader(ifacFlag byte, headerType byte, contextFlag byte, propType byt
 func (a *Announce) CreatePacket() []byte {
 	// This function creates the complete announce packet according to the Reticulum specification.
 	// Announce Packet Structure:
-	// [Header (2 bytes)][Dest Hash (16 bytes)][Context (1 byte)][Announce Data]
+	// [Header (2 bytes)][Dest Hash (16 bytes)][Transport ID (16 bytes)][Context (1 byte)][Announce Data]
 	// Announce Data Structure:
-	// [Public Key (64 bytes)][Name Hash (10 bytes)][Random Hash (10 bytes)][Ratchet (32 bytes optional)][Signature (64 bytes)][App Data]
+	// [Public Key (32 bytes)][Signing Key (32 bytes)][Name Hash (10 bytes)][Random Hash (10 bytes)][Ratchet (32 bytes)][Signature (64 bytes)][App Data]
 
 	// 2. Destination Hash
 	destHash := a.destinationHash
-	if len(destHash) > 16 {
+	if len(destHash) == 0 {
-		destHash = destHash[:16]
 	}
 
-	// 3. Announce Data
+	// 3. Transport ID (zeros for broadcast announce)
-	// 3.1 Public Key (full 64 bytes - not split into enc/sign keys in packet)
+	transportID := make([]byte, 16)
+
+	// 5. Announce Data
+	// 5.1 Public Keys
 	pubKey := a.identity.GetPublicKey()
-	if len(pubKey) != 64 {
+	encKey := pubKey[:32]
-		debug.Log(debug.DEBUG_TRACE, "Invalid public key length", "expected", 64, "got", len(pubKey))
+	signKey := pubKey[32:]
-	}
 
-	// 3.2 Name Hash
+	// 5.2 Name Hash
 	nameHash := sha256.Sum256([]byte(a.destinationName))
 	nameHash10 := nameHash[:10]
 
-	// 3.3 Random Hash (5 bytes random + 5 bytes timestamp)
+	// 5.3 Random Hash
 	randomHash := make([]byte, 10)
-	_, err := rand.Read(randomHash[:5])
+	_, err := rand.Read(randomHash)
 	if err != nil {
-		debug.Log(debug.DEBUG_ERROR, "Failed to read random bytes for announce", "error", err)
+		log.Printf("Error reading random bytes for announce: %v", err)
 	}
-	// Add 5 bytes of timestamp
-	timeBytes := make([]byte, 8)
-	// #nosec G115 - Unix timestamp is always positive, no overflow risk
-	binary.BigEndian.PutUint64(timeBytes, uint64(time.Now().Unix()))
-	copy(randomHash[5:], timeBytes[:5])
 
-	// 3.4 Ratchet (only include if exists)
+	// 5.4 Ratchet (only include if exists)
 	var ratchetData []byte
 	currentRatchetKey := a.identity.GetCurrentRatchetKey()
 	if currentRatchetKey != nil {
@@ -365,17 +367,17 @@ func (a *Announce) CreatePacket() []byte {
 			copy(ratchetData, ratchetPub)
 		}
 	}
-
+	
 	// Determine context flag based on whether ratchet exists
 	contextFlag := byte(0)
 	if len(ratchetData) > 0 {
 		contextFlag = 1 // FLAG_SET
 	}
 
-	// 1. Create Header - Use HEADER_TYPE_1
+	// 1. Create Header (now that we know context flag)
 	header := CreateHeader(
 		IFAC_NONE,
-		HEADER_TYPE_1,
+		HEADER_TYPE_2,
 		contextFlag,
 		PROP_TYPE_BROADCAST,
 		DEST_TYPE_SINGLE,
@@ -385,15 +387,13 @@ func (a *Announce) CreatePacket() []byte {
 
 	// 4. Context Byte
 	contextByte := byte(0)
-	if a.pathResponse {
-		contextByte = 0x0B // PATH_RESPONSE context
-	}
 
-	// 3.5 Signature
+	// 5.5 Signature
-	// The signature is calculated over: Dest Hash + Public Key (64 bytes) + Name Hash + Random Hash + Ratchet (if exists) + App Data
+	// The signature is calculated over: Dest Hash + Public Keys + Name Hash + Random Hash + Ratchet (if exists) + App Data
 	validationData := make([]byte, 0)
 	validationData = append(validationData, destHash...)
-	validationData = append(validationData, pubKey...)
+	validationData = append(validationData, encKey...)
+	validationData = append(validationData, signKey...)
 	validationData = append(validationData, nameHash10...)
 	validationData = append(validationData, randomHash...)
 	if len(ratchetData) > 0 {
@@ -402,14 +402,14 @@ func (a *Announce) CreatePacket() []byte {
 	validationData = append(validationData, a.appData...)
 	signature := a.identity.Sign(validationData)
 
-	debug.Log(debug.DEBUG_TRACE, "Creating announce packet", "destHash", fmt.Sprintf("%x", destHash), "pubKeyLen", len(pubKey), "nameHash", fmt.Sprintf("%x", nameHash10), "randomHash", fmt.Sprintf("%x", randomHash), "ratchetLen", len(ratchetData), "sigLen", len(signature), "appDataLen", len(a.appData))
+	// 6. Assemble the packet
-
-	// 5. Assemble the packet (HEADER_TYPE_1 format)
 	packet := make([]byte, 0)
 	packet = append(packet, header...)
 	packet = append(packet, destHash...)
+	packet = append(packet, transportID...)
 	packet = append(packet, contextByte)
-	packet = append(packet, pubKey...)
+	packet = append(packet, encKey...)
+	packet = append(packet, signKey...)
 	packet = append(packet, nameHash10...)
 	packet = append(packet, randomHash...)
 	if len(ratchetData) > 0 {
@@ -418,8 +418,6 @@ func (a *Announce) CreatePacket() []byte {
 	packet = append(packet, signature...)
 	packet = append(packet, a.appData...)
 
-	debug.Log(debug.DEBUG_TRACE, "Final announce packet", "totalBytes", len(packet), "ratchetLen", len(ratchetData), "appDataLen", len(a.appData))
-
 	return packet
 }
 
@@ -454,10 +452,11 @@ func NewAnnouncePacket(pubKey []byte, appData []byte, announceID []byte) *Announ
 
 // NewAnnounce creates a new announce packet for a destination
 func NewAnnounce(identity *identity.Identity, destinationHash []byte, appData []byte, ratchetID []byte, pathResponse bool, config *common.ReticulumConfig) (*Announce, error) {
-	debug.Log(debug.DEBUG_TRACE, "Creating new announce", "destHash", fmt.Sprintf("%x", destinationHash), "appDataLen", len(appData), "hasRatchet", ratchetID != nil, "pathResponse", pathResponse)
+	log.Printf("[DEBUG-7] Creating new announce: destHash=%x, appDataLen=%d, hasRatchet=%v, pathResponse=%v",
+		destinationHash, len(appData), ratchetID != nil, pathResponse)
 
 	if identity == nil {
-		debug.Log(debug.DEBUG_ERROR, "Nil identity provided")
+		log.Printf("[DEBUG-7] Error: nil identity provided")
 		return nil, errors.New("identity cannot be nil")
 	}
 
@@ -470,7 +469,7 @@ func NewAnnounce(identity *identity.Identity, destinationHash []byte, appData []
 	}
 
 	destHash := destinationHash
-	debug.Log(debug.DEBUG_TRACE, "Using provided destination hash", "destHash", fmt.Sprintf("%x", destHash))
+	log.Printf("[DEBUG-7] Using provided destination hash: %x", destHash)
 
 	a := &Announce{
 		identity:        identity,
@@ -484,7 +483,8 @@ func NewAnnounce(identity *identity.Identity, destinationHash []byte, appData []
 		config:          config,
 	}
 
-	debug.Log(debug.DEBUG_TRACE, "Created announce object", "destHash", fmt.Sprintf("%x", a.destinationHash), "hops", a.hops)
+	log.Printf("[DEBUG-7] Created announce object: destHash=%x, hops=%d",
+		a.destinationHash, a.hops)
 
 	// Create initial packet
 	packet := a.CreatePacket()
@@ -492,7 +492,7 @@ func NewAnnounce(identity *identity.Identity, destinationHash []byte, appData []
 
 	// Generate hash
 	hash := a.Hash()
-	debug.Log(debug.DEBUG_TRACE, "Generated announce hash", "hash", fmt.Sprintf("%x", hash))
+	log.Printf("[DEBUG-7] Generated announce hash: %x", hash)
 
 	return a, nil
 }

pkg/announce/announce_test.go

@@ -1,123 +0,0 @@
-package announce
-
-import (
-	"bytes"
-	"sync"
-	"testing"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
-)
-
-type mockAnnounceHandler struct {
-	received bool
-}
-
-func (m *mockAnnounceHandler) AspectFilter() []string {
-	return nil
-}
-
-func (m *mockAnnounceHandler) ReceivedAnnounce(destinationHash []byte, announcedIdentity interface{}, appData []byte) error {
-	m.received = true
-	return nil
-}
-
-func (m *mockAnnounceHandler) ReceivePathResponses() bool {
-	return true
-}
-
-type mockInterface struct {
-	common.BaseInterface
-	sent bool
-}
-
-func (m *mockInterface) Send(data []byte, address string) error {
-	m.sent = true
-	return nil
-}
-
-func (m *mockInterface) GetBandwidthAvailable() bool {
-	return true
-}
-
-func (m *mockInterface) IsEnabled() bool {
-	return true
-}
-
-func TestNewAnnounce(t *testing.T) {
-	id, _ := identity.New()
-	destHash := make([]byte, 16)
-	config := &common.ReticulumConfig{}
-
-	ann, err := New(id, destHash, "testapp", []byte("appdata"), false, config)
-	if err != nil {
-		t.Fatalf("New failed: %v", err)
-	}
-	if ann == nil {
-		t.Fatal("New returned nil")
-	}
-
-	if !bytes.Equal(ann.destinationHash, destHash) {
-		t.Error("Destination hash doesn't match")
-	}
-}
-
-func TestCreateAndHandleAnnounce(t *testing.T) {
-	id, _ := identity.New()
-	destHash := make([]byte, 16)
-	config := &common.ReticulumConfig{}
-
-	ann, _ := New(id, destHash, "testapp", []byte("appdata"), false, config)
-	packet := ann.CreatePacket()
-
-	handler := &mockAnnounceHandler{}
-	ann.RegisterHandler(handler)
-
-	err := ann.HandleAnnounce(packet)
-	if err != nil {
-		t.Fatalf("HandleAnnounce failed: %v", err)
-	}
-
-	if !handler.received {
-		t.Error("Handler did not receive announce")
-	}
-}
-
-func TestPropagate(t *testing.T) {
-	id, _ := identity.New()
-	destHash := make([]byte, 16)
-	config := &common.ReticulumConfig{}
-
-	ann, _ := New(id, destHash, "testapp", []byte("appdata"), false, config)
-
-	iface := &mockInterface{}
-	iface.Name = "testiface"
-	iface.Online = true
-	iface.Enabled = true
-
-	err := ann.Propagate([]common.NetworkInterface{iface})
-	if err != nil {
-		t.Fatalf("Propagate failed: %v", err)
-	}
-
-	if !iface.sent {
-		t.Error("Packet was not sent on interface")
-	}
-}
-
-func TestHandlerRegistration(t *testing.T) {
-	ann := &Announce{
-		mutex: &sync.RWMutex{},
-	}
-	handler := &mockAnnounceHandler{}
-
-	ann.RegisterHandler(handler)
-	if len(ann.handlers) != 1 {
-		t.Errorf("Expected 1 handler, got %d", len(ann.handlers))
-	}
-
-	ann.DeregisterHandler(handler)
-	if len(ann.handlers) != 0 {
-		t.Errorf("Expected 0 handlers, got %d", len(ann.handlers))
-	}
-}

pkg/buffer/buffer.go

@@ -8,7 +8,7 @@ import (
 	"io"
 	"sync"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/channel"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/channel"
 )
 
 const (
@@ -16,19 +16,6 @@ const (
 	MaxChunkLen   = 16 * 1024
 	MaxDataLen    = 457 // MDU - 2 - 6 (2 for stream header, 6 for channel envelope)
 	CompressTries = 4
-
-	// Stream header flags
-	StreamHeaderEOF        = 0x8000
-	StreamHeaderCompressed = 0x4000
-
-	// Message type
-	StreamDataMessageType = 0x01
-
-	// Header size
-	StreamHeaderSize = 2
-
-	// Compression threshold
-	CompressThreshold = 32
 )
 
 type StreamDataMessage struct {
@@ -41,10 +28,10 @@ type StreamDataMessage struct {
 func (m *StreamDataMessage) Pack() ([]byte, error) {
 	headerVal := uint16(m.StreamID & StreamIDMax)
 	if m.EOF {
-		headerVal |= StreamHeaderEOF
+		headerVal |= 0x8000
 	}
 	if m.Compressed {
-		headerVal |= StreamHeaderCompressed
+		headerVal |= 0x4000
 	}
 
 	buf := new(bytes.Buffer)
@@ -56,32 +43,30 @@ func (m *StreamDataMessage) Pack() ([]byte, error) {
 }
 
 func (m *StreamDataMessage) GetType() uint16 {
-	return StreamDataMessageType
+	return 0x01 // Assign appropriate message type constant
 }
 
 func (m *StreamDataMessage) Unpack(data []byte) error {
-	if len(data) < StreamHeaderSize {
+	if len(data) < 2 {
 		return io.ErrShortBuffer
 	}
 
-	header := binary.BigEndian.Uint16(data[:StreamHeaderSize])
+	header := binary.BigEndian.Uint16(data[:2])
 	m.StreamID = header & StreamIDMax
-	m.EOF = (header & StreamHeaderEOF) != 0
+	m.EOF = (header & 0x8000) != 0
-	m.Compressed = (header & StreamHeaderCompressed) != 0
+	m.Compressed = (header & 0x4000) != 0
-	m.Data = data[StreamHeaderSize:]
+	m.Data = data[2:]
 
 	return nil
 }
 
 type RawChannelReader struct {
-	streamID         int
+	streamID  int
-	channel          *channel.Channel
+	channel   *channel.Channel
-	buffer           *bytes.Buffer
+	buffer    *bytes.Buffer
-	eof              bool
+	eof       bool
-	callbacks        map[int]func(int)
+	callbacks []func(int)
-	nextCallbackID   int
+	mutex     sync.RWMutex
-	messageHandlerID int
-	mutex            sync.RWMutex
 }
 
 func NewRawChannelReader(streamID int, ch *channel.Channel) *RawChannelReader {
@@ -89,26 +74,28 @@ func NewRawChannelReader(streamID int, ch *channel.Channel) *RawChannelReader {
 		streamID:  streamID,
 		channel:   ch,
 		buffer:    bytes.NewBuffer(nil),
-		callbacks: make(map[int]func(int)),
+		callbacks: make([]func(int), 0),
 	}
 
-	reader.messageHandlerID = ch.AddMessageHandler(reader.HandleMessage)
+	ch.AddMessageHandler(reader.HandleMessage)
 	return reader
 }
 
-func (r *RawChannelReader) AddReadyCallback(cb func(int)) int {
+func (r *RawChannelReader) AddReadyCallback(cb func(int)) {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
-	id := r.nextCallbackID
+	r.callbacks = append(r.callbacks, cb)
-	r.nextCallbackID++
-	r.callbacks[id] = cb
-	return id
 }
 
-func (r *RawChannelReader) RemoveReadyCallback(id int) {
+func (r *RawChannelReader) RemoveReadyCallback(cb func(int)) {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
-	delete(r.callbacks, id)
+	for i, fn := range r.callbacks {
+		if &fn == &cb {
+			r.callbacks = append(r.callbacks[:i], r.callbacks[i+1:]...)
+			break
+		}
+	}
 }
 
 func (r *RawChannelReader) Read(p []byte) (n int, err error) {
@@ -123,11 +110,11 @@ func (r *RawChannelReader) Read(p []byte) (n int, err error) {
 	if err == io.EOF && !r.eof {
 		err = nil
 	}
-	return n, err
+	return
 }
 
 func (r *RawChannelReader) HandleMessage(msg channel.MessageBase) bool { // #nosec G115
-	if streamMsg, ok := msg.(*StreamDataMessage); ok && streamMsg.StreamID == uint16(r.streamID) {
+       if streamMsg, ok := msg.(*StreamDataMessage); ok && streamMsg.StreamID == uint16(r.streamID) {
 		r.mutex.Lock()
 		defer r.mutex.Unlock()
 
@@ -176,7 +163,7 @@ func (w *RawChannelWriter) Write(p []byte) (n int, err error) {
 		EOF:      w.eof,
 	}
 
-	if len(p) > CompressThreshold {
+	if len(p) > 32 {
 		for try := 1; try < CompressTries; try++ {
 			chunkLen := len(p) / try
 			compressed := compressData(p[:chunkLen])
@@ -214,7 +201,10 @@ func (b *Buffer) Read(p []byte) (n int, err error) {
 }
 
 func (b *Buffer) Close() error {
-	return b.ReadWriter.Writer.Flush()
+	if err := b.ReadWriter.Writer.Flush(); err != nil {
+		return err
+	}
+	return nil
 }
 
 func CreateReader(streamID int, ch *channel.Channel, readyCallback func(int)) *bufio.Reader {
@@ -240,7 +230,6 @@ func compressData(data []byte) []byte {
 	var compressed bytes.Buffer
 	w := bytes.NewBuffer(data)
 	r := bzip2.NewReader(w)
-	// bearer:disable go_gosec_filesystem_decompression_bomb
 	_, err := io.Copy(&compressed, r) // #nosec G104 #nosec G110
 	if err != nil {
 		// Handle error, e.g., log it or return an error
@@ -254,7 +243,6 @@ func decompressData(data []byte) []byte {
 	var decompressed bytes.Buffer
 	// Limit the amount of data read to prevent decompression bombs
 	limitedReader := io.LimitReader(reader, MaxChunkLen) // #nosec G110
-	// bearer:disable go_gosec_filesystem_decompression_bomb
 	_, err := io.Copy(&decompressed, limitedReader)
 	if err != nil {
 		// Handle error, e.g., log it or return an error

pkg/buffer/buffer_test.go

@@ -1,449 +0,0 @@
-package buffer
-
-import (
-	"bufio"
-	"bytes"
-	"io"
-	"testing"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/channel"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/packet"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/transport"
-)
-
-func TestStreamDataMessage_Pack(t *testing.T) {
-	tests := []struct {
-		name       string
-		streamID   uint16
-		data       []byte
-		eof        bool
-		compressed bool
-	}{
-		{
-			name:       "NormalMessage",
-			streamID:   123,
-			data:       []byte("test data"),
-			eof:        false,
-			compressed: false,
-		},
-		{
-			name:       "EOFMessage",
-			streamID:   456,
-			data:       []byte("final data"),
-			eof:        true,
-			compressed: false,
-		},
-		{
-			name:       "CompressedMessage",
-			streamID:   789,
-			data:       []byte("compressed data"),
-			eof:        false,
-			compressed: true,
-		},
-		{
-			name:       "EmptyData",
-			streamID:   0,
-			data:       []byte{},
-			eof:        false,
-			compressed: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			msg := &StreamDataMessage{
-				StreamID:   tt.streamID,
-				Data:       tt.data,
-				EOF:        tt.eof,
-				Compressed: tt.compressed,
-			}
-
-			packed, err := msg.Pack()
-			if err != nil {
-				t.Fatalf("Pack() failed: %v", err)
-			}
-
-			if len(packed) < 2 {
-				t.Error("Packed message too short")
-			}
-
-			unpacked := &StreamDataMessage{}
-			if err := unpacked.Unpack(packed); err != nil {
-				t.Fatalf("Unpack() failed: %v", err)
-			}
-
-			if unpacked.StreamID != tt.streamID {
-				t.Errorf("StreamID = %d, want %d", unpacked.StreamID, tt.streamID)
-			}
-			if unpacked.EOF != tt.eof {
-				t.Errorf("EOF = %v, want %v", unpacked.EOF, tt.eof)
-			}
-			if unpacked.Compressed != tt.compressed {
-				t.Errorf("Compressed = %v, want %v", unpacked.Compressed, tt.compressed)
-			}
-			if !bytes.Equal(unpacked.Data, tt.data) {
-				t.Errorf("Data = %v, want %v", unpacked.Data, tt.data)
-			}
-		})
-	}
-}
-
-func TestStreamDataMessage_Unpack(t *testing.T) {
-	tests := []struct {
-		name      string
-		data      []byte
-		wantError bool
-	}{
-		{
-			name:      "ValidMessage",
-			data:      []byte{0x00, 0x7B, 'h', 'e', 'l', 'l', 'o'},
-			wantError: false,
-		},
-		{
-			name:      "TooShort",
-			data:      []byte{0x00},
-			wantError: true,
-		},
-		{
-			name:      "Empty",
-			data:      []byte{},
-			wantError: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			msg := &StreamDataMessage{}
-			err := msg.Unpack(tt.data)
-			if (err != nil) != tt.wantError {
-				t.Errorf("Unpack() error = %v, wantError %v", err, tt.wantError)
-			}
-		})
-	}
-}
-
-func TestStreamDataMessage_GetType(t *testing.T) {
-	msg := &StreamDataMessage{}
-	if msg.GetType() != 0x01 {
-		t.Errorf("GetType() = %d, want 0x01", msg.GetType())
-	}
-}
-
-func TestRawChannelReader_AddCallback(t *testing.T) {
-	reader := &RawChannelReader{
-		streamID:  1,
-		buffer:    bytes.NewBuffer(nil),
-		callbacks: make(map[int]func(int)),
-	}
-
-	cb := func(int) {}
-
-	reader.AddReadyCallback(cb)
-	if len(reader.callbacks) != 1 {
-		t.Error("Callback should be added")
-	}
-}
-
-func TestBuffer_Write(t *testing.T) {
-	buf := &Buffer{
-		ReadWriter: bufio.NewReadWriter(bufio.NewReader(bytes.NewBuffer(nil)), bufio.NewWriter(bytes.NewBuffer(nil))),
-	}
-
-	data := []byte("test")
-	n, err := buf.Write(data)
-	if err != nil {
-		t.Errorf("Write() error = %v", err)
-	}
-	if n != len(data) {
-		t.Errorf("Write() = %d bytes, want %d", n, len(data))
-	}
-}
-
-func TestBuffer_Read(t *testing.T) {
-	buf := &Buffer{
-		ReadWriter: bufio.NewReadWriter(bufio.NewReader(bytes.NewBuffer([]byte("test data"))), bufio.NewWriter(bytes.NewBuffer(nil))),
-	}
-
-	data := make([]byte, 10)
-	n, err := buf.Read(data)
-	if err != nil && err != io.EOF {
-		t.Errorf("Read() error = %v", err)
-	}
-	if n <= 0 {
-		t.Errorf("Read() = %d bytes, want > 0", n)
-	}
-}
-
-func TestBuffer_Close(t *testing.T) {
-	buf := &Buffer{
-		ReadWriter: bufio.NewReadWriter(bufio.NewReader(bytes.NewBuffer(nil)), bufio.NewWriter(bytes.NewBuffer(nil))),
-	}
-
-	if err := buf.Close(); err != nil {
-		t.Errorf("Close() error = %v", err)
-	}
-}
-
-func TestStreamIDMax(t *testing.T) {
-	if StreamIDMax != 0x3fff {
-		t.Errorf("StreamIDMax = %d, want %d", StreamIDMax, 0x3fff)
-	}
-}
-
-func TestMaxChunkLen(t *testing.T) {
-	if MaxChunkLen != 16*1024 {
-		t.Errorf("MaxChunkLen = %d, want %d", MaxChunkLen, 16*1024)
-	}
-}
-
-func TestMaxDataLen(t *testing.T) {
-	if MaxDataLen != 457 {
-		t.Errorf("MaxDataLen = %d, want %d", MaxDataLen, 457)
-	}
-}
-
-type mockLink struct {
-	status byte
-	rtt    float64
-}
-
-func (m *mockLink) GetStatus() byte                                                       { return m.status }
-func (m *mockLink) GetRTT() float64                                                       { return m.rtt }
-func (m *mockLink) RTT() float64                                                          { return m.rtt }
-func (m *mockLink) GetLinkID() []byte                                                     { return []byte("testlink") }
-func (m *mockLink) Send(data []byte) interface{}                                          { return &packet.Packet{Raw: data} }
-func (m *mockLink) Resend(p interface{}) error                                            { return nil }
-func (m *mockLink) SetPacketTimeout(p interface{}, cb func(interface{}), t time.Duration) {}
-func (m *mockLink) SetPacketDelivered(p interface{}, cb func(interface{}))                {}
-func (m *mockLink) HandleInbound(pkt *packet.Packet) error                                { return nil }
-func (m *mockLink) ValidateLinkProof(pkt *packet.Packet, networkIface common.NetworkInterface) error {
-	return nil
-}
-
-func TestNewRawChannelReader(t *testing.T) {
-	link := &mockLink{status: transport.STATUS_ACTIVE}
-	ch := channel.NewChannel(link)
-	reader := NewRawChannelReader(123, ch)
-
-	if reader.streamID != 123 {
-		t.Errorf("streamID = %d, want %d", reader.streamID, 123)
-	}
-	if reader.channel != ch {
-		t.Error("channel not set correctly")
-	}
-	if reader.buffer == nil {
-		t.Error("buffer is nil")
-	}
-	if reader.callbacks == nil {
-		t.Error("callbacks is nil")
-	}
-}
-
-func TestRawChannelReader_RemoveReadyCallback(t *testing.T) {
-	reader := &RawChannelReader{
-		streamID:  1,
-		buffer:    bytes.NewBuffer(nil),
-		callbacks: make(map[int]func(int)),
-	}
-
-	cb1 := func(int) {}
-	cb2 := func(int) {}
-
-	id1 := reader.AddReadyCallback(cb1)
-	reader.AddReadyCallback(cb2)
-
-	if len(reader.callbacks) != 2 {
-		t.Errorf("callbacks length = %d, want 2", len(reader.callbacks))
-	}
-
-	reader.RemoveReadyCallback(id1)
-
-	if len(reader.callbacks) != 1 {
-		t.Errorf("RemoveReadyCallback did not remove callback, length = %d", len(reader.callbacks))
-	}
-}
-
-func TestRawChannelReader_Read(t *testing.T) {
-	reader := &RawChannelReader{
-		streamID: 1,
-		buffer:   bytes.NewBuffer([]byte("test data")),
-		eof:      false,
-	}
-
-	data := make([]byte, 10)
-	n, err := reader.Read(data)
-	if err != nil {
-		t.Errorf("Read() error = %v", err)
-	}
-	if n == 0 {
-		t.Error("Read() returned 0 bytes")
-	}
-
-	reader.eof = true
-	reader.buffer = bytes.NewBuffer(nil)
-	n, err = reader.Read(data)
-	if err != io.EOF {
-		t.Errorf("Read() error = %v, want io.EOF", err)
-	}
-	if n != 0 {
-		t.Errorf("Read() = %d bytes, want 0", n)
-	}
-}
-
-func TestRawChannelReader_HandleMessage(t *testing.T) {
-	reader := &RawChannelReader{
-		streamID:  1,
-		buffer:    bytes.NewBuffer(nil),
-		callbacks: make(map[int]func(int)),
-	}
-
-	msg := &StreamDataMessage{
-		StreamID:   1,
-		Data:       []byte("test"),
-		EOF:        false,
-		Compressed: false,
-	}
-
-	called := false
-	reader.AddReadyCallback(func(int) {
-		called = true
-	})
-
-	result := reader.HandleMessage(msg)
-	if !result {
-		t.Error("HandleMessage() = false, want true")
-	}
-	if !called {
-		t.Error("callback was not called")
-	}
-	if reader.buffer.Len() == 0 {
-		t.Error("buffer is empty after HandleMessage")
-	}
-
-	msg.StreamID = 2
-	result = reader.HandleMessage(msg)
-	if result {
-		t.Error("HandleMessage() = true, want false for different streamID")
-	}
-
-	msg.StreamID = 1
-	msg.EOF = true
-	reader.HandleMessage(msg)
-	if !reader.eof {
-		t.Error("EOF not set after HandleMessage with EOF flag")
-	}
-}
-
-func TestNewRawChannelWriter(t *testing.T) {
-	link := &mockLink{status: transport.STATUS_ACTIVE}
-	ch := channel.NewChannel(link)
-	writer := NewRawChannelWriter(456, ch)
-
-	if writer.streamID != 456 {
-		t.Errorf("streamID = %d, want %d", writer.streamID, 456)
-	}
-	if writer.channel != ch {
-		t.Error("channel not set correctly")
-	}
-	if writer.eof {
-		t.Error("eof should be false initially")
-	}
-}
-
-func TestRawChannelWriter_Write(t *testing.T) {
-	link := &mockLink{status: transport.STATUS_ACTIVE}
-	ch := channel.NewChannel(link)
-	writer := NewRawChannelWriter(1, ch)
-
-	data := []byte("test data")
-	n, err := writer.Write(data)
-	if err != nil {
-		t.Errorf("Write() error = %v", err)
-	}
-	if n != len(data) {
-		t.Errorf("Write() = %d bytes, want %d", n, len(data))
-	}
-
-	largeData := make([]byte, MaxChunkLen+100)
-	n, err = writer.Write(largeData)
-	if err != nil {
-		t.Errorf("Write() error = %v", err)
-	}
-	if n != MaxChunkLen {
-		t.Errorf("Write() = %d bytes, want %d", n, MaxChunkLen)
-	}
-}
-
-func TestRawChannelWriter_Close(t *testing.T) {
-	link := &mockLink{status: transport.STATUS_ACTIVE}
-	ch := channel.NewChannel(link)
-	writer := NewRawChannelWriter(1, ch)
-
-	if writer.eof {
-		t.Error("EOF should be false before Close()")
-	}
-
-	err := writer.Close()
-	if err != nil {
-		t.Errorf("Close() error = %v", err)
-	}
-	if !writer.eof {
-		t.Error("EOF should be true after Close()")
-	}
-}
-
-func TestCreateReader(t *testing.T) {
-	link := &mockLink{status: transport.STATUS_ACTIVE}
-	ch := channel.NewChannel(link)
-	callback := func(int) {}
-	reader := CreateReader(789, ch, callback)
-
-	if reader == nil {
-		t.Error("CreateReader() returned nil")
-	}
-}
-
-func TestCreateWriter(t *testing.T) {
-	link := &mockLink{status: transport.STATUS_ACTIVE}
-	ch := channel.NewChannel(link)
-	writer := CreateWriter(101, ch)
-
-	if writer == nil {
-		t.Error("CreateWriter() returned nil")
-	}
-}
-
-func TestCreateBidirectionalBuffer(t *testing.T) {
-	link := &mockLink{status: transport.STATUS_ACTIVE}
-	ch := channel.NewChannel(link)
-	callback := func(int) {}
-	buf := CreateBidirectionalBuffer(1, 2, ch, callback)
-
-	if buf == nil {
-		t.Error("CreateBidirectionalBuffer() returned nil")
-	}
-}
-
-func TestCompressData(t *testing.T) {
-	data := []byte("test data for compression")
-	compressed := compressData(data)
-
-	if compressed == nil {
-		t.Skip("compressData() returned nil (compression implementation may be incomplete)")
-	}
-}
-
-func TestDecompressData(t *testing.T) {
-	data := []byte("test data")
-	compressed := compressData(data)
-	if compressed == nil {
-		t.Skip("compression not working, skipping decompression test")
-	}
-
-	decompressed := decompressData(compressed)
-	if decompressed == nil {
-		t.Error("decompressData() returned nil")
-	}
-}

pkg/channel/channel.go

@@ -2,13 +2,12 @@ package channel
 
 import (
 	"errors"
+	"log"
 	"math"
 	"sync"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/transport"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/transport"
 )
 
 const (
@@ -34,19 +33,6 @@ const (
 	SeqModulus uint16 = SeqMax
 
 	FastRateThreshold = 10
-
-	// Timeout calculation constants
-	RTTMinThreshold       = 0.025
-	TimeoutBaseMultiplier = 1.5
-	TimeoutRingMultiplier = 2.5
-	TimeoutRingOffset     = 2
-
-	// Packet header constants
-	ChannelHeaderSize = 6
-	ChannelHeaderBits = 8
-
-	// Default retry count
-	DefaultMaxTries = 3
 )
 
 // MessageState represents the state of a message
@@ -81,13 +67,7 @@ type Channel struct {
 	maxTries        int
 	fastRateRounds  int
 	medRateRounds   int
-	messageHandlers []messageHandlerEntry
+	messageHandlers []func(MessageBase) bool
-	nextHandlerID   int
-}
-
-type messageHandlerEntry struct {
-	id      int
-	handler func(MessageBase) bool
 }
 
 // Envelope wraps a message with metadata for transmission
@@ -104,12 +84,12 @@ type Envelope struct {
 func NewChannel(link transport.LinkInterface) *Channel {
 	return &Channel{
 		link:            link,
-		messageHandlers: make([]messageHandlerEntry, 0),
+		messageHandlers: make([]func(MessageBase) bool, 0),
 		mutex:           sync.RWMutex{},
 		windowMax:       WindowMaxSlow,
 		windowMin:       WindowMinSlow,
 		window:          WindowInitial,
-		maxTries:        DefaultMaxTries,
+		maxTries:        3,
 	}
 }
 
@@ -126,7 +106,7 @@ func (c *Channel) Send(msg MessageBase) error {
 	}
 
 	c.mutex.Lock()
-	c.nextSequence = (c.nextSequence + common.ONE) % SeqModulus
+	c.nextSequence = (c.nextSequence + 1) % SeqModulus
 	c.txRing = append(c.txRing, env)
 	c.mutex.Unlock()
 
@@ -161,7 +141,7 @@ func (c *Channel) handleTimeout(packet interface{}) {
 			env.Tries++
 			if err := c.link.Resend(packet); err != nil { // #nosec G104
 				// Handle resend error, e.g., log it or mark envelope as failed
-				debug.Log(debug.DEBUG_INFO, "Failed to resend packet", "error", err)
+				log.Printf("Failed to resend packet: %v", err)
 				// Optionally, mark the envelope as failed or remove it from txRing
 				// env.State = MsgStateFailed
 				// c.txRing = append(c.txRing[:i], c.txRing[i+1:]...)
@@ -189,28 +169,25 @@ func (c *Channel) handleDelivered(packet interface{}) {
 
 func (c *Channel) getPacketTimeout(tries int) time.Duration {
 	rtt := c.link.GetRTT()
-	if rtt < RTTMinThreshold {
+	if rtt < 0.025 {
-		rtt = RTTMinThreshold
+		rtt = 0.025
 	}
 
-	timeout := math.Pow(TimeoutBaseMultiplier, float64(tries-common.ONE)) * rtt * TimeoutRingMultiplier * float64(len(c.txRing)+TimeoutRingOffset)
+	timeout := math.Pow(1.5, float64(tries-1)) * rtt * 2.5 * float64(len(c.txRing)+2)
 	return time.Duration(timeout * float64(time.Second))
 }
 
-func (c *Channel) AddMessageHandler(handler func(MessageBase) bool) int {
+func (c *Channel) AddMessageHandler(handler func(MessageBase) bool) {
 	c.mutex.Lock()
 	defer c.mutex.Unlock()
-	id := c.nextHandlerID
+	c.messageHandlers = append(c.messageHandlers, handler)
-	c.nextHandlerID++
-	c.messageHandlers = append(c.messageHandlers, messageHandlerEntry{id: id, handler: handler})
-	return id
 }
 
-func (c *Channel) RemoveMessageHandler(id int) {
+func (c *Channel) RemoveMessageHandler(handler func(MessageBase) bool) {
 	c.mutex.Lock()
 	defer c.mutex.Unlock()
-	for i, entry := range c.messageHandlers {
+	for i, h := range c.messageHandlers {
-		if entry.id == id {
+		if &h == &handler {
 			c.messageHandlers = append(c.messageHandlers[:i], c.messageHandlers[i+1:]...)
 			break
 		}
@@ -221,10 +198,10 @@ func (c *Channel) updateRateThresholds() {
 	rtt := c.link.RTT()
 
 	if rtt > RTTFast {
-		c.fastRateRounds = common.ZERO
+		c.fastRateRounds = 0
 
 		if rtt > RTTMedium {
-			c.medRateRounds = common.ZERO
+			c.medRateRounds = 0
 		} else {
 			c.medRateRounds++
 			if c.windowMax < WindowMaxMedium && c.medRateRounds == FastRateThreshold {
@@ -241,59 +218,6 @@ func (c *Channel) updateRateThresholds() {
 	}
 }
 
-func (c *Channel) HandleInbound(data []byte) error {
-	if len(data) < ChannelHeaderSize {
-		return errors.New("channel packet too short")
-	}
-
-	msgType := uint16(data[0])<<ChannelHeaderBits | uint16(data[1])
-	sequence := uint16(data[2])<<ChannelHeaderBits | uint16(data[3])
-	length := uint16(data[4])<<ChannelHeaderBits | uint16(data[5])
-
-	if len(data) < ChannelHeaderSize+int(length) {
-		return errors.New("channel packet incomplete")
-	}
-
-	msgData := data[ChannelHeaderSize : ChannelHeaderSize+length]
-
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
-
-	for _, entry := range c.messageHandlers {
-		if entry.handler != nil {
-			msg := &GenericMessage{
-				Type: msgType,
-				Data: msgData,
-				Seq:  sequence,
-			}
-			if entry.handler(msg) {
-				break
-			}
-		}
-	}
-
-	return nil
-}
-
-type GenericMessage struct {
-	Type uint16
-	Data []byte
-	Seq  uint16
-}
-
-func (g *GenericMessage) Pack() ([]byte, error) {
-	return g.Data, nil
-}
-
-func (g *GenericMessage) Unpack(data []byte) error {
-	g.Data = data
-	return nil
-}
-
-func (g *GenericMessage) GetType() uint16 {
-	return g.Type
-}
-
 func (c *Channel) Close() error {
 	c.mutex.Lock()
 	defer c.mutex.Unlock()

pkg/channel/channel_test.go

@@ -1,130 +0,0 @@
-package channel
-
-import (
-	"bytes"
-	"testing"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/packet"
-)
-
-type mockLink struct {
-	status    byte
-	rtt       float64
-	sent      [][]byte
-	timeouts  map[interface{}]func(interface{})
-	delivered map[interface{}]func(interface{})
-}
-
-func (m *mockLink) GetStatus() byte   { return m.status }
-func (m *mockLink) GetRTT() float64   { return m.rtt }
-func (m *mockLink) RTT() float64      { return m.rtt }
-func (m *mockLink) GetLinkID() []byte { return []byte("testlink") }
-func (m *mockLink) Send(data []byte) interface{} {
-	m.sent = append(m.sent, data)
-	p := &packet.Packet{Raw: data}
-	return p
-}
-func (m *mockLink) Resend(p interface{}) error { return nil }
-func (m *mockLink) SetPacketTimeout(p interface{}, cb func(interface{}), t time.Duration) {
-	if m.timeouts == nil {
-		m.timeouts = make(map[interface{}]func(interface{}))
-	}
-	m.timeouts[p] = cb
-}
-func (m *mockLink) SetPacketDelivered(p interface{}, cb func(interface{})) {
-	if m.delivered == nil {
-		m.delivered = make(map[interface{}]func(interface{}))
-	}
-	m.delivered[p] = cb
-}
-func (m *mockLink) HandleInbound(pkt *packet.Packet) error { return nil }
-func (m *mockLink) ValidateLinkProof(pkt *packet.Packet, networkIface common.NetworkInterface) error {
-	return nil
-}
-
-type testMessage struct {
-	data []byte
-}
-
-func (m *testMessage) Pack() ([]byte, error)    { return m.data, nil }
-func (m *testMessage) Unpack(data []byte) error { m.data = data; return nil }
-func (m *testMessage) GetType() uint16          { return 1 }
-
-func TestNewChannel(t *testing.T) {
-	link := &mockLink{}
-	c := NewChannel(link)
-	if c == nil {
-		t.Fatal("NewChannel returned nil")
-	}
-}
-
-func TestChannelSend(t *testing.T) {
-	link := &mockLink{status: 1} // STATUS_ACTIVE
-	c := NewChannel(link)
-
-	msg := &testMessage{data: []byte("test")}
-	err := c.Send(msg)
-	if err != nil {
-		t.Fatalf("Send failed: %v", err)
-	}
-
-	if len(link.sent) != 1 {
-		t.Errorf("Expected 1 packet sent, got %d", len(link.sent))
-	}
-}
-
-func TestHandleInbound(t *testing.T) {
-	link := &mockLink{}
-	c := NewChannel(link)
-
-	received := false
-	c.AddMessageHandler(func(m MessageBase) bool {
-		received = true
-		return true
-	})
-
-	// Packet format: [type 2][seq 2][len 2][data]
-	data := []byte{0, 1, 0, 1, 0, 4, 't', 'e', 's', 't'}
-	err := c.HandleInbound(data)
-	if err != nil {
-		t.Fatalf("HandleInbound failed: %v", err)
-	}
-
-	if !received {
-		t.Error("Message handler was not called")
-	}
-}
-
-func TestMessageHandlers(t *testing.T) {
-	c := &Channel{
-		messageHandlers: make([]messageHandlerEntry, 0),
-	}
-	h := func(m MessageBase) bool { return true }
-
-	id := c.AddMessageHandler(h)
-	if len(c.messageHandlers) != 1 {
-		t.Errorf("Expected 1 handler, got %d", len(c.messageHandlers))
-	}
-
-	c.RemoveMessageHandler(id)
-	if len(c.messageHandlers) != 0 {
-		t.Errorf("Expected 0 handlers, got %d", len(c.messageHandlers))
-	}
-}
-
-func TestGenericMessage(t *testing.T) {
-	msg := &GenericMessage{Type: 1, Data: []byte("test")}
-	if msg.GetType() != 1 {
-		t.Error("Wrong type")
-	}
-	p, _ := msg.Pack()
-	if !bytes.Equal(p, []byte("test")) {
-		t.Error("Pack failed")
-	}
-	msg.Unpack([]byte("new"))
-	if !bytes.Equal(msg.Data, []byte("new")) {
-		t.Error("Unpack failed")
-	}
-}

pkg/common/constants.go

@@ -58,87 +58,4 @@ const (
 	STALE_TIME         = 720
 	PATH_REQUEST_TTL   = 300
 	ANNOUNCE_TIMEOUT   = 15
-
-	// Common Numeric Constants
-	ZERO    = 0
-	ONE     = 1
-	TWO     = 2
-	THREE   = 3
-	FOUR    = 4
-	FIVE    = 5
-	SIX     = 6
-	SEVEN   = 7
-	EIGHT   = 8
-	FIFTEEN = 15
-
-	// Common Size Constants
-	SIZE_16        = 16
-	SIZE_32        = 32
-	SIZE_48        = 48
-	SIZE_64        = 64
-	SIXTY_SEVEN    = 67
-	TOKEN_OVERHEAD = 48
-
-	// Common Hex Constants
-	HEX_0x00 = 0x00
-	HEX_0x01 = 0x01
-	HEX_0x02 = 0x02
-	HEX_0x03 = 0x03
-	HEX_0x04 = 0x04
-	HEX_0x92 = 0x92
-	HEX_0x93 = 0x93
-	HEX_0xC2 = 0xC2
-	HEX_0xC3 = 0xC3
-	HEX_0xC4 = 0xC4
-	HEX_0xD1 = 0xD1
-	HEX_0xD2 = 0xD2
-	HEX_0xFE = 0xFE
-	HEX_0xFF = 0xFF
-
-	// Common Numeric Constants
-	NUM_11   = 11
-	NUM_100  = 100
-	NUM_500  = 500
-	NUM_1024 = 1024
-	NUM_1064 = 1064
-	NUM_4242 = 4242
-	NUM_0700 = 0700
-
-	// Common Float Constants
-	FLOAT_ZERO  = 0.0
-	FLOAT_0_001 = 0.001
-	FLOAT_0_025 = 0.025
-	FLOAT_0_1   = 0.1
-	FLOAT_1_0   = 1.0
-	FLOAT_1_75  = 1.75
-	FLOAT_5_0   = 5.0
-	FLOAT_1E9   = 1e9
-
-	// Common String Constants
-	STR_LINK_ID           = "link_id"
-	STR_BYTES             = "bytes"
-	STR_FMT_HEX           = "0x%02x"
-	STR_FMT_HEX_LOW       = "%x"
-	STR_FMT_DEC           = "%d"
-	STR_TEST              = "test"
-	STR_LINK              = "link"
-	STR_ERROR             = "error"
-	STR_HASH              = "hash"
-	STR_NAME              = "name"
-	STR_TYPE              = "type"
-	STR_STORAGE           = "storage"
-	STR_PATH              = "path"
-	STR_COUNT             = "count"
-	STR_HOME              = "HOME"
-	STR_PUBLIC_KEY        = "public_key"
-	STR_TCP_CLIENT        = "TCPClientInterface"
-	STR_UDP               = "udp"
-	STR_UDP6              = "udp6"
-	STR_TCP               = "tcp"
-	STR_ETH0              = "eth0"
-	STR_INTERFACE         = "interface"
-	STR_PEER              = "peer"
-	STR_ADDR              = "addr"
-	STR_LINK_NOT_ACTIVE   = "link not active"
-	STR_INTERFACE_OFFLINE = "interface offline or detached"
 )

pkg/common/interfaces_test.go

@@ -1,288 +0,0 @@
-package common
-
-import (
-	"testing"
-	"time"
-)
-
-func TestNewBaseInterface(t *testing.T) {
-	iface := NewBaseInterface("test0", IF_TYPE_UDP, true)
-
-	if iface.Name != "test0" {
-		t.Errorf("Name = %q, want %q", iface.Name, "test0")
-	}
-	if iface.Type != IF_TYPE_UDP {
-		t.Errorf("Type = %v, want %v", iface.Type, IF_TYPE_UDP)
-	}
-	if iface.Mode != IF_MODE_FULL {
-		t.Errorf("Mode = %v, want %v", iface.Mode, IF_MODE_FULL)
-	}
-	if !iface.Enabled {
-		t.Errorf("Enabled = %v, want true", iface.Enabled)
-	}
-	if iface.MTU != DEFAULT_MTU {
-		t.Errorf("MTU = %d, want %d", iface.MTU, DEFAULT_MTU)
-	}
-	if iface.Bitrate != BITRATE_MINIMUM {
-		t.Errorf("Bitrate = %d, want %d", iface.Bitrate, BITRATE_MINIMUM)
-	}
-}
-
-func TestBaseInterface_GetType(t *testing.T) {
-	iface := NewBaseInterface("test1", IF_TYPE_TCP, true)
-	if iface.GetType() != IF_TYPE_TCP {
-		t.Errorf("GetType() = %v, want %v", iface.GetType(), IF_TYPE_TCP)
-	}
-}
-
-func TestBaseInterface_GetMode(t *testing.T) {
-	iface := NewBaseInterface("test2", IF_TYPE_UDP, true)
-	if iface.GetMode() != IF_MODE_FULL {
-		t.Errorf("GetMode() = %v, want %v", iface.GetMode(), IF_MODE_FULL)
-	}
-}
-
-func TestBaseInterface_GetMTU(t *testing.T) {
-	iface := NewBaseInterface("test3", IF_TYPE_UDP, true)
-	if iface.GetMTU() != DEFAULT_MTU {
-		t.Errorf("GetMTU() = %d, want %d", iface.GetMTU(), DEFAULT_MTU)
-	}
-}
-
-func TestBaseInterface_GetName(t *testing.T) {
-	iface := NewBaseInterface("test4", IF_TYPE_UDP, true)
-	if iface.GetName() != "test4" {
-		t.Errorf("GetName() = %q, want %q", iface.GetName(), "test4")
-	}
-}
-
-func TestBaseInterface_IsEnabled(t *testing.T) {
-	iface := NewBaseInterface("test5", IF_TYPE_UDP, true)
-	iface.Online = true
-	iface.Detached = false
-
-	if !iface.IsEnabled() {
-		t.Error("IsEnabled() = false, want true")
-	}
-
-	iface.Enabled = false
-	if iface.IsEnabled() {
-		t.Error("IsEnabled() = true, want false when disabled")
-	}
-
-	iface.Enabled = true
-	iface.Online = false
-	if iface.IsEnabled() {
-		t.Error("IsEnabled() = true, want false when offline")
-	}
-
-	iface.Online = true
-	iface.Detached = true
-	if iface.IsEnabled() {
-		t.Error("IsEnabled() = true, want false when detached")
-	}
-}
-
-func TestBaseInterface_IsOnline(t *testing.T) {
-	iface := NewBaseInterface("test6", IF_TYPE_UDP, true)
-	iface.Online = true
-
-	if !iface.IsOnline() {
-		t.Error("IsOnline() = false, want true")
-	}
-
-	iface.Online = false
-	if iface.IsOnline() {
-		t.Error("IsOnline() = true, want false")
-	}
-}
-
-func TestBaseInterface_IsDetached(t *testing.T) {
-	iface := NewBaseInterface("test7", IF_TYPE_UDP, true)
-	iface.Detached = true
-
-	if !iface.IsDetached() {
-		t.Error("IsDetached() = false, want true")
-	}
-
-	iface.Detached = false
-	if iface.IsDetached() {
-		t.Error("IsDetached() = true, want false")
-	}
-}
-
-func TestBaseInterface_SetPacketCallback(t *testing.T) {
-	iface := NewBaseInterface("test8", IF_TYPE_UDP, true)
-
-	callback := func(data []byte, ni NetworkInterface) {}
-	iface.SetPacketCallback(callback)
-
-	if iface.GetPacketCallback() == nil {
-		t.Error("GetPacketCallback() = nil, want callback")
-	}
-}
-
-func TestBaseInterface_GetPacketCallback(t *testing.T) {
-	iface := NewBaseInterface("test9", IF_TYPE_UDP, true)
-
-	if iface.GetPacketCallback() != nil {
-		t.Error("GetPacketCallback() != nil, want nil")
-	}
-
-	callback := func(data []byte, ni NetworkInterface) {}
-	iface.SetPacketCallback(callback)
-
-	if iface.GetPacketCallback() == nil {
-		t.Error("GetPacketCallback() = nil, want callback")
-	}
-}
-
-func TestBaseInterface_Detach(t *testing.T) {
-	iface := NewBaseInterface("test10", IF_TYPE_UDP, true)
-	iface.Online = true
-	iface.Detached = false
-
-	iface.Detach()
-
-	if !iface.IsDetached() {
-		t.Error("IsDetached() = false, want true after Detach()")
-	}
-	if iface.IsOnline() {
-		t.Error("IsOnline() = true, want false after Detach()")
-	}
-}
-
-func TestBaseInterface_Enable(t *testing.T) {
-	iface := NewBaseInterface("test11", IF_TYPE_UDP, false)
-	iface.Online = false
-
-	iface.Enable()
-
-	if !iface.Enabled {
-		t.Error("Enabled = false, want true after Enable()")
-	}
-	if !iface.IsOnline() {
-		t.Error("IsOnline() = false, want true after Enable()")
-	}
-}
-
-func TestBaseInterface_Disable(t *testing.T) {
-	iface := NewBaseInterface("test12", IF_TYPE_UDP, true)
-	iface.Online = true
-
-	iface.Disable()
-
-	if iface.Enabled {
-		t.Error("Enabled = true, want false after Disable()")
-	}
-	if iface.IsOnline() {
-		t.Error("IsOnline() = true, want false after Disable()")
-	}
-}
-
-func TestBaseInterface_Start(t *testing.T) {
-	iface := NewBaseInterface("test13", IF_TYPE_UDP, true)
-	if err := iface.Start(); err != nil {
-		t.Errorf("Start() error = %v, want nil", err)
-	}
-}
-
-func TestBaseInterface_Stop(t *testing.T) {
-	iface := NewBaseInterface("test14", IF_TYPE_UDP, true)
-	if err := iface.Stop(); err != nil {
-		t.Errorf("Stop() error = %v, want nil", err)
-	}
-}
-
-func TestBaseInterface_GetConn(t *testing.T) {
-	iface := NewBaseInterface("test15", IF_TYPE_UDP, true)
-	if iface.GetConn() != nil {
-		t.Error("GetConn() != nil, want nil")
-	}
-}
-
-func TestBaseInterface_Send(t *testing.T) {
-	iface := NewBaseInterface("test16", IF_TYPE_UDP, true)
-	data := []byte("test data")
-
-	if err := iface.Send(data, ""); err != nil {
-		t.Errorf("Send() error = %v, want nil", err)
-	}
-}
-
-func TestBaseInterface_ProcessIncoming(t *testing.T) {
-	iface := NewBaseInterface("test17", IF_TYPE_UDP, true)
-
-	called := false
-	callback := func(data []byte, ni NetworkInterface) {
-		called = true
-	}
-	iface.SetPacketCallback(callback)
-
-	data := []byte("test")
-	iface.ProcessIncoming(data)
-
-	if !called {
-		t.Error("ProcessIncoming() did not call callback")
-	}
-
-	iface.SetPacketCallback(nil)
-	iface.ProcessIncoming(data)
-}
-
-func TestBaseInterface_ProcessOutgoing(t *testing.T) {
-	iface := NewBaseInterface("test18", IF_TYPE_UDP, true)
-	data := []byte("test data")
-
-	if err := iface.ProcessOutgoing(data); err != nil {
-		t.Errorf("ProcessOutgoing() error = %v, want nil", err)
-	}
-}
-
-func TestBaseInterface_SendPathRequest(t *testing.T) {
-	iface := NewBaseInterface("test19", IF_TYPE_UDP, true)
-	data := []byte("path request")
-
-	if err := iface.SendPathRequest(data); err != nil {
-		t.Errorf("SendPathRequest() error = %v, want nil", err)
-	}
-}
-
-func TestBaseInterface_SendLinkPacket(t *testing.T) {
-	iface := NewBaseInterface("test20", IF_TYPE_UDP, true)
-	dest := []byte("destination")
-	data := []byte("link data")
-	timestamp := time.Now()
-
-	if err := iface.SendLinkPacket(dest, data, timestamp); err != nil {
-		t.Errorf("SendLinkPacket() error = %v, want nil", err)
-	}
-}
-
-func TestBaseInterface_GetBandwidthAvailable(t *testing.T) {
-	iface := NewBaseInterface("test21", IF_TYPE_UDP, true)
-
-	if !iface.GetBandwidthAvailable() {
-		t.Error("GetBandwidthAvailable() = false, want true when no recent transmission")
-	}
-
-	iface.lastTx = time.Now()
-	iface.TxBytes = 0
-	if !iface.GetBandwidthAvailable() {
-		t.Error("GetBandwidthAvailable() = false, want true when TxBytes is 0")
-	}
-
-	iface.lastTx = time.Now().Add(-500 * time.Millisecond)
-	iface.TxBytes = 1000
-	iface.Bitrate = 1000000
-
-	if !iface.GetBandwidthAvailable() {
-		t.Error("GetBandwidthAvailable() = false, want true when usage is below threshold")
-	}
-
-	iface.TxBytes = 10000000
-	iface.Bitrate = 1000
-	if iface.GetBandwidthAvailable() {
-		t.Error("GetBandwidthAvailable() = true, want false when usage exceeds threshold")
-	}
-}

pkg/config/config.go

@@ -39,7 +39,6 @@ type Config struct {
 }
 
 func LoadConfig(path string) (*Config, error) {
-	// bearer:disable go_gosec_filesystem_filereadtaint
 	file, err := os.Open(path) // #nosec G304
 	if err != nil {
 		return nil, err

pkg/config/config_test.go

@@ -1,192 +0,0 @@
-package config
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestLoadConfig(t *testing.T) {
-	tmpDir := t.TempDir()
-	configPath := filepath.Join(tmpDir, "test_config")
-
-	configContent := `[identity]
-name = test-identity
-storage_path = /tmp/test-storage
-
-[transport]
-announce_interval = 300
-path_request_timeout = 15
-max_hops = 8
-bitrate_limit = 1000000
-
-[logging]
-level = info
-file = /tmp/test.log
-
-[interface test-interface]
-type = UDPInterface
-enabled = true
-listen_ip = 127.0.0.1
-listen_port = 37696
-`
-
-	if err := os.WriteFile(configPath, []byte(configContent), 0600); err != nil {
-		t.Fatalf("Failed to write test config: %v", err)
-	}
-
-	cfg, err := LoadConfig(configPath)
-	if err != nil {
-		t.Fatalf("LoadConfig() error = %v", err)
-	}
-
-	if cfg == nil {
-		t.Fatal("LoadConfig() returned nil")
-	}
-
-	if len(cfg.Interfaces) == 0 {
-		t.Error("No interfaces loaded")
-	}
-
-	iface := cfg.Interfaces[0]
-	if iface.Type != "UDPInterface" {
-		t.Errorf("Interface type = %s, want UDPInterface", iface.Type)
-	}
-	if !iface.Enabled {
-		t.Error("Interface should be enabled")
-	}
-	if iface.ListenIP != "127.0.0.1" {
-		t.Errorf("Interface ListenIP = %s, want 127.0.0.1", iface.ListenIP)
-	}
-	if iface.ListenPort != 37696 {
-		t.Errorf("Interface ListenPort = %d, want 37696", iface.ListenPort)
-	}
-}
-
-func TestLoadConfig_NonexistentFile(t *testing.T) {
-	_, err := LoadConfig("/nonexistent/path/config")
-	if err == nil {
-		t.Error("LoadConfig() should return error for nonexistent file")
-	}
-}
-
-func TestLoadConfig_EmptyFile(t *testing.T) {
-	tmpDir := t.TempDir()
-	configPath := filepath.Join(tmpDir, "empty_config")
-
-	if err := os.WriteFile(configPath, []byte(""), 0600); err != nil {
-		t.Fatalf("Failed to write empty config: %v", err)
-	}
-
-	cfg, err := LoadConfig(configPath)
-	if err != nil {
-		t.Fatalf("LoadConfig() error = %v", err)
-	}
-
-	if cfg == nil {
-		t.Fatal("LoadConfig() returned nil")
-	}
-}
-
-func TestLoadConfig_CommentsAndEmptyLines(t *testing.T) {
-	tmpDir := t.TempDir()
-	configPath := filepath.Join(tmpDir, "test_config")
-
-	configContent := `# Comment line
-
-[identity]
-name = test
-# Another comment
-
-[interface test-interface]
-# Interface comment
-type = UDPInterface
-enabled = true
-`
-
-	if err := os.WriteFile(configPath, []byte(configContent), 0600); err != nil {
-		t.Fatalf("Failed to write test config: %v", err)
-	}
-
-	cfg, err := LoadConfig(configPath)
-	if err != nil {
-		t.Fatalf("LoadConfig() error = %v", err)
-	}
-
-	if cfg == nil {
-		t.Fatal("LoadConfig() returned nil")
-	}
-
-	if cfg.Identity.Name != "test" {
-		t.Errorf("Identity.Name = %s, want test", cfg.Identity.Name)
-	}
-}
-
-func TestSaveConfig(t *testing.T) {
-	tmpDir := t.TempDir()
-	configPath := filepath.Join(tmpDir, "test_config")
-
-	cfg := &Config{}
-	cfg.Identity.Name = "test-identity"
-	cfg.Identity.StoragePath = "/tmp/test"
-	cfg.Transport.AnnounceInterval = 600
-	cfg.Logging.Level = "debug"
-	cfg.Logging.File = "/tmp/test.log"
-
-	if err := SaveConfig(cfg, configPath); err != nil {
-		t.Fatalf("SaveConfig() error = %v", err)
-	}
-
-	loaded, err := LoadConfig(configPath)
-	if err != nil {
-		t.Fatalf("LoadConfig() error = %v", err)
-	}
-
-	if loaded.Identity.Name != "test-identity" {
-		t.Errorf("Identity.Name = %s, want test-identity", loaded.Identity.Name)
-	}
-	if loaded.Transport.AnnounceInterval != 600 {
-		t.Errorf("Transport.AnnounceInterval = %d, want 600", loaded.Transport.AnnounceInterval)
-	}
-}
-
-func TestGetConfigDir(t *testing.T) {
-	dir := GetConfigDir()
-	if dir == "" {
-		t.Error("GetConfigDir() returned empty string")
-	}
-}
-
-func TestGetDefaultConfigPath(t *testing.T) {
-	path := GetDefaultConfigPath()
-	if path == "" {
-		t.Error("GetDefaultConfigPath() returned empty string")
-	}
-}
-
-func TestEnsureConfigDir(t *testing.T) {
-	if err := EnsureConfigDir(); err != nil {
-		t.Fatalf("EnsureConfigDir() error = %v", err)
-	}
-}
-
-func TestInitConfig(t *testing.T) {
-	tmpDir := t.TempDir()
-	originalHome := os.Getenv("HOME")
-	defer func() {
-		if originalHome != "" {
-			os.Setenv("HOME", originalHome)
-		}
-	}()
-
-	os.Setenv("HOME", tmpDir)
-
-	cfg, err := InitConfig()
-	if err != nil {
-		t.Fatalf("InitConfig() error = %v", err)
-	}
-
-	if cfg == nil {
-		t.Fatal("InitConfig() returned nil")
-	}
-}

pkg/cryptography/aes_test.go

@@ -86,6 +86,7 @@ func TestAES256CBC_InvalidKeySize(t *testing.T) {
 	}
 }
 
+
 func TestDecryptAES256CBCErrorCases(t *testing.T) {
 	key, err := GenerateAES256Key()
 	if err != nil {
@@ -118,16 +119,10 @@ func TestDecryptAES256CBCErrorCases(t *testing.T) {
 			t.Fatalf("Failed to create test ciphertext: %v", err)
 		}
 
-		// Corrupt the byte that XORs with the last padding byte.
+		// Corrupt the last byte (which affects padding)
-		// In CBC, P[i] = D(C[i]) ^ C[i-1].
-		// The last byte of plaintext P[len-1] depends on C[len-1] and C[len-1-BlockSize].
-		// If we modify C[len-1-BlockSize], we flip the bits of P[len-1] predictably.
-		// If we modify C[len-1] (the last byte of ciphertext), we scramble the whole block D(C[len-1]),
-		// which might accidentally result in valid padding (e.g. 0x01).
-		// So we corrupt the IV (or previous block) corresponding to the last byte.
 		corruptedCiphertext := make([]byte, len(ciphertext))
 		copy(corruptedCiphertext, ciphertext)
-		corruptedCiphertext[len(ciphertext)-aes.BlockSize-1] ^= 0xFF
+		corruptedCiphertext[len(corruptedCiphertext)-1] ^= 0xFF
 
 		_, err = DecryptAES256CBC(key, corruptedCiphertext)
 		if err == nil {

pkg/cryptography/hkdf.go

@@ -1,48 +1,17 @@
 package cryptography
 
 import (
-	"crypto/hmac"
 	"crypto/sha256"
-	"errors"
+	"io"
-	"math"
+
+	"golang.org/x/crypto/hkdf"
 )
 
 func DeriveKey(secret, salt, info []byte, length int) ([]byte, error) {
-	hashLen := 32
+	hkdfReader := hkdf.New(sha256.New, secret, salt, info)
-
+	key := make([]byte, length)
-	if length < 1 {
+	if _, err := io.ReadFull(hkdfReader, key); err != nil {
-		return nil, errors.New("invalid output key length")
+		return nil, err
 	}
-
+	return key, nil
-	if len(secret) == 0 {
-		return nil, errors.New("cannot derive key from empty input material")
-	}
-
-	if len(salt) == 0 {
-		salt = make([]byte, hashLen)
-	}
-
-	if info == nil {
-		info = []byte{}
-	}
-
-	pseudorandomKey := hmac.New(sha256.New, salt)
-	pseudorandomKey.Write(secret)
-	prk := pseudorandomKey.Sum(nil)
-
-	block := []byte{}
-	derived := []byte{}
-
-	iterations := int(math.Ceil(float64(length) / float64(hashLen)))
-	for i := 0; i < iterations; i++ {
-		h := hmac.New(sha256.New, prk)
-		h.Write(block)
-		h.Write(info)
-		counter := byte((i + 1) % (0xFF + 1))
-		h.Write([]byte{counter})
-		block = h.Sum(nil)
-		derived = append(derived, block...)
-	}
-
-	return derived[:length], nil
 }

pkg/cryptography/hkdf_test.go

@@ -77,8 +77,8 @@ func TestDeriveKeyEdgeCases(t *testing.T) {
 
 	t.Run("EmptySecret", func(t *testing.T) {
 		_, err := DeriveKey([]byte{}, salt, info, 32)
-		if err == nil {
+		if err != nil {
-			t.Errorf("DeriveKey should fail with empty secret")
+			t.Errorf("DeriveKey failed with empty secret: %v", err)
 		}
 	})
 
@@ -97,9 +97,12 @@ func TestDeriveKeyEdgeCases(t *testing.T) {
 	})
 
 	t.Run("ZeroLength", func(t *testing.T) {
-		_, err := DeriveKey(secret, salt, info, 0)
+		key, err := DeriveKey(secret, salt, info, 0)
-		if err == nil {
+		if err != nil {
-			t.Errorf("DeriveKey should fail with zero length")
+			t.Errorf("DeriveKey failed with zero length: %v", err)
+		}
+		if len(key) != 0 {
+			t.Errorf("DeriveKey with zero length returned non-empty key: %x", key)
 		}
 	})
 }

pkg/debug/debug.go

@@ -18,8 +18,8 @@ const (
 )
 
 var (
-	debugLevel  = flag.Int("debug", 3, "debug level (1-7)")
+	debugLevel = flag.Int("debug", 3, "debug level (1-7)")
-	logger      *slog.Logger
+	logger     *slog.Logger
 	initialized bool
 )
 
@@ -113,3 +113,4 @@ func SetDebugLevel(level int) {
 func GetDebugLevel() int {
 	return *debugLevel
 }
+

pkg/debug/debug_test.go

@@ -1,185 +0,0 @@
-package debug
-
-import (
-	"flag"
-	"testing"
-)
-
-func TestInit(t *testing.T) {
-	originalFlag := flag.CommandLine
-	defer func() {
-		flag.CommandLine = originalFlag
-		initialized = false
-	}()
-
-	flag.CommandLine = flag.NewFlagSet("test", flag.ContinueOnError)
-	debugLevel = flag.Int("debug", 3, "debug level")
-
-	Init()
-
-	if !initialized {
-		t.Error("Init() should set initialized to true")
-	}
-
-	if GetLogger() == nil {
-		t.Error("GetLogger() should return non-nil logger after Init()")
-	}
-}
-
-func TestGetLogger(t *testing.T) {
-	originalFlag := flag.CommandLine
-	defer func() {
-		flag.CommandLine = originalFlag
-		initialized = false
-	}()
-
-	flag.CommandLine = flag.NewFlagSet("test", flag.ContinueOnError)
-	debugLevel = flag.Int("debug", 3, "debug level")
-	initialized = false
-
-	logger := GetLogger()
-	if logger == nil {
-		t.Error("GetLogger() should return non-nil logger")
-	}
-
-	if !initialized {
-		t.Error("GetLogger() should initialize if not already initialized")
-	}
-}
-
-func TestLog(t *testing.T) {
-	originalFlag := flag.CommandLine
-	defer func() {
-		flag.CommandLine = originalFlag
-		initialized = false
-	}()
-
-	flag.CommandLine = flag.NewFlagSet("test", flag.ContinueOnError)
-	debugLevel = flag.Int("debug", 7, "debug level")
-	initialized = false
-
-	Log(DEBUG_INFO, "test message", "key", "value")
-}
-
-func TestSetDebugLevel(t *testing.T) {
-	originalFlag := flag.CommandLine
-	defer func() {
-		flag.CommandLine = originalFlag
-		initialized = false
-	}()
-
-	flag.CommandLine = flag.NewFlagSet("test", flag.ContinueOnError)
-	debugLevel = flag.Int("debug", 3, "debug level")
-	initialized = false
-
-	SetDebugLevel(5)
-	if GetDebugLevel() != 5 {
-		t.Errorf("SetDebugLevel(5) did not set level correctly, got %d", GetDebugLevel())
-	}
-}
-
-func TestGetDebugLevel(t *testing.T) {
-	originalFlag := flag.CommandLine
-	defer func() {
-		flag.CommandLine = originalFlag
-		initialized = false
-	}()
-
-	flag.CommandLine = flag.NewFlagSet("test", flag.ContinueOnError)
-	debugLevel = flag.Int("debug", 4, "debug level")
-
-	level := GetDebugLevel()
-	if level != 4 {
-		t.Errorf("GetDebugLevel() = %d, want 4", level)
-	}
-}
-
-func TestLog_LevelFiltering(t *testing.T) {
-	originalFlag := flag.CommandLine
-	defer func() {
-		flag.CommandLine = originalFlag
-		initialized = false
-	}()
-
-	flag.CommandLine = flag.NewFlagSet("test", flag.ContinueOnError)
-	debugLevel = flag.Int("debug", 3, "debug level")
-	initialized = false
-
-	Log(DEBUG_TRACE, "trace message")
-	Log(DEBUG_INFO, "info message")
-	Log(DEBUG_ERROR, "error message")
-}
-
-func TestConstants(t *testing.T) {
-	if DEBUG_CRITICAL != 1 {
-		t.Errorf("DEBUG_CRITICAL = %d, want 1", DEBUG_CRITICAL)
-	}
-	if DEBUG_ERROR != 2 {
-		t.Errorf("DEBUG_ERROR = %d, want 2", DEBUG_ERROR)
-	}
-	if DEBUG_INFO != 3 {
-		t.Errorf("DEBUG_INFO = %d, want 3", DEBUG_INFO)
-	}
-	if DEBUG_VERBOSE != 4 {
-		t.Errorf("DEBUG_VERBOSE = %d, want 4", DEBUG_VERBOSE)
-	}
-	if DEBUG_TRACE != 5 {
-		t.Errorf("DEBUG_TRACE = %d, want 5", DEBUG_TRACE)
-	}
-	if DEBUG_PACKETS != 6 {
-		t.Errorf("DEBUG_PACKETS = %d, want 6", DEBUG_PACKETS)
-	}
-	if DEBUG_ALL != 7 {
-		t.Errorf("DEBUG_ALL = %d, want 7", DEBUG_ALL)
-	}
-}
-
-func TestLog_WithArgs(t *testing.T) {
-	originalFlag := flag.CommandLine
-	defer func() {
-		flag.CommandLine = originalFlag
-		initialized = false
-	}()
-
-	flag.CommandLine = flag.NewFlagSet("test", flag.ContinueOnError)
-	debugLevel = flag.Int("debug", 7, "debug level")
-	initialized = false
-
-	Log(DEBUG_INFO, "test message", "key1", "value1", "key2", "value2")
-}
-
-func TestInit_MultipleCalls(t *testing.T) {
-	originalFlag := flag.CommandLine
-	defer func() {
-		flag.CommandLine = originalFlag
-		initialized = false
-	}()
-
-	flag.CommandLine = flag.NewFlagSet("test", flag.ContinueOnError)
-	debugLevel = flag.Int("debug", 3, "debug level")
-	initialized = false
-
-	Init()
-	firstLogger := GetLogger()
-
-	Init()
-	secondLogger := GetLogger()
-
-	if firstLogger != secondLogger {
-		t.Error("Multiple Init() calls should not create new loggers")
-	}
-}
-
-func TestLog_DisabledLevel(t *testing.T) {
-	originalFlag := flag.CommandLine
-	defer func() {
-		flag.CommandLine = originalFlag
-		initialized = false
-	}()
-
-	flag.CommandLine = flag.NewFlagSet("test", flag.ContinueOnError)
-	debugLevel = flag.Int("debug", 1, "debug level")
-	initialized = false
-
-	Log(DEBUG_TRACE, "this should be filtered")
-}

pkg/destination/destination.go

@@ -1,22 +1,16 @@
 package destination
 
 import (
-	"crypto/rand"
 	"crypto/sha256"
 	"errors"
 	"fmt"
-	"io"
+	"log"
-	"os"
 	"sync"
-	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/announce"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/announce"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/identity"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/transport"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/packet"
-	"github.com/vmihailenco/msgpack/v5"
-	"golang.org/x/crypto/curve25519"
 )
 
 const (
@@ -42,6 +36,15 @@ const (
 
 	RATCHET_COUNT    = 512  // Default number of retained ratchet keys
 	RATCHET_INTERVAL = 1800 // Minimum interval between ratchet rotations in seconds
+
+	// Debug levels
+	DEBUG_CRITICAL = 1 // Critical errors
+	DEBUG_ERROR    = 2 // Non-critical errors
+	DEBUG_INFO     = 3 // Important information
+	DEBUG_VERBOSE  = 4 // Detailed information
+	DEBUG_TRACE    = 5 // Very detailed tracing
+	DEBUG_PACKETS  = 6 // Packet-level details
+	DEBUG_ALL      = 7 // Everything
 )
 
 type PacketCallback = common.PacketCallback
@@ -53,21 +56,6 @@ type RequestHandler struct {
 	ResponseGenerator func(path string, data []byte, requestID []byte, linkID []byte, remoteIdentity *identity.Identity, requestedAt int64) []byte
 	AllowMode         byte
 	AllowedList       [][]byte
-	AutoCompress      bool
-}
-
-type Transport interface {
-	GetConfig() *common.ReticulumConfig
-	GetInterfaces() map[string]common.NetworkInterface
-	RegisterDestination(hash []byte, dest interface{})
-}
-
-type IncomingLinkHandler func(pkt *packet.Packet, dest *Destination, transport interface{}, networkIface common.NetworkInterface) (interface{}, error)
-
-var incomingLinkHandler IncomingLinkHandler
-
-func RegisterIncomingLinkHandler(handler IncomingLinkHandler) {
-	incomingLinkHandler = handler
 }
 
 type Destination struct {
@@ -77,7 +65,7 @@ type Destination struct {
 	appName   string
 	aspects   []string
 	hashValue []byte
-	transport Transport
+	transport *transport.Transport
 
 	acceptsLinks  bool
 	proofStrategy byte
@@ -86,15 +74,11 @@ type Destination struct {
 	proofCallback  ProofRequestedCallback
 	linkCallback   LinkEstablishedCallback
 
-	ratchetsEnabled   bool
+	ratchetsEnabled bool
-	ratchetPath       string
+	ratchetPath     string
-	ratchetCount      int
+	ratchetCount    int
-	ratchetInterval   int
+	ratchetInterval int
-	enforceRatchets   bool
+	enforceRatchets bool
-	latestRatchetTime time.Time
-	latestRatchetID   []byte
-	ratchets          [][]byte
-	ratchetFileLock   sync.Mutex
 
 	defaultAppData []byte
 	mutex          sync.RWMutex
@@ -102,11 +86,15 @@ type Destination struct {
 	requestHandlers map[string]*RequestHandler
 }
 
-func New(id *identity.Identity, direction byte, destType byte, appName string, transport Transport, aspects ...string) (*Destination, error) {
+func debugLog(level int, format string, v ...interface{}) {
-	debug.Log(debug.DEBUG_INFO, "Creating new destination", "app", appName, "type", destType, "direction", direction)
+	log.Printf("[DEBUG-%d] %s", level, fmt.Sprintf(format, v...))
+}
+
+func New(id *identity.Identity, direction byte, destType byte, appName string, transport *transport.Transport, aspects ...string) (*Destination, error) {
+	debugLog(DEBUG_INFO, "Creating new destination: app=%s type=%d direction=%d", appName, destType, direction)
 
 	if id == nil {
-		debug.Log(debug.DEBUG_ERROR, "Cannot create destination: identity is nil")
+		debugLog(DEBUG_ERROR, "Cannot create destination: identity is nil")
 		return nil, errors.New("identity cannot be nil")
 	}
 
@@ -126,24 +114,18 @@ func New(id *identity.Identity, direction byte, destType byte, appName string, t
 
 	// Generate destination hash
 	d.hashValue = d.calculateHash()
-	debug.Log(debug.DEBUG_VERBOSE, "Created destination with hash", "hash", fmt.Sprintf("%x", d.hashValue))
+	debugLog(DEBUG_VERBOSE, "Created destination with hash: %x", d.hashValue)
-
-	// Auto-register with transport if direction is IN
-	if (direction & IN) != 0 {
-		transport.RegisterDestination(d.hashValue, d)
-		debug.Log(debug.DEBUG_INFO, "Destination auto-registered with transport", "hash", fmt.Sprintf("%x", d.hashValue))
-	}
 
 	return d, nil
 }
 
 // FromHash creates a destination from a known hash (e.g., from an announce).
 // This is used by clients to create destination objects for servers they've discovered.
-func FromHash(hash []byte, id *identity.Identity, destType byte, transport Transport) (*Destination, error) {
+func FromHash(hash []byte, id *identity.Identity, destType byte, transport *transport.Transport) (*Destination, error) {
-	debug.Log(debug.DEBUG_INFO, "Creating destination from hash", "hash", fmt.Sprintf("%x", hash))
+	debugLog(DEBUG_INFO, "Creating destination from hash: %x", hash)
 
 	if id == nil {
-		debug.Log(debug.DEBUG_ERROR, "Cannot create destination: identity is nil")
+		debugLog(DEBUG_ERROR, "Cannot create destination: identity is nil")
 		return nil, errors.New("identity cannot be nil")
 	}
 
@@ -160,32 +142,32 @@ func FromHash(hash []byte, id *identity.Identity, destType byte, transport Trans
 		requestHandlers: make(map[string]*RequestHandler),
 	}
 
-	debug.Log(debug.DEBUG_VERBOSE, "Created destination from hash", "hash", fmt.Sprintf("%x", hash))
+	debugLog(DEBUG_VERBOSE, "Created destination from hash: %x", hash)
 	return d, nil
 }
 
 func (d *Destination) calculateHash() []byte {
-	debug.Log(debug.DEBUG_TRACE, "Calculating hash for destination", "name", d.ExpandName())
+	debugLog(DEBUG_TRACE, "Calculating hash for destination %s", d.ExpandName())
 
 	// destination_hash = SHA256(name_hash_10bytes + identity_hash_16bytes)[:16]
 	// Identity hash is the truncated hash of the public key (16 bytes)
 	identityHash := identity.TruncatedHash(d.identity.GetPublicKey())
-
+	
 	// Name hash is the FULL 32-byte SHA256, then we take first 10 bytes for concatenation
 	nameHashFull := sha256.Sum256([]byte(d.ExpandName()))
-	nameHash10 := nameHashFull[:10] // Only use 10 bytes
+	nameHash10 := nameHashFull[:10]  // Only use 10 bytes
 
-	debug.Log(debug.DEBUG_ALL, "Identity hash", "hash", fmt.Sprintf("%x", identityHash))
+	debugLog(DEBUG_ALL, "Identity hash: %x", identityHash)
-	debug.Log(debug.DEBUG_ALL, "Name hash (10 bytes)", "hash", fmt.Sprintf("%x", nameHash10))
+	debugLog(DEBUG_ALL, "Name hash (10 bytes): %x", nameHash10)
 
 	// Concatenate name_hash (10 bytes) + identity_hash (16 bytes) = 26 bytes
 	combined := append(nameHash10, identityHash...)
-
+	
 	// Then hash again and truncate to 16 bytes
 	finalHashFull := sha256.Sum256(combined)
 	finalHash := finalHashFull[:16]
 
-	debug.Log(debug.DEBUG_VERBOSE, "Calculated destination hash", "hash", fmt.Sprintf("%x", finalHash))
+	debugLog(DEBUG_VERBOSE, "Calculated destination hash: %x", finalHash)
 
 	return finalHash
 }
@@ -198,52 +180,50 @@ func (d *Destination) ExpandName() string {
 	return name
 }
 
-func (d *Destination) Announce(pathResponse bool, tag []byte, attachedInterface common.NetworkInterface) error {
+func (d *Destination) Announce(appData []byte) error {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 
-	debug.Log(debug.DEBUG_VERBOSE, "Announcing destination", "name", d.ExpandName(), "path_response", pathResponse)
+	log.Printf("[DEBUG-4] Announcing destination %s", d.ExpandName())
 
-	appData := d.defaultAppData
+	if appData == nil {
+		appData = d.defaultAppData
+	}
 
 	// Create announce packet using announce package
-	announceObj, err := announce.New(d.identity, d.hashValue, d.ExpandName(), appData, pathResponse, d.transport.GetConfig())
+	// Pass the destination hash, name, and app data
+	announce, err := announce.New(d.identity, d.hashValue, d.ExpandName(), appData, false, d.transport.GetConfig())
 	if err != nil {
 		return fmt.Errorf("failed to create announce: %w", err)
 	}
 
-	packet := announceObj.GetPacket()
+	packet := announce.GetPacket()
 	if packet == nil {
 		return errors.New("failed to create announce packet")
 	}
 
-	if pathResponse && tag != nil {
+	// Send announce packet to all interfaces
-		debug.Log(debug.DEBUG_INFO, "Sending path response announce", "tag", fmt.Sprintf("%x", tag))
+	log.Printf("[DEBUG-4] Sending announce packet to all interfaces")
-	}
-
 	if d.transport == nil {
 		return errors.New("transport not initialized")
 	}
 
+	interfaces := d.transport.GetInterfaces()
+	log.Printf("[DEBUG-7] Got %d interfaces from transport", len(interfaces))
+
 	var lastErr error
-	if attachedInterface != nil {
+	for name, iface := range interfaces {
-		if attachedInterface.IsEnabled() && attachedInterface.IsOnline() {
+		log.Printf("[DEBUG-7] Checking interface %s: enabled=%v, online=%v", name, iface.IsEnabled(), iface.IsOnline())
-			debug.Log(debug.DEBUG_VERBOSE, "Sending announce to attached interface", "name", attachedInterface.GetName())
+		if iface.IsEnabled() && iface.IsOnline() {
-			if err := attachedInterface.Send(packet, ""); err != nil {
+			log.Printf("[DEBUG-7] Sending announce to interface %s (%d bytes)", name, len(packet))
-				debug.Log(debug.DEBUG_ERROR, "Failed to send announce on attached interface", "error", err)
+			if err := iface.Send(packet, ""); err != nil {
+				log.Printf("[ERROR] Failed to send announce on interface %s: %v", name, err)
 				lastErr = err
+			} else {
+				log.Printf("[DEBUG-7] Successfully sent announce to interface %s", name)
 			}
-		}
+		} else {
-	} else {
+			log.Printf("[DEBUG-7] Skipping interface %s (not enabled or not online)", name)
-		interfaces := d.transport.GetInterfaces()
-		for name, iface := range interfaces {
-			if iface.IsEnabled() && iface.IsOnline() {
-				debug.Log(debug.DEBUG_VERBOSE, "Sending announce to interface", "name", name)
-				if err := iface.Send(packet, ""); err != nil {
-					debug.Log(debug.DEBUG_ERROR, "Failed to send announce on interface", "name", name, "error", err)
-					lastErr = err
-				}
-			}
 		}
 	}
 
@@ -254,11 +234,11 @@ func (d *Destination) AcceptsLinks(accepts bool) {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 	d.acceptsLinks = accepts
-
+	
 	// Register with transport if accepting links
 	if accepts && d.transport != nil {
 		d.transport.RegisterDestination(d.hashValue, d)
-		debug.Log(debug.DEBUG_VERBOSE, "Destination registered with transport for link requests", "hash", fmt.Sprintf("%x", d.hashValue))
+		debugLog(DEBUG_VERBOSE, "Destination %x registered with transport for link requests", d.hashValue)
 	}
 }
 
@@ -274,28 +254,22 @@ func (d *Destination) GetLinkCallback() common.LinkEstablishedCallback {
 	return d.linkCallback
 }
 
-func (d *Destination) HandleIncomingLinkRequest(pkt interface{}, transport interface{}, networkIface common.NetworkInterface) error {
+func (d *Destination) HandleIncomingLinkRequest(linkID []byte, transport interface{}, networkIface common.NetworkInterface) error {
-	debug.Log(debug.DEBUG_INFO, "Handling incoming link request for destination", "hash", fmt.Sprintf("%x", d.GetHash()))
+	debugLog(DEBUG_INFO, "Handling incoming link request for destination %x", d.GetHash())
-
+	
-	pktObj, ok := pkt.(*packet.Packet)
+	// Import link package here to avoid circular dependency at package level
-	if !ok {
+	// We'll use dynamic import by having the caller create the link
-		return errors.New("invalid packet type")
+	// For now, just call the callback with a placeholder
+	
+	if d.linkCallback != nil {
+		debugLog(DEBUG_INFO, "Calling link established callback")
+		// Pass linkID as the link object for now
+		// The callback will need to handle creating the actual link
+		d.linkCallback(linkID)
+	} else {
+		debugLog(DEBUG_VERBOSE, "No link callback set")
 	}
-
+	
-	if incomingLinkHandler == nil {
-		return errors.New("no incoming link handler registered")
-	}
-
-	linkIface, err := incomingLinkHandler(pktObj, d, transport, networkIface)
-	if err != nil {
-		return fmt.Errorf("failed to handle link request: %w", err)
-	}
-
-	if d.linkCallback != nil && linkIface != nil {
-		debug.Log(debug.DEBUG_INFO, "Calling link established callback")
-		d.linkCallback(linkIface)
-	}
-
 	return nil
 }
 
@@ -305,35 +279,6 @@ func (d *Destination) SetPacketCallback(callback common.PacketCallback) {
 	d.packetCallback = callback
 }
 
-func (d *Destination) Receive(pkt *packet.Packet, iface common.NetworkInterface) {
-	d.mutex.RLock()
-	callback := d.packetCallback
-	d.mutex.RUnlock()
-
-	if callback == nil {
-		debug.Log(debug.DEBUG_VERBOSE, "No packet callback set for destination")
-		return
-	}
-
-	if pkt.PacketType == packet.PacketTypeLinkReq {
-		debug.Log(debug.DEBUG_INFO, "Received link request for destination")
-		if err := d.HandleIncomingLinkRequest(pkt, d.transport, iface); err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Failed to handle incoming link request", "error", err)
-		}
-		return
-	}
-
-	plaintext, err := d.Decrypt(pkt.Data)
-	if err != nil {
-		debug.Log(debug.DEBUG_INFO, "Failed to decrypt packet data", "error", err)
-		return
-	}
-
-	debug.Log(debug.DEBUG_INFO, "Destination received packet", "bytes", len(plaintext))
-
-	callback(plaintext, iface)
-}
-
 func (d *Destination) SetProofRequestedCallback(callback common.ProofRequestedCallback) {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
@@ -350,27 +295,8 @@ func (d *Destination) EnableRatchets(path string) bool {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 
-	if path == "" {
-		debug.Log(debug.DEBUG_ERROR, "No ratchet file path specified")
-		return false
-	}
-
 	d.ratchetsEnabled = true
 	d.ratchetPath = path
-	d.latestRatchetTime = time.Time{} // Zero time to force rotation
-
-	// Load or initialize ratchets
-	if err := d.reloadRatchets(); err != nil {
-		debug.Log(debug.DEBUG_ERROR, "Failed to load ratchets", "error", err)
-		// Initialize empty ratchet list
-		d.ratchets = make([][]byte, 0)
-		if err := d.persistRatchets(); err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Failed to create initial ratchet file", "error", err)
-			return false
-		}
-	}
-
-	debug.Log(debug.DEBUG_INFO, "Ratchets enabled", "path", path)
 	return true
 }
 
@@ -451,88 +377,34 @@ func (d *Destination) DeregisterRequestHandler(path string) bool {
 	return false
 }
 
-func (d *Destination) GetRequestHandler(pathHash []byte) func([]byte, []byte, []byte, []byte, *identity.Identity, time.Time) interface{} {
-	d.mutex.RLock()
-	defer d.mutex.RUnlock()
-
-	for _, handler := range d.requestHandlers {
-		handlerPathHash := identity.TruncatedHash([]byte(handler.Path))
-		if string(handlerPathHash) == string(pathHash) {
-			return func(pathHash []byte, data []byte, requestID []byte, linkID []byte, remoteIdentity *identity.Identity, requestedAt time.Time) interface{} {
-				allowed := false
-				if handler.AllowMode == ALLOW_ALL {
-					allowed = true
-				} else if handler.AllowMode == ALLOW_LIST && remoteIdentity != nil {
-					remoteHash := remoteIdentity.Hash()
-					for _, allowedHash := range handler.AllowedList {
-						if string(remoteHash) == string(allowedHash) {
-							allowed = true
-							break
-						}
-					}
-				}
-
-				if !allowed {
-					return nil
-				}
-
-				result := handler.ResponseGenerator(handler.Path, data, requestID, linkID, remoteIdentity, requestedAt.Unix())
-				if result == nil {
-					return nil
-				}
-				return result
-			}
-		}
-	}
-	return nil
-}
-
-func (d *Destination) HandleRequest(path string, data []byte, requestID []byte, linkID []byte, remoteIdentity *identity.Identity, requestedAt int64) []byte {
-	d.mutex.RLock()
-	handler, exists := d.requestHandlers[path]
-	d.mutex.RUnlock()
-
-	if !exists {
-		debug.Log(debug.DEBUG_INFO, "No handler registered for path", "path", path)
-		return []byte(">Not Found\n\nThe requested resource was not found.")
-	}
-
-	debug.Log(debug.DEBUG_VERBOSE, "Calling request handler", "path", path)
-	result := handler.ResponseGenerator(path, data, requestID, linkID, remoteIdentity, requestedAt)
-	if result == nil {
-		return []byte(">Not Found\n\nThe requested resource was not found.")
-	}
-	return result
-}
-
 func (d *Destination) Encrypt(plaintext []byte) ([]byte, error) {
 	if d.destType == PLAIN {
-		debug.Log(debug.DEBUG_VERBOSE, "Using plaintext transmission for PLAIN destination")
+		log.Printf("[DEBUG-4] Using plaintext transmission for PLAIN destination")
 		return plaintext, nil
 	}
 
 	if d.identity == nil {
-		debug.Log(debug.DEBUG_INFO, "Cannot encrypt: no identity available")
+		log.Printf("[DEBUG-3] Cannot encrypt: no identity available")
 		return nil, errors.New("no identity available for encryption")
 	}
 
-	debug.Log(debug.DEBUG_VERBOSE, "Encrypting bytes for destination", "bytes", len(plaintext), "destType", d.destType)
+	log.Printf("[DEBUG-4] Encrypting %d bytes for destination type %d", len(plaintext), d.destType)
 
 	switch d.destType {
 	case SINGLE:
-		recipientKey := d.identity.GetEncryptionKey()
+		recipientKey := d.identity.GetPublicKey()
-		debug.Log(debug.DEBUG_VERBOSE, "Encrypting for single recipient", "key", fmt.Sprintf("%x", recipientKey[:8]))
+		log.Printf("[DEBUG-4] Encrypting for single recipient with key %x", recipientKey[:8])
 		return d.identity.Encrypt(plaintext, recipientKey)
 	case GROUP:
 		key := d.identity.GetCurrentRatchetKey()
 		if key == nil {
-			debug.Log(debug.DEBUG_INFO, "Cannot encrypt: no ratchet key available")
+			log.Printf("[DEBUG-3] Cannot encrypt: no ratchet key available")
 			return nil, errors.New("no ratchet key available")
 		}
-		debug.Log(debug.DEBUG_VERBOSE, "Encrypting for group with ratchet key", "key", fmt.Sprintf("%x", key[:8]))
+		log.Printf("[DEBUG-4] Encrypting for group with ratchet key %x", key[:8])
 		return d.identity.EncryptWithHMAC(plaintext, key)
 	default:
-		debug.Log(debug.DEBUG_INFO, "Unsupported destination type for encryption", "destType", d.destType)
+		log.Printf("[DEBUG-3] Unsupported destination type %d for encryption", d.destType)
 		return nil, errors.New("unsupported destination type for encryption")
 	}
 }
@@ -593,186 +465,3 @@ func (d *Destination) GetHash() []byte {
 	}
 	return d.hashValue
 }
-
-func (d *Destination) persistRatchets() error {
-	d.ratchetFileLock.Lock()
-	defer d.ratchetFileLock.Unlock()
-
-	if !d.ratchetsEnabled || d.ratchetPath == "" {
-		return errors.New("ratchets not enabled or no path specified")
-	}
-
-	debug.Log(debug.DEBUG_PACKETS, "Persisting ratchets", "count", len(d.ratchets), "path", d.ratchetPath)
-
-	// Pack ratchets using msgpack
-	packedRatchets, err := msgpack.Marshal(d.ratchets)
-	if err != nil {
-		return fmt.Errorf("failed to pack ratchets: %w", err)
-	}
-
-	// Sign the packed ratchets
-	signature, err := d.Sign(packedRatchets)
-	if err != nil {
-		return fmt.Errorf("failed to sign ratchets: %w", err)
-	}
-
-	// Create structure
-	persistedData := map[string][]byte{
-		"signature": signature,
-		"ratchets":  packedRatchets,
-	}
-
-	// Pack the entire structure
-	finalData, err := msgpack.Marshal(persistedData)
-	if err != nil {
-		return fmt.Errorf("failed to pack ratchet data: %w", err)
-	}
-
-	// Write to temporary file first, then rename (atomic operation)
-	tempPath := d.ratchetPath + ".tmp"
-	file, err := os.Create(tempPath) // #nosec G304
-	if err != nil {
-		return fmt.Errorf("failed to create temp ratchet file: %w", err)
-	}
-
-	if _, err := file.Write(finalData); err != nil {
-		// #nosec G104 - Error already being handled, cleanup errors are non-critical
-		file.Close()
-		// #nosec G104 - Error already being handled, cleanup errors are non-critical
-		os.Remove(tempPath)
-		return fmt.Errorf("failed to write ratchet data: %w", err)
-	}
-	// #nosec G104 - File is being closed after successful write, error is non-critical
-	file.Close()
-
-	// Remove old file if exists
-	if _, err := os.Stat(d.ratchetPath); err == nil {
-		// #nosec G104 - Removing old file, error is non-critical if it doesn't exist
-		os.Remove(d.ratchetPath)
-	}
-
-	// Atomic rename
-	if err := os.Rename(tempPath, d.ratchetPath); err != nil {
-		// #nosec G104 - Error already being handled, cleanup errors are non-critical
-		os.Remove(tempPath)
-		return fmt.Errorf("failed to rename ratchet file: %w", err)
-	}
-
-	debug.Log(debug.DEBUG_PACKETS, "Ratchets persisted successfully")
-	return nil
-}
-
-func (d *Destination) reloadRatchets() error {
-	d.ratchetFileLock.Lock()
-	defer d.ratchetFileLock.Unlock()
-
-	if _, err := os.Stat(d.ratchetPath); os.IsNotExist(err) {
-		debug.Log(debug.DEBUG_INFO, "No existing ratchet data found, initializing new ratchet file")
-		d.ratchets = make([][]byte, 0)
-		return nil
-	}
-
-	file, err := os.Open(d.ratchetPath) // #nosec G304
-	if err != nil {
-		return fmt.Errorf("failed to open ratchet file: %w", err)
-	}
-	defer file.Close()
-
-	// Read all data
-	fileData, err := io.ReadAll(file)
-	if err != nil {
-		return fmt.Errorf("failed to read ratchet file: %w", err)
-	}
-
-	// Unpack outer structure
-	var persistedData map[string][]byte
-	if err := msgpack.Unmarshal(fileData, &persistedData); err != nil {
-		return fmt.Errorf("failed to unpack ratchet data: %w", err)
-	}
-
-	signature, hasSignature := persistedData["signature"]
-	packedRatchets, hasRatchets := persistedData["ratchets"]
-
-	if !hasSignature || !hasRatchets {
-		return fmt.Errorf("invalid ratchet file format")
-	}
-
-	// Verify signature
-	if !d.identity.Verify(packedRatchets, signature) {
-		return fmt.Errorf("invalid ratchet file signature")
-	}
-
-	// Unpack ratchet list
-	if err := msgpack.Unmarshal(packedRatchets, &d.ratchets); err != nil {
-		return fmt.Errorf("failed to unpack ratchet list: %w", err)
-	}
-
-	debug.Log(debug.DEBUG_INFO, "Ratchets reloaded successfully", "count", len(d.ratchets))
-	return nil
-}
-
-func (d *Destination) RotateRatchets() error {
-	d.mutex.Lock()
-	defer d.mutex.Unlock()
-
-	if !d.ratchetsEnabled {
-		return errors.New("ratchets not enabled")
-	}
-
-	now := time.Now()
-	if !d.latestRatchetTime.IsZero() && now.Before(d.latestRatchetTime.Add(time.Duration(d.ratchetInterval)*time.Second)) {
-		debug.Log(debug.DEBUG_TRACE, "Ratchet rotation interval not reached")
-		return nil
-	}
-
-	debug.Log(debug.DEBUG_INFO, "Rotating ratchets", "destination", d.ExpandName())
-
-	// Generate new ratchet key (32 bytes for X25519 private key)
-	newRatchet := make([]byte, 32)
-	if _, err := io.ReadFull(rand.Reader, newRatchet); err != nil {
-		return fmt.Errorf("failed to generate new ratchet: %w", err)
-	}
-
-	// Insert at beginning (most recent first)
-	d.ratchets = append([][]byte{newRatchet}, d.ratchets...)
-	d.latestRatchetTime = now
-
-	// Get ratchet public key for ID
-	ratchetPub, err := curve25519.X25519(newRatchet, curve25519.Basepoint)
-	if err == nil {
-		d.latestRatchetID = identity.TruncatedHash(ratchetPub)[:identity.NAME_HASH_LENGTH/8]
-	}
-
-	// Clean old ratchets
-	d.cleanRatchets()
-
-	// Persist to disk
-	if err := d.persistRatchets(); err != nil {
-		debug.Log(debug.DEBUG_ERROR, "Failed to persist ratchets after rotation", "error", err)
-		return err
-	}
-
-	debug.Log(debug.DEBUG_INFO, "Ratchet rotation completed", "total_ratchets", len(d.ratchets))
-	return nil
-}
-
-func (d *Destination) cleanRatchets() {
-	if len(d.ratchets) > d.ratchetCount {
-		debug.Log(debug.DEBUG_TRACE, "Cleaning old ratchets", "before", len(d.ratchets), "keeping", d.ratchetCount)
-		d.ratchets = d.ratchets[:d.ratchetCount]
-	}
-}
-
-func (d *Destination) GetRatchets() [][]byte {
-	d.mutex.RLock()
-	defer d.mutex.RUnlock()
-
-	if !d.ratchetsEnabled {
-		return nil
-	}
-
-	// Return copy to prevent external modification
-	ratchetsCopy := make([][]byte, len(d.ratchets))
-	copy(ratchetsCopy, d.ratchets)
-	return ratchetsCopy
-}

pkg/destination/destination_test.go

@@ -1,152 +0,0 @@
-package destination
-
-import (
-	"bytes"
-	"path/filepath"
-	"testing"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
-)
-
-type mockTransport struct {
-	config     *common.ReticulumConfig
-	interfaces map[string]common.NetworkInterface
-}
-
-func (m *mockTransport) GetConfig() *common.ReticulumConfig {
-	return m.config
-}
-
-func (m *mockTransport) GetInterfaces() map[string]common.NetworkInterface {
-	return m.interfaces
-}
-
-func (m *mockTransport) RegisterDestination(hash []byte, dest interface{}) {
-}
-
-type mockInterface struct {
-	common.BaseInterface
-}
-
-func (m *mockInterface) Send(data []byte, address string) error {
-	return nil
-}
-
-func TestNewDestination(t *testing.T) {
-	id, _ := identity.New()
-	transport := &mockTransport{config: &common.ReticulumConfig{}}
-
-	dest, err := New(id, IN|OUT, SINGLE, "testapp", transport, "testaspect")
-	if err != nil {
-		t.Fatalf("New failed: %v", err)
-	}
-	if dest == nil {
-		t.Fatal("New returned nil")
-	}
-
-	if dest.ExpandName() != "testapp.testaspect" {
-		t.Errorf("Expected name testapp.testaspect, got %s", dest.ExpandName())
-	}
-
-	hash := dest.GetHash()
-	if len(hash) != 16 {
-		t.Errorf("Expected hash length 16, got %d", len(hash))
-	}
-}
-
-func TestFromHash(t *testing.T) {
-	id, _ := identity.New()
-	transport := &mockTransport{}
-	hash := make([]byte, 16)
-
-	dest, err := FromHash(hash, id, SINGLE, transport)
-	if err != nil {
-		t.Fatalf("FromHash failed: %v", err)
-	}
-	if !bytes.Equal(dest.GetHash(), hash) {
-		t.Error("Hashes don't match")
-	}
-}
-
-func TestRequestHandlers(t *testing.T) {
-	id, _ := identity.New()
-	dest, _ := New(id, IN, SINGLE, "test", &mockTransport{})
-
-	path := "test/path"
-	response := []byte("hello")
-
-	err := dest.RegisterRequestHandler(path, func(p string, d []byte, rid []byte, lid []byte, ri *identity.Identity, ra int64) []byte {
-		return response
-	}, ALLOW_ALL, nil)
-	if err != nil {
-		t.Fatalf("RegisterRequestHandler failed: %v", err)
-	}
-
-	result := dest.HandleRequest(path, nil, nil, nil, nil, 0)
-	if !bytes.Equal(result, response) {
-		t.Errorf("Expected response %q, got %q", response, result)
-	}
-
-	if !dest.DeregisterRequestHandler(path) {
-		t.Error("DeregisterRequestHandler failed")
-	}
-}
-
-func TestEncryptDecrypt(t *testing.T) {
-	id, _ := identity.New()
-	dest, _ := New(id, IN|OUT, SINGLE, "test", &mockTransport{})
-
-	plaintext := []byte("hello world")
-	ciphertext, err := dest.Encrypt(plaintext)
-	if err != nil {
-		t.Fatalf("Encrypt failed: %v", err)
-	}
-
-	decrypted, err := dest.Decrypt(ciphertext)
-	if err != nil {
-		t.Fatalf("Decrypt failed: %v", err)
-	}
-
-	if !bytes.Equal(plaintext, decrypted) {
-		t.Errorf("Decrypted data doesn't match: %q vs %q", decrypted, plaintext)
-	}
-}
-
-func TestRatchets(t *testing.T) {
-	tmpDir := t.TempDir()
-	ratchetPath := filepath.Join(tmpDir, "ratchets")
-
-	id, _ := identity.New()
-	dest, _ := New(id, IN|OUT, SINGLE, "test", &mockTransport{})
-
-	if !dest.EnableRatchets(ratchetPath) {
-		t.Fatal("EnableRatchets failed")
-	}
-
-	err := dest.RotateRatchets()
-	if err != nil {
-		t.Fatalf("RotateRatchets failed: %v", err)
-	}
-
-	ratchets := dest.GetRatchets()
-	if len(ratchets) != 1 {
-		t.Errorf("Expected 1 ratchet, got %d", len(ratchets))
-	}
-}
-
-func TestPlainDestination(t *testing.T) {
-	id, _ := identity.New()
-	dest, _ := New(id, IN|OUT, PLAIN, "test", &mockTransport{})
-
-	plaintext := []byte("plain text")
-	ciphertext, _ := dest.Encrypt(plaintext)
-	if !bytes.Equal(plaintext, ciphertext) {
-		t.Error("Plain destination should not encrypt")
-	}
-
-	decrypted, _ := dest.Decrypt(ciphertext)
-	if !bytes.Equal(plaintext, decrypted) {
-		t.Error("Plain destination should not decrypt")
-	}
-}

pkg/identity/identity.go

@@ -8,17 +8,17 @@ import (
 	"crypto/rand"
 	"crypto/sha256"
 	"encoding/hex"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"sync"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/cryptography"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/cryptography"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-	"github.com/vmihailenco/msgpack/v5"
 	"golang.org/x/crypto/curve25519"
 	"golang.org/x/crypto/hkdf"
 )
@@ -44,7 +44,7 @@ const (
 type Identity struct {
 	privateKey      []byte
 	publicKey       []byte
-	signingSeed     []byte // 32-byte Ed25519 seed
+	signingSeed     []byte // 32-byte Ed25519 seed (compatible with Python RNS)
 	verificationKey ed25519.PublicKey
 	hash            []byte
 	hexHash         string
@@ -76,7 +76,7 @@ func New() (*Identity, error) {
 	i.privateKey = privKey
 	i.publicKey = pubKey
 
-	// Generate 32-byte Ed25519 seed
+	// Generate 32-byte Ed25519 seed (compatible with Python RNS)
 	var ed25519Seed [32]byte
 	if _, err := io.ReadFull(rand.Reader, ed25519Seed[:]); err != nil {
 		return nil, fmt.Errorf("failed to generate Ed25519 seed: %v", err)
@@ -105,7 +105,7 @@ func (i *Identity) GetPrivateKey() []byte {
 }
 
 func (i *Identity) Sign(data []byte) []byte {
-	// Derive Ed25519 private key from seed
+	// Derive Ed25519 private key from seed (compatible with Python RNS)
 	privKey := ed25519.NewKeyFromSeed(i.signingSeed)
 	return cryptography.Sign(privKey, data)
 }
@@ -133,25 +133,20 @@ func (i *Identity) Encrypt(plaintext []byte, ratchet []byte) ([]byte, error) {
 		return nil, err
 	}
 
-	// Derive key material (64 bytes: first 32 for HMAC, last 32 for encryption)
+	// Derive encryption key
-	salt := i.GetSalt()
+	key, err := cryptography.DeriveKey(sharedSecret, i.GetSalt(), i.GetContext(), 32)
-	debug.Log(debug.DEBUG_ALL, "Encrypt: using salt", "salt", fmt.Sprintf("%x", salt), "identity_hash", fmt.Sprintf("%x", i.Hash()))
-	key, err := cryptography.DeriveKey(sharedSecret, salt, i.GetContext(), 64)
 	if err != nil {
 		return nil, err
 	}
 
-	hmacKey := key[:32]
-	encryptionKey := key[32:64]
-
 	// Encrypt data
-	ciphertext, err := cryptography.EncryptAES256CBC(encryptionKey, plaintext)
+	ciphertext, err := cryptography.EncryptAES256CBC(key[:32], plaintext)
 	if err != nil {
 		return nil, err
 	}
 
-	// Calculate HMAC over ciphertext only (iv + encrypted_data)
+	// Calculate HMAC
-	mac := cryptography.ComputeHMAC(hmacKey, ciphertext)
+	mac := cryptography.ComputeHMAC(key, append(ephemeralPubKey, ciphertext...))
 
 	// Combine components
 	token := make([]byte, 0, len(ephemeralPubKey)+len(ciphertext)+len(mac))
@@ -178,7 +173,7 @@ func GetRandomHash() []byte {
 	randomData := make([]byte, TRUNCATED_HASHLENGTH/8)
 	_, err := rand.Read(randomData) // #nosec G104
 	if err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "Failed to read random data for hash", "error", err)
+		log.Printf("[DEBUG-1] Failed to read random data for hash: %v", err)
 		return nil // Or handle the error appropriately
 	}
 	return TruncatedHash(randomData)
@@ -226,18 +221,13 @@ func FromPublicKey(publicKey []byte) *Identity {
 		return nil
 	}
 
-	id := &Identity{
+	return &Identity{
 		publicKey:       publicKey[:KEYSIZE/16],
 		verificationKey: publicKey[KEYSIZE/16:],
 		ratchets:        make(map[string][]byte),
 		ratchetExpiry:   make(map[string]int64),
 		mutex:           &sync.RWMutex{},
 	}
-
-	hash := cryptography.Hash(id.GetPublicKey())
-	id.hash = hash[:TRUNCATED_HASHLENGTH/8]
-
-	return id
 }
 
 func (i *Identity) Hex() string {
@@ -250,7 +240,7 @@ func (i *Identity) String() string {
 
 func Recall(hash []byte) (*Identity, error) {
 	hashStr := hex.EncodeToString(hash)
-
+	
 	if data, exists := knownDestinations[hashStr]; exists {
 		// data is [packet, destHash, identity, appData]
 		if len(data) >= 3 {
@@ -259,7 +249,7 @@ func Recall(hash []byte) (*Identity, error) {
 			}
 		}
 	}
-
+	
 	return nil, fmt.Errorf("identity not found for hash %x", hash)
 }
 
@@ -289,13 +279,13 @@ func (i *Identity) GetCurrentRatchetKey() []byte {
 	if len(i.ratchets) == 0 {
 		// If no ratchets exist, generate one.
 		// This should ideally be handled by an explicit setup process.
-		debug.Log(debug.DEBUG_TRACE, "No ratchets found, generating a new one on-the-fly")
+		log.Println("[DEBUG-5] No ratchets found, generating a new one on-the-fly.")
 		// Temporarily unlock to call RotateRatchet, which locks internally.
 		i.mutex.RUnlock()
 		newRatchet, err := i.RotateRatchet()
 		i.mutex.RLock()
 		if err != nil {
-			debug.Log(debug.DEBUG_CRITICAL, "Failed to generate initial ratchet key", "error", err)
+			log.Printf("[DEBUG-1] Failed to generate initial ratchet key: %v", err)
 			return nil
 		}
 		return newRatchet
@@ -303,7 +293,7 @@ func (i *Identity) GetCurrentRatchetKey() []byte {
 
 	// Return the most recently generated ratchet key
 	var latestKey []byte
-	var latestTime int64
+	var latestTime int64 = 0
 	for id, expiry := range i.ratchetExpiry {
 		if expiry > latestTime {
 			latestTime = expiry
@@ -312,7 +302,7 @@ func (i *Identity) GetCurrentRatchetKey() []byte {
 	}
 
 	if latestKey == nil {
-		debug.Log(debug.DEBUG_ERROR, "Could not determine the latest ratchet key", "ratchet_count", len(i.ratchets))
+		log.Printf("[DEBUG-2] Could not determine the latest ratchet key from %d ratchets.", len(i.ratchets))
 	}
 
 	return latestKey
@@ -320,13 +310,13 @@ func (i *Identity) GetCurrentRatchetKey() []byte {
 
 func (i *Identity) Decrypt(ciphertextToken []byte, ratchets [][]byte, enforceRatchets bool, ratchetIDReceiver *common.RatchetIDReceiver) ([]byte, error) {
 	if i.privateKey == nil {
-		debug.Log(debug.DEBUG_CRITICAL, "Decryption failed: identity has no private key")
+		log.Printf("[DEBUG-1] Decryption failed: identity has no private key")
 		return nil, errors.New("decryption failed because identity does not hold a private key")
 	}
 
-	debug.Log(debug.DEBUG_ALL, "Starting decryption for identity", "hash", i.GetHexHash())
+	log.Printf("[DEBUG-7] Starting decryption for identity %s", i.GetHexHash())
 	if len(ratchets) > 0 {
-		debug.Log(debug.DEBUG_ALL, "Attempting decryption with ratchets", "count", len(ratchets))
+		log.Printf("[DEBUG-7] Attempting decryption with %d ratchets", len(ratchets))
 	}
 
 	if len(ciphertextToken) <= KEYSIZE/8/2 {
@@ -345,7 +335,7 @@ func (i *Identity) Decrypt(ciphertextToken []byte, ratchets [][]byte, enforceRat
 	// Try decryption with ratchets first if provided
 	if len(ratchets) > 0 {
 		for _, ratchet := range ratchets {
-			if decrypted, ratchetID, err := i.tryRatchetDecryption(peerPubBytes, ciphertext, mac, ratchet); err == nil {
+			if decrypted, ratchetID, err := i.tryRatchetDecryption(peerPubBytes, ciphertext, ratchet); err == nil {
 				if ratchetIDReceiver != nil {
 					ratchetIDReceiver.LatestRatchetID = ratchetID
 				}
@@ -367,25 +357,20 @@ func (i *Identity) Decrypt(ciphertextToken []byte, ratchets [][]byte, enforceRat
 		return nil, fmt.Errorf("failed to generate shared key: %v", err)
 	}
 
-	// Derive key material (64 bytes: first 32 for HMAC, last 32 for encryption)
+	// Derive key using HKDF
-	salt := i.GetSalt()
+	hkdfReader := hkdf.New(sha256.New, sharedKey, i.GetSalt(), i.GetContext())
-	debug.Log(debug.DEBUG_ALL, "Decrypt: using salt", "salt", fmt.Sprintf("%x", salt), "identity_hash", fmt.Sprintf("%x", i.Hash()))
+	derivedKey := make([]byte, 32)
-	hkdfReader := hkdf.New(sha256.New, sharedKey, salt, i.GetContext())
-	derivedKey := make([]byte, 64)
 	if _, err := io.ReadFull(hkdfReader, derivedKey); err != nil {
 		return nil, fmt.Errorf("failed to derive key: %v", err)
 	}
 
-	hmacKey := derivedKey[:32]
+	// Validate HMAC
-	encryptionKey := derivedKey[32:64]
+	if !cryptography.ValidateHMAC(derivedKey, append(peerPubBytes, ciphertext...), mac) {
-
-	// Validate HMAC over ciphertext only (iv + encrypted_data)
-	if !cryptography.ValidateHMAC(hmacKey, ciphertext, mac) {
 		return nil, errors.New("invalid HMAC")
 	}
 
 	// Create AES cipher
-	block, err := aes.NewCipher(encryptionKey)
+	block, err := aes.NewCipher(derivedKey)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create cipher: %v", err)
 	}
@@ -422,42 +407,34 @@ func (i *Identity) Decrypt(ciphertextToken []byte, ratchets [][]byte, enforceRat
 		ratchetIDReceiver.LatestRatchetID = nil
 	}
 
-	debug.Log(debug.DEBUG_ALL, "Decryption completed successfully")
+	log.Printf("[DEBUG-7] Decryption completed successfully")
 	return plaintext[:len(plaintext)-padding], nil
 }
 
 // Helper function to attempt decryption using a ratchet
-func (i *Identity) tryRatchetDecryption(peerPubBytes, ciphertext, mac, ratchet []byte) (plaintext, ratchetID []byte, err error) {
+func (i *Identity) tryRatchetDecryption(peerPubBytes, ciphertext, ratchet []byte) ([]byte, []byte, error) {
 	// Convert ratchet to private key
 	ratchetPriv := ratchet
 
 	// Get ratchet ID
 	ratchetPubBytes, err := curve25519.X25519(ratchetPriv, cryptography.GetBasepoint())
 	if err != nil {
-		debug.Log(debug.DEBUG_ALL, "Failed to generate ratchet public key", "error", err)
+		log.Printf("[DEBUG-7] Failed to generate ratchet public key: %v", err)
 		return nil, nil, err
 	}
-	ratchetID = i.GetRatchetID(ratchetPubBytes)
+	ratchetID := i.GetRatchetID(ratchetPubBytes)
 
 	sharedSecret, err := cryptography.DeriveSharedSecret(ratchet, peerPubBytes)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	key, err := cryptography.DeriveKey(sharedSecret, i.GetSalt(), i.GetContext(), 64)
+	key, err := cryptography.DeriveKey(sharedSecret, i.GetSalt(), i.GetContext(), 32)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	hmacKey := key[:32]
+	plaintext, err := cryptography.DecryptAES256CBC(key, ciphertext)
-	encryptionKey := key[32:64]
-
-	// Validate HMAC over ciphertext only (iv + encrypted_data)
-	if !cryptography.ValidateHMAC(hmacKey, ciphertext, mac) {
-		return nil, nil, errors.New("invalid HMAC")
-	}
-
-	plaintext, err = cryptography.DecryptAES256CBC(encryptionKey, ciphertext)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -466,23 +443,12 @@ func (i *Identity) tryRatchetDecryption(peerPubBytes, ciphertext, mac, ratchet [
 }
 
 func (i *Identity) EncryptWithHMAC(plaintext []byte, key []byte) ([]byte, error) {
-	var hmacKey, encryptionKey []byte
+	ciphertext, err := cryptography.EncryptAES256CBC(key, plaintext)
-	if len(key) == 64 {
-		hmacKey = key[:32]
-		encryptionKey = key[32:64]
-	} else if len(key) == 32 {
-		hmacKey = key[:16]
-		encryptionKey = key[16:32]
-	} else {
-		return nil, errors.New("invalid key length for EncryptWithHMAC")
-	}
-
-	ciphertext, err := cryptography.EncryptAES256CBC(encryptionKey, plaintext)
 	if err != nil {
 		return nil, err
 	}
 
-	mac := cryptography.ComputeHMAC(hmacKey, ciphertext)
+	mac := cryptography.ComputeHMAC(key, ciphertext)
 	return append(ciphertext, mac...), nil
 }
 
@@ -491,159 +457,48 @@ func (i *Identity) DecryptWithHMAC(data []byte, key []byte) ([]byte, error) {
 		return nil, errors.New("data too short")
 	}
 
-	var hmacKey, encryptionKey []byte
-	if len(key) == 64 {
-		hmacKey = key[:32]
-		encryptionKey = key[32:64]
-	} else if len(key) == 32 {
-		hmacKey = key[:16]
-		encryptionKey = key[16:32]
-	} else {
-		return nil, errors.New("invalid key length for DecryptWithHMAC")
-	}
-
 	macStart := len(data) - cryptography.SHA256Size
 	ciphertext := data[:macStart]
 	messageMAC := data[macStart:]
 
-	if !cryptography.ValidateHMAC(hmacKey, ciphertext, messageMAC) {
+	if !cryptography.ValidateHMAC(key, ciphertext, messageMAC) {
 		return nil, errors.New("invalid HMAC")
 	}
 
-	return cryptography.DecryptAES256CBC(encryptionKey, ciphertext)
+	return cryptography.DecryptAES256CBC(key, ciphertext)
 }
 
 func (i *Identity) ToFile(path string) error {
-	debug.Log(debug.DEBUG_ALL, "Saving identity to file", "hash", i.GetHexHash(), "path", path)
+	log.Printf("[DEBUG-7] Saving identity %s to file: %s", i.GetHexHash(), path)
 
-	if i.privateKey == nil || i.signingSeed == nil {
+	// Persist ratchets to a separate file
-		return errors.New("cannot save identity without private keys")
+	ratchetPath := path + ".ratchets"
+	if err := i.saveRatchets(ratchetPath); err != nil {
+		log.Printf("[DEBUG-1] Failed to save ratchets: %v", err)
+		// Continue saving the main identity file even if ratchets fail
 	}
 
-	// Store private keys as raw bytes
+	data := map[string]interface{}{
-	// Format: [X25519 PrivKey (32 bytes)][Ed25519 PrivKey (32 bytes)]
+		"private_key":      i.privateKey,
-	// Total: 64 bytes
+		"public_key":       i.publicKey,
-	privateKeyBytes := make([]byte, 64)
+		"signing_seed":     i.signingSeed,
-	copy(privateKeyBytes[:32], i.privateKey)
+		"verification_key": i.verificationKey,
-	copy(privateKeyBytes[32:], i.signingSeed)
+		"app_data":         i.appData,
+	}
 
-	// Write raw bytes to file
 	file, err := os.Create(path) // #nosec G304
 	if err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "Failed to create identity file", "error", err)
+		log.Printf("[DEBUG-1] Failed to create identity file: %v", err)
 		return err
 	}
 	defer file.Close()
 
-	if _, err := file.Write(privateKeyBytes); err != nil {
+	if err := json.NewEncoder(file).Encode(data); err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "Failed to write identity data", "error", err)
+		log.Printf("[DEBUG-1] Failed to encode identity data: %v", err)
 		return err
 	}
 
-	debug.Log(debug.DEBUG_ALL, "Identity saved successfully", "bytes", len(privateKeyBytes))
+	log.Printf("[DEBUG-7] Identity saved successfully")
-	return nil
-}
-
-func FromFile(path string) (*Identity, error) {
-	debug.Log(debug.DEBUG_ALL, "Loading identity from file", "path", path)
-
-	// Read the private key bytes from file
-	// bearer:disable go_gosec_filesystem_filereadtaint
-	data, err := os.ReadFile(path) // #nosec G304
-	if err != nil {
-		return nil, fmt.Errorf("failed to read identity file: %w", err)
-	}
-
-	if len(data) != 64 {
-		return nil, fmt.Errorf("invalid identity file: expected 64 bytes, got %d", len(data))
-	}
-
-	// Parse the private keys
-	// Format: [X25519 PrivKey (32 bytes)][Ed25519 PrivKey (32 bytes)]
-	privateKey := data[:32]
-	signingSeed := data[32:64]
-
-	// Create identity with initialized maps and mutex
-	ident := &Identity{
-		ratchets:      make(map[string][]byte),
-		ratchetExpiry: make(map[string]int64),
-		mutex:         &sync.RWMutex{},
-	}
-
-	if err := ident.loadPrivateKey(privateKey, signingSeed); err != nil {
-		return nil, fmt.Errorf("failed to load private key: %w", err)
-	}
-
-	debug.Log(debug.DEBUG_INFO, "Identity loaded from file", "hash", ident.GetHexHash())
-	return ident, nil
-}
-
-func LoadOrCreateTransportIdentity() (*Identity, error) {
-	storagePath := os.Getenv("RETICULUM_STORAGE_PATH")
-	if storagePath == "" {
-		homeDir, err := os.UserHomeDir()
-		if err != nil {
-			return nil, fmt.Errorf("failed to get home directory: %w", err)
-		}
-		storagePath = fmt.Sprintf("%s/.reticulum/storage", homeDir)
-	}
-
-	if err := os.MkdirAll(storagePath, 0700); err != nil {
-		return nil, fmt.Errorf("failed to create storage directory: %w", err)
-	}
-
-	transportIdentityPath := fmt.Sprintf("%s/transport_identity", storagePath)
-
-	if ident, err := FromFile(transportIdentityPath); err == nil {
-		debug.Log(debug.DEBUG_INFO, "Loaded transport identity from storage")
-		return ident, nil
-	}
-
-	debug.Log(debug.DEBUG_INFO, "No valid transport identity in storage, creating new one")
-	ident, err := New()
-	if err != nil {
-		return nil, fmt.Errorf("failed to create transport identity: %w", err)
-	}
-
-	if err := ident.ToFile(transportIdentityPath); err != nil {
-		return nil, fmt.Errorf("failed to save transport identity: %w", err)
-	}
-
-	debug.Log(debug.DEBUG_INFO, "Created and saved transport identity")
-	return ident, nil
-}
-
-func (i *Identity) loadPrivateKey(privateKey, signingSeed []byte) error {
-	if len(privateKey) != 32 || len(signingSeed) != 32 {
-		return errors.New("invalid private key length")
-	}
-
-	// Load X25519 private key
-	i.privateKey = make([]byte, 32)
-	copy(i.privateKey, privateKey)
-
-	// Load Ed25519 signing seed
-	i.signingSeed = make([]byte, 32)
-	copy(i.signingSeed, signingSeed)
-
-	// Derive public keys from private keys
-	var err error
-	i.publicKey, err = curve25519.X25519(i.privateKey, curve25519.Basepoint)
-	if err != nil {
-		return fmt.Errorf("failed to derive X25519 public key: %w", err)
-	}
-
-	signingKey := ed25519.NewKeyFromSeed(i.signingSeed)
-	i.verificationKey = signingKey.Public().(ed25519.PublicKey)
-
-	// Update hash
-	publicKeyBytes := make([]byte, 0, len(i.publicKey)+len(i.verificationKey))
-	publicKeyBytes = append(publicKeyBytes, i.publicKey...)
-	publicKeyBytes = append(publicKeyBytes, i.verificationKey...)
-	i.hash = TruncatedHash(publicKeyBytes)[:TRUNCATED_HASHLENGTH/8]
-	i.hexHash = hex.EncodeToString(i.hash)
-
-	debug.Log(debug.DEBUG_VERBOSE, "Private key loaded successfully", "hash", i.GetHexHash())
 	return nil
 }
 
@@ -655,117 +510,70 @@ func (i *Identity) saveRatchets(path string) error {
 		return nil // Nothing to save
 	}
 
-	debug.Log(debug.DEBUG_PACKETS, "Saving ratchets", "count", len(i.ratchets), "path", path)
+	log.Printf("[DEBUG-6] Saving %d ratchets to %s", len(i.ratchets), path)
-
+	data := map[string]interface{}{
-	// Convert ratchets to list format for msgpack
+		"ratchets":       i.ratchets,
-	ratchetList := make([][]byte, 0, len(i.ratchets))
+		"ratchet_expiry": i.ratchetExpiry,
-	for _, ratchet := range i.ratchets {
-		ratchetList = append(ratchetList, ratchet)
 	}
 
-	// Pack ratchets using msgpack
+	file, err := os.Create(path) // #nosec G304
-	packedRatchets, err := msgpack.Marshal(ratchetList)
 	if err != nil {
-		return fmt.Errorf("failed to pack ratchets: %w", err)
+		return fmt.Errorf("failed to create ratchet file: %w", err)
 	}
+	defer file.Close()
 
-	// Sign the packed ratchets
+	return json.NewEncoder(file).Encode(data)
-	signature := i.Sign(packedRatchets)
-
-	// Create structure: {"signature": ..., "ratchets": ...}
-	persistedData := map[string][]byte{
-		"signature": signature,
-		"ratchets":  packedRatchets,
-	}
-
-	// Pack the entire structure
-	finalData, err := msgpack.Marshal(persistedData)
-	if err != nil {
-		return fmt.Errorf("failed to pack ratchet data: %w", err)
-	}
-
-	// Write to temporary file first, then rename (atomic operation)
-	tempPath := path + ".tmp"
-	file, err := os.Create(tempPath) // #nosec G304
-	if err != nil {
-		return fmt.Errorf("failed to create temp ratchet file: %w", err)
-	}
-
-	if _, err := file.Write(finalData); err != nil {
-		// #nosec G104 - Error already being handled, cleanup errors are non-critical
-		file.Close()
-		// #nosec G104 - Error already being handled, cleanup errors are non-critical
-		os.Remove(tempPath)
-		return fmt.Errorf("failed to write ratchet data: %w", err)
-	}
-	// #nosec G104 - File is being closed after successful write, error is non-critical
-	file.Close()
-
-	// Atomic rename
-	if err := os.Rename(tempPath, path); err != nil {
-		// #nosec G104 - Error already being handled, cleanup errors are non-critical
-		os.Remove(tempPath)
-		return fmt.Errorf("failed to rename ratchet file: %w", err)
-	}
-
-	debug.Log(debug.DEBUG_PACKETS, "Ratchets saved successfully")
-	return nil
 }
 
 func RecallIdentity(path string) (*Identity, error) {
-	debug.Log(debug.DEBUG_ALL, "Attempting to recall identity", "path", path)
+	log.Printf("[DEBUG-7] Attempting to recall identity from: %s", path)
 
-	// bearer:disable go_gosec_filesystem_filereadtaint
 	file, err := os.Open(path) // #nosec G304
 	if err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "Failed to open identity file", "error", err)
+		log.Printf("[DEBUG-1] Failed to open identity file: %v", err)
 		return nil, err
 	}
 	defer file.Close()
 
-	// Read raw bytes
+	var data map[string]interface{}
-	// Format: [X25519 PrivKey (32 bytes)][Ed25519 PrivKey (32 bytes)]
+	if err := json.NewDecoder(file).Decode(&data); err != nil {
-	privateKeyBytes := make([]byte, 64)
+		log.Printf("[DEBUG-1] Failed to decode identity data: %v", err)
-	n, err := io.ReadFull(file, privateKeyBytes)
-	if err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "Failed to read identity data", "error", err)
 		return nil, err
 	}
-	if n != 64 {
+
-		return nil, fmt.Errorf("invalid identity file: expected 64 bytes, got %d", n)
+	var signingSeed []byte
+	var verificationKey ed25519.PublicKey
+
+	if seedData, exists := data["signing_seed"]; exists {
+		signingSeed = seedData.([]byte)
+		verificationKey = data["verification_key"].(ed25519.PublicKey)
+	} else if keyData, exists := data["signing_key"]; exists {
+		oldKey := keyData.(ed25519.PrivateKey)
+		signingSeed = oldKey[:32]
+		verificationKey = data["verification_key"].(ed25519.PublicKey)
+	} else {
+		return nil, fmt.Errorf("no signing key data found in identity file")
 	}
 
-	// Extract keys
-	x25519PrivKey := privateKeyBytes[:32]
-	ed25519Seed := privateKeyBytes[32:]
-
-	// Derive public keys
-	x25519PubKey, err := curve25519.X25519(x25519PrivKey, curve25519.Basepoint)
-	if err != nil {
-		return nil, fmt.Errorf("failed to derive X25519 public key: %v", err)
-	}
-
-	ed25519PrivKey := ed25519.NewKeyFromSeed(ed25519Seed)
-	ed25519PubKey := ed25519PrivKey.Public().(ed25519.PublicKey)
-
 	id := &Identity{
-		privateKey:      x25519PrivKey,
+		privateKey:      data["private_key"].([]byte),
-		publicKey:       x25519PubKey,
+		publicKey:       data["public_key"].([]byte),
-		signingSeed:     ed25519Seed,
+		signingSeed:     signingSeed,
-		verificationKey: ed25519PubKey,
+		verificationKey: verificationKey,
+		appData:         data["app_data"].([]byte),
 		ratchets:        make(map[string][]byte),
 		ratchetExpiry:   make(map[string]int64),
 		mutex:           &sync.RWMutex{},
 	}
 
-	// Generate hash
+	// Load ratchets if they exist
-	combinedPub := make([]byte, KEYSIZE/8)
+	ratchetPath := path + ".ratchets"
-	copy(combinedPub[:KEYSIZE/16], id.publicKey)
+	if err := id.loadRatchets(ratchetPath); err != nil {
-	copy(combinedPub[KEYSIZE/16:], id.verificationKey)
+		log.Printf("[DEBUG-2] Could not load ratchets for identity %s: %v", id.GetHexHash(), err)
-	hash := sha256.Sum256(combinedPub)
+		// This is not a fatal error, the identity can still function
-	id.hash = hash[:TRUNCATED_HASHLENGTH/8]
+	}
 
-	debug.Log(debug.DEBUG_ALL, "Successfully recalled identity", "hash", id.GetHexHash())
+	log.Printf("[DEBUG-7] Successfully recalled identity with hash: %s", id.GetHexHash())
 	return id, nil
 }
 
@@ -773,62 +581,38 @@ func (i *Identity) loadRatchets(path string) error {
 	i.mutex.Lock()
 	defer i.mutex.Unlock()
 
-	// bearer:disable go_gosec_filesystem_filereadtaint
 	file, err := os.Open(path) // #nosec G304
 	if err != nil {
 		if os.IsNotExist(err) {
-			debug.Log(debug.DEBUG_PACKETS, "No ratchet file found, skipping", "path", path)
+			log.Printf("[DEBUG-6] No ratchet file found at %s, skipping.", path)
 			return nil
 		}
 		return fmt.Errorf("failed to open ratchet file: %w", err)
 	}
 	defer file.Close()
 
-	// Read all data
+	var data map[string]interface{}
-	fileData, err := io.ReadAll(file)
+	if err := json.NewDecoder(file).Decode(&data); err != nil {
-	if err != nil {
+		return fmt.Errorf("failed to decode ratchet data: %w", err)
-		return fmt.Errorf("failed to read ratchet file: %w", err)
 	}
 
-	// Unpack outer structure: {"signature": ..., "ratchets": ...}
+	if ratchets, ok := data["ratchets"].(map[string]interface{}); ok {
-	var persistedData map[string][]byte
+		for id, key := range ratchets {
-	if err := msgpack.Unmarshal(fileData, &persistedData); err != nil {
+			if keyStr, ok := key.(string); ok {
-		return fmt.Errorf("failed to unpack ratchet data: %w", err)
+				i.ratchets[id] = []byte(keyStr)
-	}
+			}
-
-	signature, hasSignature := persistedData["signature"]
-	packedRatchets, hasRatchets := persistedData["ratchets"]
-
-	if !hasSignature || !hasRatchets {
-		return fmt.Errorf("invalid ratchet file format: missing signature or ratchets")
-	}
-
-	// Verify signature
-	if !i.Verify(packedRatchets, signature) {
-		return fmt.Errorf("invalid ratchet file signature")
-	}
-
-	// Unpack ratchet list
-	var ratchetList [][]byte
-	if err := msgpack.Unmarshal(packedRatchets, &ratchetList); err != nil {
-		return fmt.Errorf("failed to unpack ratchet list: %w", err)
-	}
-
-	// Store ratchets with generated IDs
-	now := time.Now().Unix()
-	for _, ratchet := range ratchetList {
-		// Generate ratchet public key to create ID
-		ratchetPub, err := curve25519.X25519(ratchet, curve25519.Basepoint)
-		if err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Failed to generate ratchet public key", "error", err)
-			continue
 		}
-		ratchetID := i.GetRatchetID(ratchetPub)
-		i.ratchets[string(ratchetID)] = ratchet
-		i.ratchetExpiry[string(ratchetID)] = now + RATCHET_EXPIRY
 	}
 
-	debug.Log(debug.DEBUG_PACKETS, "Loaded ratchets", "count", len(i.ratchets), "path", path)
+	if expiry, ok := data["ratchet_expiry"].(map[string]interface{}); ok {
+		for id, timeVal := range expiry {
+			if timeFloat, ok := timeVal.(float64); ok {
+				i.ratchetExpiry[id] = int64(timeFloat)
+			}
+		}
+	}
+
+	log.Printf("[DEBUG-6] Loaded %d ratchets from %s", len(i.ratchets), path)
 	return nil
 }
 
@@ -884,7 +668,7 @@ func (i *Identity) SetRatchetKey(id string, key []byte) {
 
 // NewIdentity creates a new Identity instance with fresh keys
 func NewIdentity() (*Identity, error) {
-	// Generate 32-byte Ed25519 seed
+	// Generate 32-byte Ed25519 seed (compatible with Python RNS)
 	var ed25519Seed [32]byte
 	if _, err := io.ReadFull(rand.Reader, ed25519Seed[:]); err != nil {
 		return nil, fmt.Errorf("failed to generate Ed25519 seed: %v", err)
@@ -920,50 +704,28 @@ func NewIdentity() (*Identity, error) {
 	copy(combinedPub[:KEYSIZE/16], i.publicKey)
 	copy(combinedPub[KEYSIZE/16:], i.verificationKey)
 	hash := sha256.Sum256(combinedPub)
-	i.hash = hash[:TRUNCATED_HASHLENGTH/8]
+	i.hash = hash[:]
 
 	return i, nil
 }
 
-// FromBytes creates an Identity from a 64-byte private key representation
-func FromBytes(data []byte) (*Identity, error) {
-	if len(data) != 64 {
-		return nil, fmt.Errorf("invalid identity data: expected 64 bytes, got %d", len(data))
-	}
-
-	privateKey := data[:32]
-	signingSeed := data[32:64]
-
-	ident := &Identity{
-		ratchets:      make(map[string][]byte),
-		ratchetExpiry: make(map[string]int64),
-		mutex:         &sync.RWMutex{},
-	}
-
-	if err := ident.loadPrivateKey(privateKey, signingSeed); err != nil {
-		return nil, fmt.Errorf("failed to load private key: %w", err)
-	}
-
-	return ident, nil
-}
-
 func (i *Identity) RotateRatchet() ([]byte, error) {
 	i.mutex.Lock()
 	defer i.mutex.Unlock()
 
-	debug.Log(debug.DEBUG_ALL, "Rotating ratchet for identity", "hash", i.GetHexHash())
+	log.Printf("[DEBUG-7] Rotating ratchet for identity %s", i.GetHexHash())
 
 	// Generate new ratchet key
 	newRatchet := make([]byte, RATCHETSIZE/8)
 	if _, err := io.ReadFull(rand.Reader, newRatchet); err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "Failed to generate new ratchet", "error", err)
+		log.Printf("[DEBUG-1] Failed to generate new ratchet: %v", err)
 		return nil, err
 	}
 
 	// Get public key for ratchet ID
 	ratchetPub, err := curve25519.X25519(newRatchet, curve25519.Basepoint)
 	if err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "Failed to generate ratchet public key", "error", err)
+		log.Printf("[DEBUG-1] Failed to generate ratchet public key: %v", err)
 		return nil, err
 	}
 
@@ -974,7 +736,7 @@ func (i *Identity) RotateRatchet() ([]byte, error) {
 	i.ratchets[string(ratchetID)] = newRatchet
 	i.ratchetExpiry[string(ratchetID)] = expiry
 
-	debug.Log(debug.DEBUG_ALL, "New ratchet generated", "id", fmt.Sprintf("%x", ratchetID), "expiry", expiry)
+	log.Printf("[DEBUG-7] New ratchet generated with ID: %x, expiry: %d", ratchetID, expiry)
 
 	// Cleanup old ratchets if we exceed max retained
 	if len(i.ratchets) > MAX_RETAINED_RATCHETS {
@@ -990,10 +752,10 @@ func (i *Identity) RotateRatchet() ([]byte, error) {
 
 		delete(i.ratchets, oldestID)
 		delete(i.ratchetExpiry, oldestID)
-		debug.Log(debug.DEBUG_ALL, "Cleaned up oldest ratchet", "id", fmt.Sprintf("%x", []byte(oldestID)))
+		log.Printf("[DEBUG-7] Cleaned up oldest ratchet with ID: %x", []byte(oldestID))
 	}
 
-	debug.Log(debug.DEBUG_ALL, "Current number of active ratchets", "count", len(i.ratchets))
+	log.Printf("[DEBUG-7] Current number of active ratchets: %d", len(i.ratchets))
 	return newRatchet, nil
 }
 
@@ -1001,7 +763,7 @@ func (i *Identity) GetRatchets() [][]byte {
 	i.mutex.RLock()
 	defer i.mutex.RUnlock()
 
-	debug.Log(debug.DEBUG_ALL, "Getting ratchets for identity", "hash", i.GetHexHash())
+	log.Printf("[DEBUG-7] Getting ratchets for identity %s", i.GetHexHash())
 
 	ratchets := make([][]byte, 0, len(i.ratchets))
 	now := time.Now().Unix()
@@ -1019,7 +781,7 @@ func (i *Identity) GetRatchets() [][]byte {
 		}
 	}
 
-	debug.Log(debug.DEBUG_ALL, "Retrieved active ratchets", "active", len(ratchets), "expired", expired)
+	log.Printf("[DEBUG-7] Retrieved %d active ratchets, cleaned up %d expired", len(ratchets), expired)
 	return ratchets
 }
 
@@ -1027,7 +789,7 @@ func (i *Identity) CleanupExpiredRatchets() {
 	i.mutex.Lock()
 	defer i.mutex.Unlock()
 
-	debug.Log(debug.DEBUG_ALL, "Starting ratchet cleanup for identity", "hash", i.GetHexHash())
+	log.Printf("[DEBUG-7] Starting ratchet cleanup for identity %s", i.GetHexHash())
 
 	now := time.Now().Unix()
 	cleaned := 0
@@ -1039,7 +801,7 @@ func (i *Identity) CleanupExpiredRatchets() {
 		}
 	}
 
-	debug.Log(debug.DEBUG_ALL, "Cleaned up expired ratchets", "cleaned", cleaned, "remaining", len(i.ratchets))
+	log.Printf("[DEBUG-7] Cleaned up %d expired ratchets, %d remaining", cleaned, len(i.ratchets))
 }
 
 // ValidateAnnounce validates an announce packet's signature

pkg/identity/identity_test.go

@@ -1,148 +0,0 @@
-package identity
-
-import (
-	"bytes"
-	"path/filepath"
-	"testing"
-)
-
-func TestNewIdentity(t *testing.T) {
-	id, err := New()
-	if err != nil {
-		t.Fatalf("New() failed: %v", err)
-	}
-	if id == nil {
-		t.Fatal("New() returned nil")
-	}
-
-	pubKey := id.GetPublicKey()
-	if len(pubKey) != 64 {
-		t.Errorf("Expected public key length 64, got %d", len(pubKey))
-	}
-
-	privKey := id.GetPrivateKey()
-	if len(privKey) != 64 {
-		t.Errorf("Expected private key length 64, got %d", len(privKey))
-	}
-}
-
-func TestSignVerify(t *testing.T) {
-	id, _ := New()
-	data := []byte("test data")
-	sig := id.Sign(data)
-
-	if !id.Verify(data, sig) {
-		t.Error("Verification failed for valid signature")
-	}
-
-	if id.Verify([]byte("wrong data"), sig) {
-		t.Error("Verification succeeded for wrong data")
-	}
-}
-
-func TestEncryptDecrypt(t *testing.T) {
-	id, _ := New()
-	plaintext := []byte("secret message")
-
-	ciphertext, err := id.Encrypt(plaintext, nil)
-	if err != nil {
-		t.Fatalf("Encrypt failed: %v", err)
-	}
-
-	decrypted, err := id.Decrypt(ciphertext, nil, false, nil)
-	if err != nil {
-		t.Fatalf("Decrypt failed: %v", err)
-	}
-
-	if !bytes.Equal(plaintext, decrypted) {
-		t.Errorf("Decrypted data doesn't match plaintext: %q vs %q", decrypted, plaintext)
-	}
-}
-
-func TestIdentityHash(t *testing.T) {
-	id, _ := New()
-	h := id.Hash()
-	if len(h) != TRUNCATED_HASHLENGTH/8 {
-		t.Errorf("Expected hash length %d, got %d", TRUNCATED_HASHLENGTH/8, len(h))
-	}
-
-	hexHash := id.Hex()
-	if len(hexHash) != TRUNCATED_HASHLENGTH/4 {
-		t.Errorf("Expected hex hash length %d, got %d", TRUNCATED_HASHLENGTH/4, len(hexHash))
-	}
-}
-
-func TestFileOperations(t *testing.T) {
-	tmpDir := t.TempDir()
-	idPath := filepath.Join(tmpDir, "identity")
-
-	id, _ := New()
-	err := id.ToFile(idPath)
-	if err != nil {
-		t.Fatalf("ToFile failed: %v", err)
-	}
-
-	loadedID, err := FromFile(idPath)
-	if err != nil {
-		t.Fatalf("FromFile failed: %v", err)
-	}
-
-	if !bytes.Equal(id.GetPublicKey(), loadedID.GetPublicKey()) {
-		t.Error("Loaded identity public key doesn't match original")
-	}
-}
-
-func TestRatchets(t *testing.T) {
-	id, _ := New()
-
-	ratchet, err := id.RotateRatchet()
-	if err != nil {
-		t.Fatalf("RotateRatchet failed: %v", err)
-	}
-	if len(ratchet) != RATCHETSIZE/8 {
-		t.Errorf("Expected ratchet size %d, got %d", RATCHETSIZE/8, len(ratchet))
-	}
-
-	ratchets := id.GetRatchets()
-	if len(ratchets) != 1 {
-		t.Errorf("Expected 1 ratchet, got %d", len(ratchets))
-	}
-
-	id.CleanupExpiredRatchets()
-	// Should still be there since it's not expired
-	if len(id.GetRatchets()) != 1 {
-		t.Error("Ratchet unexpectedly cleaned up")
-	}
-}
-
-func TestRecallIdentity(t *testing.T) {
-	tmpDir := t.TempDir()
-	idPath := filepath.Join(tmpDir, "identity_recall")
-
-	id, _ := New()
-	_ = id.ToFile(idPath)
-
-	recalledID, err := RecallIdentity(idPath)
-	if err != nil {
-		t.Fatalf("RecallIdentity failed: %v", err)
-	}
-
-	if !bytes.Equal(id.GetPublicKey(), recalledID.GetPublicKey()) {
-		t.Error("Recalled identity public key doesn't match original")
-	}
-}
-
-func TestTruncatedHash(t *testing.T) {
-	data := []byte("some data")
-	h := TruncatedHash(data)
-	if len(h) != TRUNCATED_HASHLENGTH/8 {
-		t.Errorf("Expected length %d, got %d", TRUNCATED_HASHLENGTH/8, len(h))
-	}
-}
-
-func TestGetRandomHash(t *testing.T) {
-	h := GetRandomHash()
-	if len(h) != TRUNCATED_HASHLENGTH/8 {
-		t.Errorf("Expected length %d, got %d", TRUNCATED_HASHLENGTH/8, len(h))
-	}
-}

pkg/interfaces/auto.go

@@ -1,106 +1,49 @@
 package interfaces
 
 import (
-	"bytes"
-	"crypto/sha256"
-	"encoding/hex"
 	"fmt"
+	"log"
 	"net"
 	"sync"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
 )
 
 const (
-	HW_MTU                 = 1196
 	DEFAULT_DISCOVERY_PORT = 29716
 	DEFAULT_DATA_PORT      = 42671
-	DEFAULT_GROUP_ID       = "reticulum"
 	BITRATE_GUESS          = 10 * 1000 * 1000
-	PEERING_TIMEOUT        = 22 * time.Second
+	PEERING_TIMEOUT        = 7500 * time.Millisecond
-	ANNOUNCE_INTERVAL      = 1600 * time.Millisecond
+	SCOPE_LINK             = "2"
-	PEER_JOB_INTERVAL      = 4 * time.Second
+	SCOPE_ADMIN            = "4"
-	MCAST_ECHO_TIMEOUT     = 6500 * time.Millisecond
+	SCOPE_SITE             = "5"
-
+	SCOPE_ORGANISATION     = "8"
-	SCOPE_LINK         = "2"
+	SCOPE_GLOBAL           = "e"
-	SCOPE_ADMIN        = "4"
-	SCOPE_SITE         = "5"
-	SCOPE_ORGANISATION = "8"
-	SCOPE_GLOBAL       = "e"
-
-	MCAST_ADDR_TYPE_PERMANENT = "0"
-	MCAST_ADDR_TYPE_TEMPORARY = "1"
 )
 
 type AutoInterface struct {
 	BaseInterface
-	groupID            []byte
+	groupID           []byte
-	groupHash          []byte
+	discoveryPort     int
-	discoveryPort      int
+	dataPort          int
-	dataPort           int
+	discoveryScope    string
-	discoveryScope     string
+	peers             map[string]*Peer
-	multicastAddrType  string
+	linkLocalAddrs    []string
-	mcastDiscoveryAddr string
+	adoptedInterfaces map[string]string
-	ifacNetname        string
+	interfaceServers  map[string]*net.UDPConn
-	peers              map[string]*Peer
+	multicastEchoes   map[string]time.Time
-	linkLocalAddrs     []string
+	mutex             sync.RWMutex
-	adoptedInterfaces  map[string]*AdoptedInterface
+	outboundConn      *net.UDPConn
-	interfaceServers   map[string]*net.UDPConn
-	discoveryServers   map[string]*net.UDPConn
-	multicastEchoes    map[string]time.Time
-	timedOutInterfaces map[string]time.Time
-	allowedInterfaces  []string
-	ignoredInterfaces  []string
-	mutex              sync.RWMutex
-	outboundConn       *net.UDPConn
-	announceInterval   time.Duration
-	peerJobInterval    time.Duration
-	peeringTimeout     time.Duration
-	mcastEchoTimeout   time.Duration
-}
-
-type AdoptedInterface struct {
-	name          string
-	linkLocalAddr string
-	index         int
 }
 
 type Peer struct {
 	ifaceName string
 	lastHeard time.Time
-	addr      *net.UDPAddr
+	conn      *net.UDPConn
 }
 
 func NewAutoInterface(name string, config *common.InterfaceConfig) (*AutoInterface, error) {
-	groupID := DEFAULT_GROUP_ID
-	if config.GroupID != "" {
-		groupID = config.GroupID
-	}
-
-	discoveryScope := SCOPE_LINK
-	if config.DiscoveryScope != "" {
-		discoveryScope = normalizeScope(config.DiscoveryScope)
-	}
-
-	multicastAddrType := MCAST_ADDR_TYPE_TEMPORARY
-
-	discoveryPort := DEFAULT_DISCOVERY_PORT
-	if config.DiscoveryPort != 0 {
-		discoveryPort = config.DiscoveryPort
-	}
-
-	dataPort := DEFAULT_DATA_PORT
-	if config.DataPort != 0 {
-		dataPort = config.DataPort
-	}
-
-	groupHash := sha256.Sum256([]byte(groupID))
-
-	ifacNetname := hex.EncodeToString(groupHash[:])[:16]
-	mcastAddr := fmt.Sprintf("ff%s%s::%s", discoveryScope, multicastAddrType, ifacNetname)
-
 	ai := &AutoInterface{
 		BaseInterface: BaseInterface{
 			Name:     name,
@@ -109,66 +52,34 @@ func NewAutoInterface(name string, config *common.InterfaceConfig) (*AutoInterfa
 			Online:   false,
 			Enabled:  config.Enabled,
 			Detached: false,
-			IN:       true,
+			IN:       false,
 			OUT:      false,
-			MTU:      HW_MTU,
+			MTU:      common.DEFAULT_MTU,
-			Bitrate:  BITRATE_GUESS,
+			Bitrate:  BITRATE_MINIMUM,
 		},
-		groupID:            []byte(groupID),
+		discoveryPort:     DEFAULT_DISCOVERY_PORT,
-		groupHash:          groupHash[:],
+		dataPort:          DEFAULT_DATA_PORT,
-		discoveryPort:      discoveryPort,
+		discoveryScope:    SCOPE_LINK,
-		dataPort:           dataPort,
+		peers:             make(map[string]*Peer),
-		discoveryScope:     discoveryScope,
+		linkLocalAddrs:    make([]string, 0),
-		multicastAddrType:  multicastAddrType,
+		adoptedInterfaces: make(map[string]string),
-		mcastDiscoveryAddr: mcastAddr,
+		interfaceServers:  make(map[string]*net.UDPConn),
-		ifacNetname:        ifacNetname,
+		multicastEchoes:   make(map[string]time.Time),
-		peers:              make(map[string]*Peer),
+	}
-		linkLocalAddrs:     make([]string, 0),
+
-		adoptedInterfaces:  make(map[string]*AdoptedInterface),
+	if config.Port != 0 {
-		interfaceServers:   make(map[string]*net.UDPConn),
+		ai.discoveryPort = config.Port
-		discoveryServers:   make(map[string]*net.UDPConn),
+	}
-		multicastEchoes:    make(map[string]time.Time),
+
-		timedOutInterfaces: make(map[string]time.Time),
+	if config.GroupID != "" {
-		allowedInterfaces:  make([]string, 0),
+		ai.groupID = []byte(config.GroupID)
-		ignoredInterfaces:  make([]string, 0),
+	} else {
-		announceInterval:   ANNOUNCE_INTERVAL,
+		ai.groupID = []byte("reticulum")
-		peerJobInterval:    PEER_JOB_INTERVAL,
-		peeringTimeout:     PEERING_TIMEOUT,
-		mcastEchoTimeout:   MCAST_ECHO_TIMEOUT,
 	}
 
-	debug.Log(debug.DEBUG_INFO, "AutoInterface configured", "name", name, "group", groupID, "mcast_addr", mcastAddr)
 	return ai, nil
 }
 
-func normalizeScope(scope string) string {
-	switch scope {
-	case "link", "2":
-		return SCOPE_LINK
-	case "admin", "4":
-		return SCOPE_ADMIN
-	case "site", "5":
-		return SCOPE_SITE
-	case "organisation", "organization", "8":
-		return SCOPE_ORGANISATION
-	case "global", "e":
-		return SCOPE_GLOBAL
-	default:
-		return SCOPE_LINK
-	}
-}
-
-func normalizeMulticastType(mtype string) string {
-	switch mtype {
-	case "permanent", "0":
-		return MCAST_ADDR_TYPE_PERMANENT
-	case "temporary", "1":
-		return MCAST_ADDR_TYPE_TEMPORARY
-	default:
-		return MCAST_ADDR_TYPE_TEMPORARY
-	}
-}
-
 func (ai *AutoInterface) Start() error {
 	interfaces, err := net.Interfaces()
 	if err != nil {
@@ -176,18 +87,8 @@ func (ai *AutoInterface) Start() error {
 	}
 
 	for _, iface := range interfaces {
-		if ai.shouldIgnoreInterface(iface.Name) {
-			debug.Log(debug.DEBUG_TRACE, "Ignoring interface", "name", iface.Name)
-			continue
-		}
-
-		if len(ai.allowedInterfaces) > 0 && !ai.isAllowedInterface(iface.Name) {
-			debug.Log(debug.DEBUG_TRACE, "Interface not in allowed list", "name", iface.Name)
-			continue
-		}
-
 		if err := ai.configureInterface(&iface); err != nil {
-			debug.Log(debug.DEBUG_VERBOSE, "Failed to configure interface", "name", iface.Name, "error", err)
+			log.Printf("Failed to configure interface %s: %v", iface.Name, err)
 			continue
 		}
 	}
@@ -196,97 +97,43 @@ func (ai *AutoInterface) Start() error {
 		return fmt.Errorf("no suitable interfaces found")
 	}
 
+	// Mark interface as online
 	ai.Online = true
-	ai.IN = true
+	ai.Enabled = true
-	ai.OUT = true
 
 	go ai.peerJobs()
-	go ai.announceLoop()
-
-	debug.Log(debug.DEBUG_INFO, "AutoInterface started", "adopted", len(ai.adoptedInterfaces))
 	return nil
 }
 
-func (ai *AutoInterface) shouldIgnoreInterface(name string) bool {
-	ignoreList := []string{"lo", "lo0", "tun0", "awdl0", "llw0", "en5", "dummy0"}
-
-	for _, ignored := range ai.ignoredInterfaces {
-		if name == ignored {
-			return true
-		}
-	}
-
-	for _, ignored := range ignoreList {
-		if name == ignored {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (ai *AutoInterface) isAllowedInterface(name string) bool {
-	for _, allowed := range ai.allowedInterfaces {
-		if name == allowed {
-			return true
-		}
-	}
-	return false
-}
-
 func (ai *AutoInterface) configureInterface(iface *net.Interface) error {
-	if iface.Flags&net.FlagUp == 0 {
-		return fmt.Errorf("interface is down")
-	}
-
-	if iface.Flags&net.FlagLoopback != 0 {
-		return fmt.Errorf("loopback interface")
-	}
-
 	addrs, err := iface.Addrs()
 	if err != nil {
 		return err
 	}
 
-	var linkLocalAddr string
 	for _, addr := range addrs {
-		if ipnet, ok := addr.(*net.IPNet); ok {
+		if ipnet, ok := addr.(*net.IPNet); ok && ipnet.IP.IsLinkLocalUnicast() {
-			if ipnet.IP.To4() == nil && ipnet.IP.IsLinkLocalUnicast() {
+			ai.adoptedInterfaces[iface.Name] = ipnet.IP.String()
-				linkLocalAddr = ipnet.IP.String()
+			ai.multicastEchoes[iface.Name] = time.Now()
-				break
+
+			if err := ai.startDiscoveryListener(iface); err != nil {
+				return err
 			}
+
+			if err := ai.startDataListener(iface); err != nil {
+				return err
+			}
+
+			break
 		}
 	}
 
-	if linkLocalAddr == "" {
-		return fmt.Errorf("no link-local IPv6 address found")
-	}
-
-	ai.mutex.Lock()
-	ai.adoptedInterfaces[iface.Name] = &AdoptedInterface{
-		name:          iface.Name,
-		linkLocalAddr: linkLocalAddr,
-		index:         iface.Index,
-	}
-	ai.linkLocalAddrs = append(ai.linkLocalAddrs, linkLocalAddr)
-	ai.multicastEchoes[iface.Name] = time.Now()
-	ai.mutex.Unlock()
-
-	if err := ai.startDiscoveryListener(iface); err != nil {
-		return fmt.Errorf("failed to start discovery listener: %v", err)
-	}
-
-	if err := ai.startDataListener(iface); err != nil {
-		return fmt.Errorf("failed to start data listener: %v", err)
-	}
-
-	debug.Log(debug.DEBUG_INFO, "Configured interface", "name", iface.Name, "addr", linkLocalAddr)
 	return nil
 }
 
 func (ai *AutoInterface) startDiscoveryListener(iface *net.Interface) error {
 	addr := &net.UDPAddr{
-		IP:   net.ParseIP(ai.mcastDiscoveryAddr),
+		IP:   net.ParseIP(fmt.Sprintf("ff%s%s::1", ai.discoveryScope, SCOPE_LINK)),
 		Port: ai.discoveryPort,
 		Zone: iface.Name,
 	}
@@ -296,79 +143,47 @@ func (ai *AutoInterface) startDiscoveryListener(iface *net.Interface) error {
 		return err
 	}
 
-	if err := conn.SetReadBuffer(1024); err != nil {
-		debug.Log(debug.DEBUG_ERROR, "Failed to set discovery read buffer", "error", err)
-	}
-
-	ai.mutex.Lock()
-	ai.discoveryServers[iface.Name] = conn
-	ai.mutex.Unlock()
-
 	go ai.handleDiscovery(conn, iface.Name)
-	debug.Log(debug.DEBUG_VERBOSE, "Discovery listener started", "interface", iface.Name, "addr", ai.mcastDiscoveryAddr)
 	return nil
 }
 
 func (ai *AutoInterface) startDataListener(iface *net.Interface) error {
-	adoptedIface, exists := ai.adoptedInterfaces[iface.Name]
-	if !exists {
-		return fmt.Errorf("interface not adopted")
-	}
-
 	addr := &net.UDPAddr{
-		IP:   net.ParseIP(adoptedIface.linkLocalAddr),
+		IP:   net.IPv6zero,
 		Port: ai.dataPort,
 		Zone: iface.Name,
 	}
 
 	conn, err := net.ListenUDP("udp6", addr)
 	if err != nil {
-		debug.Log(debug.DEBUG_ERROR, "Failed to listen on data port", "addr", addr, "error", err)
 		return err
 	}
 
-	if err := conn.SetReadBuffer(ai.MTU); err != nil {
-		debug.Log(debug.DEBUG_ERROR, "Failed to set data read buffer", "error", err)
-	}
-
-	ai.mutex.Lock()
 	ai.interfaceServers[iface.Name] = conn
-	ai.mutex.Unlock()
+	go ai.handleData(conn)
-
-	go ai.handleData(conn, iface.Name)
-	debug.Log(debug.DEBUG_VERBOSE, "Data listener started", "interface", iface.Name, "addr", addr)
 	return nil
 }
 
 func (ai *AutoInterface) handleDiscovery(conn *net.UDPConn, ifaceName string) {
 	buf := make([]byte, 1024)
 	for {
-		n, remoteAddr, err := conn.ReadFromUDP(buf)
+		_, remoteAddr, err := conn.ReadFromUDP(buf)
 		if err != nil {
-			if ai.IsOnline() {
+			log.Printf("Discovery read error: %v", err)
-				debug.Log(debug.DEBUG_ERROR, "Discovery read error", "interface", ifaceName, "error", err)
+			continue
-			}
-			return
 		}
 
-		if n >= len(ai.groupHash) {
+		ai.handlePeerAnnounce(remoteAddr, ifaceName)
-			receivedHash := buf[:len(ai.groupHash)]
-			if bytes.Equal(receivedHash, ai.groupHash) {
-				ai.handlePeerAnnounce(remoteAddr, ifaceName)
-			} else {
-				debug.Log(debug.DEBUG_TRACE, "Received discovery with mismatched group hash", "interface", ifaceName)
-			}
-		}
 	}
 }
 
-func (ai *AutoInterface) handleData(conn *net.UDPConn, ifaceName string) {
+func (ai *AutoInterface) handleData(conn *net.UDPConn) {
 	buf := make([]byte, ai.GetMTU())
 	for {
 		n, _, err := conn.ReadFromUDP(buf)
 		if err != nil {
-			if ai.IsOnline() {
+			if !ai.IsDetached() {
-				debug.Log(debug.DEBUG_ERROR, "Data read error", "interface", ifaceName, "error", err)
+				log.Printf("Data read error: %v", err)
 			}
 			return
 		}
@@ -383,98 +198,36 @@ func (ai *AutoInterface) handlePeerAnnounce(addr *net.UDPAddr, ifaceName string)
 	ai.mutex.Lock()
 	defer ai.mutex.Unlock()
 
-	peerIP := addr.IP.String()
+	peerAddr := addr.IP.String()
 
 	for _, localAddr := range ai.linkLocalAddrs {
-		if peerIP == localAddr {
+		if peerAddr == localAddr {
 			ai.multicastEchoes[ifaceName] = time.Now()
-			debug.Log(debug.DEBUG_TRACE, "Received own multicast echo", "interface", ifaceName)
 			return
 		}
 	}
 
-	peerKey := peerIP + "%" + ifaceName
+	if _, exists := ai.peers[peerAddr]; !exists {
-
+		ai.peers[peerAddr] = &Peer{
-	if peer, exists := ai.peers[peerKey]; exists {
-		peer.lastHeard = time.Now()
-		debug.Log(debug.DEBUG_TRACE, "Updated peer", "peer", peerIP, "interface", ifaceName)
-	} else {
-		ai.peers[peerKey] = &Peer{
 			ifaceName: ifaceName,
 			lastHeard: time.Now(),
-			addr:      addr,
-		}
-		debug.Log(debug.DEBUG_INFO, "Discovered new peer", "peer", peerIP, "interface", ifaceName)
-	}
-}
-
-func (ai *AutoInterface) announceLoop() {
-	ticker := time.NewTicker(ai.announceInterval)
-	defer ticker.Stop()
-
-	for range ticker.C {
-		if !ai.IsOnline() {
-			return
-		}
-		ai.sendPeerAnnounce()
-	}
-}
-
-func (ai *AutoInterface) sendPeerAnnounce() {
-	ai.mutex.RLock()
-	defer ai.mutex.RUnlock()
-
-	for ifaceName, adoptedIface := range ai.adoptedInterfaces {
-		mcastAddr := &net.UDPAddr{
-			IP:   net.ParseIP(ai.mcastDiscoveryAddr),
-			Port: ai.discoveryPort,
-			Zone: ifaceName,
-		}
-
-		if ai.outboundConn == nil {
-			var err error
-			ai.outboundConn, err = net.ListenUDP("udp6", &net.UDPAddr{Port: 0})
-			if err != nil {
-				debug.Log(debug.DEBUG_ERROR, "Failed to create outbound socket", "error", err)
-				return
-			}
-		}
-
-		if _, err := ai.outboundConn.WriteToUDP(ai.groupHash, mcastAddr); err != nil {
-			debug.Log(debug.DEBUG_VERBOSE, "Failed to send peer announce", "interface", ifaceName, "error", err)
-		} else {
-			debug.Log(debug.DEBUG_TRACE, "Sent peer announce", "interface", adoptedIface.name)
 		}
+		log.Printf("Added peer %s on %s", peerAddr, ifaceName)
+	} else {
+		ai.peers[peerAddr].lastHeard = time.Now()
 	}
 }
 
 func (ai *AutoInterface) peerJobs() {
-	ticker := time.NewTicker(ai.peerJobInterval)
+	ticker := time.NewTicker(PEERING_TIMEOUT)
-	defer ticker.Stop()
-
 	for range ticker.C {
-		if !ai.IsOnline() {
-			return
-		}
-
 		ai.mutex.Lock()
 		now := time.Now()
 
-		for peerKey, peer := range ai.peers {
+		for addr, peer := range ai.peers {
-			if now.Sub(peer.lastHeard) > ai.peeringTimeout {
+			if now.Sub(peer.lastHeard) > PEERING_TIMEOUT {
-				delete(ai.peers, peerKey)
+				delete(ai.peers, addr)
-				debug.Log(debug.DEBUG_VERBOSE, "Removed timed out peer", "peer", peerKey)
+				log.Printf("Removed timed out peer %s", addr)
-			}
-		}
-
-		for ifaceName, echoTime := range ai.multicastEchoes {
-			if now.Sub(echoTime) > ai.mcastEchoTimeout {
-				if _, exists := ai.timedOutInterfaces[ifaceName]; !exists {
-					debug.Log(debug.DEBUG_INFO, "Interface timed out", "interface", ifaceName)
-					ai.timedOutInterfaces[ifaceName] = now
-				}
-			} else {
-				delete(ai.timedOutInterfaces, ifaceName)
 			}
 		}
 
@@ -483,43 +236,28 @@ func (ai *AutoInterface) peerJobs() {
 }
 
 func (ai *AutoInterface) Send(data []byte, address string) error {
-	if !ai.IsOnline() {
-		return fmt.Errorf("interface offline")
-	}
-
 	ai.mutex.RLock()
 	defer ai.mutex.RUnlock()
 
-	if len(ai.peers) == 0 {
-		debug.Log(debug.DEBUG_TRACE, "No peers available for sending")
-		return nil
-	}
-
-	if ai.outboundConn == nil {
-		var err error
-		ai.outboundConn, err = net.ListenUDP("udp6", &net.UDPAddr{Port: 0})
-		if err != nil {
-			return fmt.Errorf("failed to create outbound socket: %v", err)
-		}
-	}
-
-	sentCount := 0
 	for _, peer := range ai.peers {
-		targetAddr := &net.UDPAddr{
+		addr := &net.UDPAddr{
-			IP:   peer.addr.IP,
+			IP:   net.ParseIP(address),
 			Port: ai.dataPort,
 			Zone: peer.ifaceName,
 		}
 
-		if _, err := ai.outboundConn.WriteToUDP(data, targetAddr); err != nil {
+		if ai.outboundConn == nil {
-			debug.Log(debug.DEBUG_VERBOSE, "Failed to send to peer", "interface", peer.ifaceName, "error", err)
+			var err error
+			ai.outboundConn, err = net.ListenUDP("udp6", &net.UDPAddr{Port: 0})
+			if err != nil {
+				return err
+			}
+		}
+
+		if _, err := ai.outboundConn.WriteToUDP(data, addr); err != nil {
+			log.Printf("Failed to send to peer %s: %v", address, err)
 			continue
 		}
-		sentCount++
-	}
-
-	if sentCount > 0 {
-		debug.Log(debug.DEBUG_TRACE, "Sent data to peers", "count", sentCount, "bytes", len(data))
 	}
 
 	return nil
@@ -529,22 +267,13 @@ func (ai *AutoInterface) Stop() error {
 	ai.mutex.Lock()
 	defer ai.mutex.Unlock()
 
-	ai.Online = false
-	ai.IN = false
-	ai.OUT = false
-
 	for _, server := range ai.interfaceServers {
 		server.Close() // #nosec G104
 	}
 
-	for _, server := range ai.discoveryServers {
-		server.Close() // #nosec G104
-	}
-
 	if ai.outboundConn != nil {
 		ai.outboundConn.Close() // #nosec G104
 	}
 
-	debug.Log(debug.DEBUG_INFO, "AutoInterface stopped")
 	return nil
 }

pkg/interfaces/auto_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
 )
 
 func TestNewAutoInterface(t *testing.T) {
@@ -44,10 +44,9 @@ func TestNewAutoInterface(t *testing.T) {
 
 	t.Run("CustomConfig", func(t *testing.T) {
 		config := &common.InterfaceConfig{
-			Enabled:       true,
+			Enabled: true,
-			DiscoveryPort: 12345,
+			Port:    12345, // Custom discovery port
-			DataPort:      54321,
+			GroupID: "customGroup",
-			GroupID:       "customGroup",
 		}
 		ai, err := NewAutoInterface("autoCustom", config)
 		if err != nil {
@@ -60,9 +59,6 @@ func TestNewAutoInterface(t *testing.T) {
 		if ai.discoveryPort != 12345 {
 			t.Errorf("discoveryPort = %d; want 12345", ai.discoveryPort)
 		}
-		if ai.dataPort != 54321 {
-			t.Errorf("dataPort = %d; want 54321", ai.dataPort)
-		}
 		if string(ai.groupID) != "customGroup" {
 			t.Errorf("groupID = %s; want customGroup", string(ai.groupID))
 		}
@@ -83,11 +79,9 @@ func newMockAutoInterface(name string, config *common.InterfaceConfig) (*mockAut
 	// Initialize maps that would normally be initialized in Start()
 	ai.peers = make(map[string]*Peer)
 	ai.linkLocalAddrs = make([]string, 0)
-	ai.adoptedInterfaces = make(map[string]*AdoptedInterface)
+	ai.adoptedInterfaces = make(map[string]string)
 	ai.interfaceServers = make(map[string]*net.UDPConn)
-	ai.discoveryServers = make(map[string]*net.UDPConn)
 	ai.multicastEchoes = make(map[string]time.Time)
-	ai.timedOutInterfaces = make(map[string]time.Time)
 
 	return &mockAutoInterface{AutoInterface: ai}, nil
 }

pkg/interfaces/interface.go

@@ -3,12 +3,12 @@ package interfaces
 import (
 	"encoding/binary"
 	"fmt"
+	"log"
 	"net"
 	"sync"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
 )
 
 const (
@@ -26,6 +26,17 @@ const (
 	TYPE_TCP = 0x02
 
 	PROPAGATION_RATE = 0.02 // 2% of interface bandwidth
+
+	DEBUG_LEVEL = 4 // Default debug level for interface logging
+
+	// Debug levels
+	DEBUG_CRITICAL = 1
+	DEBUG_ERROR    = 2
+	DEBUG_INFO     = 3
+	DEBUG_VERBOSE  = 4
+	DEBUG_TRACE    = 5
+	DEBUG_PACKETS  = 6
+	DEBUG_ALL      = 7
 )
 
 type Interface interface {
@@ -116,7 +127,7 @@ func (i *BaseInterface) ProcessIncoming(data []byte) {
 
 func (i *BaseInterface) ProcessOutgoing(data []byte) error {
 	if !i.Online || i.Detached {
-		debug.Log(debug.DEBUG_CRITICAL, "Interface cannot process outgoing packet - interface offline or detached", "name", i.Name)
+		log.Printf("[DEBUG-1] Interface %s: Cannot process outgoing packet - interface offline or detached", i.Name)
 		return fmt.Errorf("interface offline or detached")
 	}
 
@@ -124,7 +135,7 @@ func (i *BaseInterface) ProcessOutgoing(data []byte) error {
 	i.TxBytes += uint64(len(data))
 	i.mutex.Unlock()
 
-	debug.Log(debug.DEBUG_VERBOSE, "Interface processed outgoing packet", "name", i.Name, "bytes", len(data), "total_tx", i.TxBytes)
+	log.Printf("[DEBUG-%d] Interface %s: Processed outgoing packet of %d bytes, total TX: %d", DEBUG_LEVEL, i.Name, len(data), i.TxBytes)
 	return nil
 }
 
@@ -178,7 +189,7 @@ func (i *BaseInterface) Enable() {
 	i.Enabled = true
 	i.Online = true
 
-	debug.Log(debug.DEBUG_INFO, "Interface state changed", "name", i.Name, "enabled_prev", prevState, "enabled", i.Enabled, "online_prev", !i.Online, "online", i.Online)
+	log.Printf("[DEBUG-%d] Interface %s: State changed - Enabled: %v->%v, Online: %v->%v", DEBUG_INFO, i.Name, prevState, i.Enabled, !i.Online, i.Online)
 }
 
 func (i *BaseInterface) Disable() {
@@ -186,7 +197,7 @@ func (i *BaseInterface) Disable() {
 	defer i.mutex.Unlock()
 	i.Enabled = false
 	i.Online = false
-	debug.Log(debug.DEBUG_ERROR, "Interface disabled and offline", "name", i.Name)
+	log.Printf("[DEBUG-2] Interface %s: Disabled and offline", i.Name)
 }
 
 func (i *BaseInterface) GetName() string {
@@ -226,11 +237,11 @@ func (i *BaseInterface) Stop() error {
 }
 
 func (i *BaseInterface) Send(data []byte, address string) error {
-	debug.Log(debug.DEBUG_VERBOSE, "Interface sending bytes", "name", i.Name, "bytes", len(data), "address", address)
+	log.Printf("[DEBUG-%d] Interface %s: Sending %d bytes to %s", DEBUG_LEVEL, i.Name, len(data), address)
 
 	err := i.ProcessOutgoing(data)
 	if err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "Interface failed to send data", "name", i.Name, "error", err)
+		log.Printf("[DEBUG-1] Interface %s: Failed to send data: %v", i.Name, err)
 		return err
 	}
 
@@ -250,7 +261,7 @@ func (i *BaseInterface) GetBandwidthAvailable() bool {
 	timeSinceLastTx := now.Sub(i.lastTx)
 
 	if timeSinceLastTx > time.Second {
-		debug.Log(debug.DEBUG_VERBOSE, "Interface bandwidth available", "name", i.Name, "idle_seconds", timeSinceLastTx.Seconds())
+		log.Printf("[DEBUG-%d] Interface %s: Bandwidth available (idle for %.2fs)", DEBUG_VERBOSE, i.Name, timeSinceLastTx.Seconds())
 		return true
 	}
 
@@ -259,7 +270,7 @@ func (i *BaseInterface) GetBandwidthAvailable() bool {
 	maxUsage := float64(i.Bitrate) * PROPAGATION_RATE
 
 	available := currentUsage < maxUsage
-	debug.Log(debug.DEBUG_VERBOSE, "Interface bandwidth stats", "name", i.Name, "current_bps", currentUsage, "max_bps", maxUsage, "usage_percent", (currentUsage/maxUsage)*100, "available", available)
+	log.Printf("[DEBUG-%d] Interface %s: Bandwidth stats - Current: %.2f bps, Max: %.2f bps, Usage: %.1f%%, Available: %v", DEBUG_VERBOSE, i.Name, currentUsage, maxUsage, (currentUsage/maxUsage)*100, available)
 
 	return available
 }
@@ -271,7 +282,7 @@ func (i *BaseInterface) updateBandwidthStats(bytes uint64) {
 	i.TxBytes += bytes
 	i.lastTx = time.Now()
 
-	debug.Log(debug.DEBUG_VERBOSE, "Interface updated bandwidth stats", "name", i.Name, "tx_bytes", i.TxBytes, "last_tx", i.lastTx)
+	log.Printf("[DEBUG-%d] Interface %s: Updated bandwidth stats - TX bytes: %d, Last TX: %v", DEBUG_LEVEL, i.Name, i.TxBytes, i.lastTx)
 }
 
 type InterceptedInterface struct {
@@ -294,7 +305,7 @@ func (i *InterceptedInterface) Send(data []byte, addr string) error {
 	// Call interceptor if provided
 	if i.interceptor != nil && len(data) > 0 {
 		if err := i.interceptor(data, i); err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Failed to intercept outgoing packet", "error", err)
+			log.Printf("[DEBUG-2] Failed to intercept outgoing packet: %v", err)
 		}
 	}
 

pkg/interfaces/interface_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
 )
 
 func TestBaseInterfaceStateChanges(t *testing.T) {

pkg/interfaces/tcp.go

@@ -2,13 +2,13 @@ package interfaces
 
 import (
 	"fmt"
+	"log"
 	"net"
 	"runtime"
 	"sync"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
 )
 
 const (
@@ -21,22 +21,14 @@ const (
 	KISS_TFEND = 0xDC
 	KISS_TFESC = 0xDD
 
-	DEFAULT_MTU       = 1064
+	TCP_USER_TIMEOUT   = 24
-	BITRATE_GUESS_VAL = 10 * 1000 * 1000
+	TCP_PROBE_AFTER    = 5
-	RECONNECT_WAIT    = 5
+	TCP_PROBE_INTERVAL = 2
-	INITIAL_TIMEOUT   = 5
+	TCP_PROBES         = 12
-	INITIAL_BACKOFF   = time.Second
+	RECONNECT_WAIT     = 5
-	MAX_BACKOFF       = time.Minute * 5
+	INITIAL_TIMEOUT    = 5
-
+	INITIAL_BACKOFF    = time.Second
-	TCP_USER_TIMEOUT_SEC   = 24
+	MAX_BACKOFF        = time.Minute * 5
-	TCP_PROBE_AFTER_SEC    = 5
-	TCP_PROBE_INTERVAL_SEC = 2
-	TCP_PROBES_COUNT       = 12
-
-	I2P_USER_TIMEOUT_SEC   = 45
-	I2P_PROBE_AFTER_SEC    = 10
-	I2P_PROBE_INTERVAL_SEC = 9
-	I2P_PROBES_COUNT       = 5
 )
 
 type TCPClientInterface struct {
@@ -70,7 +62,7 @@ func NewTCPClientInterface(name string, targetHost string, targetPort int, kissF
 		i2pTunneled:       i2pTunneled,
 		initiator:         true,
 		enabled:           enabled,
-		maxReconnectTries: RECONNECT_WAIT * TCP_PROBES_COUNT,
+		maxReconnectTries: TCP_PROBES,
 		packetBuffer:      make([]byte, 0),
 		neverConnected:    true,
 	}
@@ -114,11 +106,11 @@ func (tc *TCPClientInterface) Start() error {
 	switch runtime.GOOS {
 	case "linux":
 		if err := tc.setTimeoutsLinux(); err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Failed to set Linux TCP timeouts", "error", err)
+			log.Printf("[DEBUG-2] Failed to set Linux TCP timeouts: %v", err)
 		}
 	case "darwin":
 		if err := tc.setTimeoutsOSX(); err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Failed to set OSX TCP timeouts", "error", err)
+			log.Printf("[DEBUG-2] Failed to set OSX TCP timeouts: %v", err)
 		}
 	}
 
@@ -177,7 +169,7 @@ func (tc *TCPClientInterface) readLoop() {
 
 func (tc *TCPClientInterface) handlePacket(data []byte) {
 	if len(data) < 1 {
-		debug.Log(debug.DEBUG_ALL, "Received invalid packet: empty")
+		log.Printf("[DEBUG-7] Received invalid packet: empty")
 		return
 	}
 
@@ -187,28 +179,32 @@ func (tc *TCPClientInterface) handlePacket(data []byte) {
 	tc.lastRx = lastRx
 	tc.mutex.Unlock()
 
-	debug.Log(debug.DEBUG_ALL, "Received packet", "type", fmt.Sprintf("0x%02x", data[0]), "size", len(data))
+	log.Printf("[DEBUG-7] Received packet: type=0x%02x, size=%d bytes", data[0], len(data))
 
 	// For RNS packets, call the packet callback directly
 	if callback := tc.GetPacketCallback(); callback != nil {
-		debug.Log(debug.DEBUG_ALL, "Calling packet callback for RNS packet")
+		log.Printf("[DEBUG-7] Calling packet callback for RNS packet")
 		callback(data, tc)
 	} else {
-		debug.Log(debug.DEBUG_ALL, "No packet callback set for TCP interface")
+		log.Printf("[DEBUG-7] No packet callback set for TCP interface")
 	}
 }
 
 // Send implements the interface Send method for TCP interface
 func (tc *TCPClientInterface) Send(data []byte, address string) error {
-	debug.Log(debug.DEBUG_ALL, "TCP interface sending bytes", "name", tc.Name, "bytes", len(data))
+	log.Printf("[DEBUG-7] TCP interface %s: Sending %d bytes", tc.Name, len(data))
-
+	
 	if !tc.IsEnabled() || !tc.IsOnline() {
 		return fmt.Errorf("TCP interface %s is not online", tc.Name)
 	}
 
-	// Send data directly - packet type is already in the first byte of data
+	// For TCP interface, we need to prepend a packet type byte for announce packets
-	// TCP interface uses HDLC framing around the raw packet
+	// RNS TCP protocol expects: [packet_type][data]
-	return tc.ProcessOutgoing(data)
+	frame := make([]byte, 0, len(data)+1)
+	frame = append(frame, 0x01) // Announce packet type
+	frame = append(frame, data...)
+
+	return tc.ProcessOutgoing(frame)
 }
 
 func (tc *TCPClientInterface) ProcessOutgoing(data []byte) error {
@@ -227,10 +223,10 @@ func (tc *TCPClientInterface) ProcessOutgoing(data []byte) error {
 	// Update TX stats before sending
 	tc.UpdateStats(uint64(len(frame)), false)
 
-	debug.Log(debug.DEBUG_ALL, "TCP interface writing to network", "name", tc.Name, "bytes", len(frame))
+	log.Printf("[DEBUG-7] TCP interface %s: Writing %d bytes to network", tc.Name, len(frame))
 	_, err := tc.conn.Write(frame)
 	if err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "TCP interface write failed", "name", tc.Name, "error", err)
+		log.Printf("[DEBUG-1] TCP interface %s: Write failed: %v", tc.Name, err)
 	}
 	return err
 }
@@ -335,7 +331,9 @@ func (tc *TCPClientInterface) reconnect() {
 			return
 		}
 
-		debug.Log(debug.DEBUG_VERBOSE, "Failed to reconnect", "target", net.JoinHostPort(tc.targetAddr, fmt.Sprintf("%d", tc.targetPort)), "attempt", retries+1, "maxTries", tc.maxReconnectTries, "error", err)
+		// Log reconnection attempt
+		fmt.Printf("Failed to reconnect to %s (attempt %d/%d): %v\n",
+			addr, retries+1, tc.maxReconnectTries, err)
 
 		// Wait with exponential backoff
 		time.Sleep(backoff)
@@ -353,8 +351,10 @@ func (tc *TCPClientInterface) reconnect() {
 	tc.reconnecting = false
 	tc.mutex.Unlock()
 
+	// If we've exhausted all retries, perform final teardown
 	tc.teardown()
-	debug.Log(debug.DEBUG_ERROR, "Failed to reconnect after all attempts", "target", net.JoinHostPort(tc.targetAddr, fmt.Sprintf("%d", tc.targetPort)), "maxTries", tc.maxReconnectTries)
+	fmt.Printf("Failed to reconnect to %s after %d attempts\n",
+		fmt.Sprintf("%s:%d", tc.targetAddr, tc.targetPort), tc.maxReconnectTries)
 }
 
 func (tc *TCPClientInterface) Enable() {
@@ -384,13 +384,13 @@ func (tc *TCPClientInterface) GetRTT() time.Duration {
 	}
 
 	if tcpConn, ok := tc.conn.(*net.TCPConn); ok {
-		var rtt time.Duration
+		var rtt time.Duration = 0
 		if runtime.GOOS == "linux" {
 			if info, err := tcpConn.SyscallConn(); err == nil {
 				if err := info.Control(func(fd uintptr) { // #nosec G104
 					rtt = platformGetRTT(fd)
 				}); err != nil {
-					debug.Log(debug.DEBUG_ERROR, "Error in SyscallConn Control", "error", err)
+					log.Printf("[DEBUG-2] Error in SyscallConn Control: %v", err)
 				}
 			}
 		}
@@ -420,11 +420,13 @@ func (tc *TCPClientInterface) UpdateStats(bytes uint64, isRx bool) {
 	if isRx {
 		tc.RxBytes += bytes
 		tc.lastRx = now
-		debug.Log(debug.DEBUG_TRACE, "Interface RX stats", "name", tc.Name, "bytes", bytes, "total", tc.RxBytes, "last", tc.lastRx)
+		log.Printf("[DEBUG-5] Interface %s RX stats: bytes=%d total=%d last=%v",
+			tc.Name, bytes, tc.RxBytes, tc.lastRx)
 	} else {
 		tc.TxBytes += bytes
 		tc.lastTx = now
-		debug.Log(debug.DEBUG_TRACE, "Interface TX stats", "name", tc.Name, "bytes", bytes, "total", tc.TxBytes, "last", tc.lastTx)
+		log.Printf("[DEBUG-5] Interface %s TX stats: bytes=%d total=%d last=%v",
+			tc.Name, bytes, tc.TxBytes, tc.lastTx)
 	}
 }
 
@@ -434,6 +436,37 @@ func (tc *TCPClientInterface) GetStats() (tx uint64, rx uint64, lastTx time.Time
 	return tc.TxBytes, tc.RxBytes, tc.lastTx, tc.lastRx
 }
 
+func (tc *TCPClientInterface) setTimeoutsLinux() error {
+	tcpConn, ok := tc.conn.(*net.TCPConn)
+	if !ok {
+		return fmt.Errorf("not a TCP connection")
+	}
+
+	if !tc.i2pTunneled {
+		if err := tcpConn.SetKeepAlive(true); err != nil {
+			return err
+		}
+		if err := tcpConn.SetKeepAlivePeriod(time.Duration(TCP_PROBE_INTERVAL) * time.Second); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (tc *TCPClientInterface) setTimeoutsOSX() error {
+	tcpConn, ok := tc.conn.(*net.TCPConn)
+	if !ok {
+		return fmt.Errorf("not a TCP connection")
+	}
+
+	if err := tcpConn.SetKeepAlive(true); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 type TCPServerInterface struct {
 	BaseInterface
 	connections    map[string]net.Conn
@@ -531,7 +564,7 @@ func (ts *TCPServerInterface) Start() error {
 	ts.mutex.Lock()
 	defer ts.mutex.Unlock()
 
-	addr := net.JoinHostPort(ts.bindAddr, fmt.Sprintf("%d", ts.bindPort))
+	addr := fmt.Sprintf("%s:%d", ts.bindAddr, ts.bindPort)
 	listener, err := net.Listen("tcp", addr)
 	if err != nil {
 		return fmt.Errorf("failed to start TCP server: %w", err)
@@ -547,7 +580,7 @@ func (ts *TCPServerInterface) Start() error {
 				if !ts.Online {
 					return // Normal shutdown
 				}
-				debug.Log(debug.DEBUG_ERROR, "Error accepting connection", "error", err)
+				log.Printf("[DEBUG-2] Error accepting connection: %v", err)
 				continue
 			}
 
@@ -630,7 +663,8 @@ func (ts *TCPServerInterface) ProcessOutgoing(data []byte) error {
 
 	for _, conn := range ts.connections {
 		if _, err := conn.Write(frame); err != nil {
-			debug.Log(debug.DEBUG_VERBOSE, "Error writing to connection", "address", conn.RemoteAddr(), "error", err)
+			log.Printf("[DEBUG-4] Error writing to connection %s: %v",
+				conn.RemoteAddr(), err)
 		}
 	}
 

pkg/interfaces/tcp_darwin.go

@@ -1,59 +0,0 @@
-//go:build darwin
-// +build darwin
-
-package interfaces
-
-import (
-	"fmt"
-	"net"
-	"syscall"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-)
-
-func (tc *TCPClientInterface) setTimeoutsLinux() error {
-	return tc.setTimeoutsOSX()
-}
-
-func (tc *TCPClientInterface) setTimeoutsOSX() error {
-	tcpConn, ok := tc.conn.(*net.TCPConn)
-	if !ok {
-		return fmt.Errorf("not a TCP connection")
-	}
-
-	rawConn, err := tcpConn.SyscallConn()
-	if err != nil {
-		return fmt.Errorf("failed to get raw connection: %v", err)
-	}
-
-	var sockoptErr error
-	err = rawConn.Control(func(fd uintptr) {
-		const TCP_KEEPALIVE = 0x10
-
-		var probeAfter int
-		if tc.i2pTunneled {
-			probeAfter = I2P_PROBE_AFTER_SEC
-		} else {
-			probeAfter = TCP_PROBE_AFTER_SEC
-		}
-
-		if err := syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, syscall.SO_KEEPALIVE, 1); err != nil {
-			sockoptErr = fmt.Errorf("failed to enable SO_KEEPALIVE: %v", err)
-			return
-		}
-
-		if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, TCP_KEEPALIVE, probeAfter); err != nil {
-			debug.Log(debug.DEBUG_VERBOSE, "Failed to set TCP_KEEPALIVE", "error", err)
-		}
-	})
-
-	if err != nil {
-		return fmt.Errorf("control failed: %v", err)
-	}
-	if sockoptErr != nil {
-		return sockoptErr
-	}
-
-	debug.Log(debug.DEBUG_VERBOSE, "TCP keepalive configured (OSX)", "i2p", tc.i2pTunneled)
-	return nil
-}

pkg/interfaces/tcp_freebsd.go

@@ -1,39 +0,0 @@
-//go:build freebsd
-// +build freebsd
-
-package interfaces
-
-import (
-	"fmt"
-	"net"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-)
-
-func (tc *TCPClientInterface) setTimeoutsLinux() error {
-	tcpConn, ok := tc.conn.(*net.TCPConn)
-	if !ok {
-		return fmt.Errorf("not a TCP connection")
-	}
-
-	if err := tcpConn.SetKeepAlive(true); err != nil {
-		return fmt.Errorf("failed to enable keepalive: %v", err)
-	}
-
-	keepalivePeriod := TCP_PROBE_INTERVAL_SEC * time.Second
-	if tc.i2pTunneled {
-		keepalivePeriod = I2P_PROBE_INTERVAL_SEC * time.Second
-	}
-
-	if err := tcpConn.SetKeepAlivePeriod(keepalivePeriod); err != nil {
-		debug.Log(debug.DEBUG_VERBOSE, "Failed to set keepalive period", "error", err)
-	}
-
-	debug.Log(debug.DEBUG_VERBOSE, "TCP keepalive configured (FreeBSD)", "i2p", tc.i2pTunneled)
-	return nil
-}
-
-func (tc *TCPClientInterface) setTimeoutsOSX() error {
-	return tc.setTimeoutsLinux()
-}

pkg/interfaces/tcp_linux.go

@@ -4,101 +4,29 @@
 package interfaces
 
 import (
-	"fmt"
-	"net"
 	"syscall"
 	"time"
 	"unsafe"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
 )
 
-func (tc *TCPClientInterface) setTimeoutsLinux() error {
-	tcpConn, ok := tc.conn.(*net.TCPConn)
-	if !ok {
-		return fmt.Errorf("not a TCP connection")
-	}
-
-	rawConn, err := tcpConn.SyscallConn()
-	if err != nil {
-		return fmt.Errorf("failed to get raw connection: %v", err)
-	}
-
-	var sockoptErr error
-	err = rawConn.Control(func(fd uintptr) {
-		var userTimeout, probeAfter, probeInterval, probeCount int
-
-		if tc.i2pTunneled {
-			userTimeout = I2P_USER_TIMEOUT_SEC * 1000
-			probeAfter = I2P_PROBE_AFTER_SEC
-			probeInterval = I2P_PROBE_INTERVAL_SEC
-			probeCount = I2P_PROBES_COUNT
-		} else {
-			userTimeout = TCP_USER_TIMEOUT_SEC * 1000
-			probeAfter = TCP_PROBE_AFTER_SEC
-			probeInterval = TCP_PROBE_INTERVAL_SEC
-			probeCount = TCP_PROBES_COUNT
-		}
-
-		if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, 18, userTimeout); err != nil {
-			debug.Log(debug.DEBUG_VERBOSE, "Failed to set TCP_USER_TIMEOUT", "error", err)
-		}
-
-		if err := syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, syscall.SO_KEEPALIVE, 1); err != nil {
-			sockoptErr = fmt.Errorf("failed to enable SO_KEEPALIVE: %v", err)
-			return
-		}
-
-		if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, 4, probeAfter); err != nil {
-			debug.Log(debug.DEBUG_VERBOSE, "Failed to set TCP_KEEPIDLE", "error", err)
-		}
-
-		if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, 5, probeInterval); err != nil {
-			debug.Log(debug.DEBUG_VERBOSE, "Failed to set TCP_KEEPINTVL", "error", err)
-		}
-
-		if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, 6, probeCount); err != nil {
-			debug.Log(debug.DEBUG_VERBOSE, "Failed to set TCP_KEEPCNT", "error", err)
-		}
-	})
-
-	if err != nil {
-		return fmt.Errorf("control failed: %v", err)
-	}
-	if sockoptErr != nil {
-		return sockoptErr
-	}
-
-	debug.Log(debug.DEBUG_VERBOSE, "TCP keepalive configured (Linux)", "i2p", tc.i2pTunneled)
-	return nil
-}
-
-func (tc *TCPClientInterface) setTimeoutsOSX() error {
-	return tc.setTimeoutsLinux()
-}
-
 func platformGetRTT(fd uintptr) time.Duration {
 	var info syscall.TCPInfo
-	// bearer:disable go_gosec_unsafe_unsafe
+	size := uint32(syscall.SizeofTCPInfo)
-	infoLen := uint32(unsafe.Sizeof(info))
 
-	// TCP_INFO is 11 on Linux
+	_, _, err := syscall.Syscall6(
-	// #nosec G103
-	_, _, errno := syscall.Syscall6(
 		syscall.SYS_GETSOCKOPT,
 		fd,
-		syscall.IPPROTO_TCP,
+		syscall.SOL_TCP,
-		11, // TCP_INFO
+		syscall.TCP_INFO,
-		// bearer:disable go_gosec_unsafe_unsafe
+		uintptr(unsafe.Pointer(&info)), // #nosec G103
-		uintptr(unsafe.Pointer(&info)),
+		uintptr(unsafe.Pointer(&size)), // #nosec G103
-		// bearer:disable go_gosec_unsafe_unsafe
-		uintptr(unsafe.Pointer(&infoLen)),
 		0,
 	)
 
-	if errno != 0 {
+	if err != 0 {
 		return 0
 	}
 
+	// RTT is in microseconds, convert to Duration
 	return time.Duration(info.Rtt) * time.Microsecond
 }

pkg/interfaces/tcp_netbsd.go

@@ -1,39 +0,0 @@
-//go:build netbsd
-// +build netbsd
-
-package interfaces
-
-import (
-	"fmt"
-	"net"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-)
-
-func (tc *TCPClientInterface) setTimeoutsLinux() error {
-	tcpConn, ok := tc.conn.(*net.TCPConn)
-	if !ok {
-		return fmt.Errorf("not a TCP connection")
-	}
-
-	if err := tcpConn.SetKeepAlive(true); err != nil {
-		return fmt.Errorf("failed to enable keepalive: %v", err)
-	}
-
-	keepalivePeriod := TCP_PROBE_INTERVAL_SEC * time.Second
-	if tc.i2pTunneled {
-		keepalivePeriod = I2P_PROBE_INTERVAL_SEC * time.Second
-	}
-
-	if err := tcpConn.SetKeepAlivePeriod(keepalivePeriod); err != nil {
-		debug.Log(debug.DEBUG_VERBOSE, "Failed to set keepalive period", "error", err)
-	}
-
-	debug.Log(debug.DEBUG_VERBOSE, "TCP keepalive configured (NetBSD)", "i2p", tc.i2pTunneled)
-	return nil
-}
-
-func (tc *TCPClientInterface) setTimeoutsOSX() error {
-	return tc.setTimeoutsLinux()
-}

pkg/interfaces/tcp_openbsd.go

@@ -1,39 +0,0 @@
-//go:build openbsd
-// +build openbsd
-
-package interfaces
-
-import (
-	"fmt"
-	"net"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-)
-
-func (tc *TCPClientInterface) setTimeoutsLinux() error {
-	tcpConn, ok := tc.conn.(*net.TCPConn)
-	if !ok {
-		return fmt.Errorf("not a TCP connection")
-	}
-
-	if err := tcpConn.SetKeepAlive(true); err != nil {
-		return fmt.Errorf("failed to enable keepalive: %v", err)
-	}
-
-	keepalivePeriod := TCP_PROBE_INTERVAL_SEC * time.Second
-	if tc.i2pTunneled {
-		keepalivePeriod = I2P_PROBE_INTERVAL_SEC * time.Second
-	}
-
-	if err := tcpConn.SetKeepAlivePeriod(keepalivePeriod); err != nil {
-		debug.Log(debug.DEBUG_VERBOSE, "Failed to set keepalive period", "error", err)
-	}
-
-	debug.Log(debug.DEBUG_VERBOSE, "TCP keepalive configured (OpenBSD)", "i2p", tc.i2pTunneled)
-	return nil
-}
-
-func (tc *TCPClientInterface) setTimeoutsOSX() error {
-	return tc.setTimeoutsLinux()
-}

pkg/interfaces/tcp_wasm.go

@@ -1,12 +0,0 @@
-//go:build js && wasm
-// +build js,wasm
-
-package interfaces
-
-func (tc *TCPClientInterface) setTimeoutsLinux() error {
-	return nil
-}
-
-func (tc *TCPClientInterface) setTimeoutsOSX() error {
-	return nil
-}

pkg/interfaces/tcp_windows.go

@@ -1,40 +0,0 @@
-package interfaces
-
-import (
-	"fmt"
-	"net"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-)
-
-func (tc *TCPClientInterface) setTimeoutsLinux() error {
-	return tc.setTimeoutsWindows()
-}
-
-func (tc *TCPClientInterface) setTimeoutsOSX() error {
-	return tc.setTimeoutsWindows()
-}
-
-func (tc *TCPClientInterface) setTimeoutsWindows() error {
-	tcpConn, ok := tc.conn.(*net.TCPConn)
-	if !ok {
-		return fmt.Errorf("not a TCP connection")
-	}
-
-	if err := tcpConn.SetKeepAlive(true); err != nil {
-		return fmt.Errorf("failed to enable keepalive: %v", err)
-	}
-
-	keepalivePeriod := TCP_PROBE_INTERVAL_SEC * time.Second
-	if tc.i2pTunneled {
-		keepalivePeriod = I2P_PROBE_INTERVAL_SEC * time.Second
-	}
-
-	if err := tcpConn.SetKeepAlivePeriod(keepalivePeriod); err != nil {
-		debug.Log(debug.DEBUG_VERBOSE, "Failed to set keepalive period", "error", err)
-	}
-
-	debug.Log(debug.DEBUG_VERBOSE, "TCP keepalive configured (Windows)", "i2p", tc.i2pTunneled)
-	return nil
-}

pkg/interfaces/udp.go

@@ -2,11 +2,11 @@ package interfaces
 
 import (
 	"fmt"
+	"log"
 	"net"
 	"sync"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
 )
 
 type UDPInterface struct {
@@ -36,11 +36,9 @@ func NewUDPInterface(name string, addr string, target string, enabled bool) (*UD
 		BaseInterface: NewBaseInterface(name, common.IF_TYPE_UDP, enabled),
 		addr:          udpAddr,
 		targetAddr:    targetAddr,
-		readBuffer:    make([]byte, 1064),
+		readBuffer:    make([]byte, common.DEFAULT_MTU),
 	}
 
-	ui.MTU = 1064
-
 	return ui, nil
 }
 
@@ -78,7 +76,7 @@ func (ui *UDPInterface) Detach() {
 }
 
 func (ui *UDPInterface) Send(data []byte, addr string) error {
-	debug.Log(debug.DEBUG_ALL, "UDP interface sending bytes", "name", ui.Name, "bytes", len(data))
+	log.Printf("[DEBUG-7] UDP interface %s: Sending %d bytes", ui.Name, len(data))
 
 	if !ui.IsEnabled() {
 		return fmt.Errorf("interface not enabled")
@@ -95,9 +93,9 @@ func (ui *UDPInterface) Send(data []byte, addr string) error {
 
 	_, err := ui.conn.WriteTo(data, ui.targetAddr)
 	if err != nil {
-		debug.Log(debug.DEBUG_CRITICAL, "UDP interface write failed", "name", ui.Name, "error", err)
+		log.Printf("[DEBUG-1] UDP interface %s: Write failed: %v", ui.Name, err)
 	} else {
-		debug.Log(debug.DEBUG_ALL, "UDP interface sent bytes successfully", "name", ui.Name, "bytes", len(data))
+		log.Printf("[DEBUG-7] UDP interface %s: Sent %d bytes successfully", ui.Name, len(data))
 	}
 	return err
 }
@@ -183,45 +181,28 @@ func (ui *UDPInterface) Start() error {
 		return err
 	}
 	ui.conn = conn
-
-	// Enable broadcast mode if we have a target address
-	if ui.targetAddr != nil {
-		// Get the raw connection file descriptor to set SO_BROADCAST
-		if err := conn.SetReadBuffer(1064); err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Failed to set read buffer size", "error", err)
-		}
-		if err := conn.SetWriteBuffer(1064); err != nil {
-			debug.Log(debug.DEBUG_ERROR, "Failed to set write buffer size", "error", err)
-		}
-	}
-
 	ui.Online = true
-
+	
 	// Start the read loop in a goroutine
 	go ui.readLoop()
-
+	
 	return nil
 }
 
 func (ui *UDPInterface) readLoop() {
-	buffer := make([]byte, 1064)
+	buffer := make([]byte, common.DEFAULT_MTU)
 	for ui.IsOnline() && !ui.IsDetached() {
 		n, remoteAddr, err := ui.conn.ReadFromUDP(buffer)
 		if err != nil {
 			if ui.IsOnline() {
-				debug.Log(debug.DEBUG_ERROR, "Error reading from UDP interface", "name", ui.Name, "error", err)
+				log.Printf("Error reading from UDP interface %s: %v", ui.Name, err)
 			}
 			return
 		}
 
-		// Update RX stats
 		ui.mutex.Lock()
-		// #nosec G115 - Network read sizes are always positive and within safe range
-		ui.RxBytes += uint64(n)
-
-		// Auto-discover target address from first packet if not set
 		if ui.targetAddr == nil {
-			debug.Log(debug.DEBUG_ALL, "UDP interface discovered peer", "name", ui.Name, "peer", remoteAddr.String())
+			log.Printf("[DEBUG-7] UDP interface %s discovered peer %s", ui.Name, remoteAddr)
 			ui.targetAddr = remoteAddr
 		}
 		ui.mutex.Unlock()
@@ -232,6 +213,25 @@ func (ui *UDPInterface) readLoop() {
 	}
 }
 
+/*
+func (ui *UDPInterface) readLoop() {
+	buffer := make([]byte, ui.MTU)
+	for {
+		n, _, err := ui.conn.ReadFromUDP(buffer)
+		if err != nil {
+			if ui.Online {
+				log.Printf("Error reading from UDP interface %s: %v", ui.Name, err)
+				ui.Stop() // Consider if stopping is the right action or just log and continue
+			}
+			return
+		}
+		if ui.packetCallback != nil {
+			ui.packetCallback(buffer[:n], ui)
+		}
+	}
+}
+*/
+
 func (ui *UDPInterface) IsEnabled() bool {
 	ui.mutex.RLock()
 	defer ui.mutex.RUnlock()

pkg/interfaces/udp_test.go

@@ -3,7 +3,7 @@ package interfaces
 import (
 	"testing"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
 )
 
 func TestNewUDPInterface(t *testing.T) {
@@ -25,6 +25,11 @@ func TestNewUDPInterface(t *testing.T) {
 		if ui.GetType() != common.IF_TYPE_UDP {
 			t.Errorf("GetType() = %v; want %v", ui.GetType(), common.IF_TYPE_UDP)
 		}
+		if ui.addr.String() != validAddr && ui.addr.Port == 0 { // Check if address resolved, port 0 is special
+			// Allow OS-assigned port if 0 was specified
+		} else if ui.addr.String() != validAddr {
+			// t.Errorf("Resolved addr = %s; want %s", ui.addr.String(), validAddr) //This check is flaky with port 0
+		}
 		if ui.targetAddr.String() != validTarget {
 			t.Errorf("Resolved targetAddr = %s; want %s", ui.targetAddr.String(), validTarget)
 		}

pkg/interfaces/websocket_wasm.go

@@ -1,261 +0,0 @@
-//go:build js && wasm
-// +build js,wasm
-
-package interfaces
-
-import (
-	"encoding/binary"
-	"fmt"
-	"net"
-	"sync"
-	"syscall/js"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-)
-
-type WebSocketInterface struct {
-	BaseInterface
-	wsURL        string
-	ws           js.Value
-	connected    bool
-	mutex        sync.RWMutex
-	messageQueue [][]byte
-}
-
-func NewWebSocketInterface(name string, wsURL string, enabled bool) (*WebSocketInterface, error) {
-	ws := &WebSocketInterface{
-		BaseInterface: NewBaseInterface(name, common.IF_TYPE_UDP, enabled),
-		wsURL:         wsURL,
-		messageQueue:  make([][]byte, 0),
-	}
-
-	ws.MTU = 1064
-	ws.Bitrate = 10000000
-
-	return ws, nil
-}
-
-func (wsi *WebSocketInterface) GetName() string {
-	return wsi.Name
-}
-
-func (wsi *WebSocketInterface) GetType() common.InterfaceType {
-	return wsi.Type
-}
-
-func (wsi *WebSocketInterface) GetMode() common.InterfaceMode {
-	return wsi.Mode
-}
-
-func (wsi *WebSocketInterface) IsOnline() bool {
-	wsi.mutex.RLock()
-	defer wsi.mutex.RUnlock()
-	return wsi.Online && wsi.connected
-}
-
-func (wsi *WebSocketInterface) IsDetached() bool {
-	wsi.mutex.RLock()
-	defer wsi.mutex.RUnlock()
-	return wsi.Detached
-}
-
-func (wsi *WebSocketInterface) Detach() {
-	wsi.mutex.Lock()
-	defer wsi.mutex.Unlock()
-	wsi.Detached = true
-	wsi.Online = false
-	wsi.closeWebSocket()
-}
-
-func (wsi *WebSocketInterface) Enable() {
-	wsi.mutex.Lock()
-	defer wsi.mutex.Unlock()
-	wsi.Enabled = true
-}
-
-func (wsi *WebSocketInterface) Disable() {
-	wsi.mutex.Lock()
-	defer wsi.mutex.Unlock()
-	wsi.Enabled = false
-	wsi.closeWebSocket()
-}
-
-func (wsi *WebSocketInterface) Start() error {
-	wsi.mutex.Lock()
-	defer wsi.mutex.Unlock()
-
-	if wsi.ws.Truthy() {
-		return fmt.Errorf("WebSocket already started")
-	}
-
-	ws := js.Global().Get("WebSocket").New(wsi.wsURL)
-	ws.Set("binaryType", "arraybuffer")
-
-	ws.Set("onopen", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
-		wsi.mutex.Lock()
-		wsi.connected = true
-		wsi.Online = true
-		wsi.mutex.Unlock()
-
-		debug.Log(debug.DEBUG_INFO, "WebSocket connected", "name", wsi.Name, "url", wsi.wsURL)
-
-		wsi.mutex.Lock()
-		queue := make([][]byte, len(wsi.messageQueue))
-		copy(queue, wsi.messageQueue)
-		wsi.messageQueue = wsi.messageQueue[:0]
-		wsi.mutex.Unlock()
-
-		for _, msg := range queue {
-			wsi.sendWebSocketMessage(msg)
-		}
-
-		return nil
-	}))
-
-	ws.Set("onmessage", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
-		if len(args) < 1 {
-			return nil
-		}
-
-		event := args[0]
-		data := event.Get("data")
-
-		var packetData []byte
-		if data.Type() == js.TypeString {
-			packetData = []byte(data.String())
-		} else if data.Type() == js.TypeObject {
-			array := js.Global().Get("Uint8Array").New(data)
-			length := array.Get("length").Int()
-			packetData = make([]byte, length)
-			js.CopyBytesToGo(packetData, array)
-		} else {
-			debug.Log(debug.DEBUG_ERROR, "Unknown WebSocket message type", "type", data.Type().String())
-			return nil
-		}
-
-		if len(packetData) < 4 {
-			debug.Log(debug.DEBUG_ERROR, "WebSocket message too short", "bytes", len(packetData))
-			return nil
-		}
-
-		packetLen := binary.BigEndian.Uint32(packetData[:4])
-		if len(packetData) < int(packetLen)+4 {
-			debug.Log(debug.DEBUG_ERROR, "WebSocket message incomplete", "expected", packetLen+4, "got", len(packetData))
-			return nil
-		}
-
-		packet := packetData[4 : 4+packetLen]
-
-		wsi.mutex.Lock()
-		wsi.RxBytes += uint64(len(packet))
-		wsi.mutex.Unlock()
-
-		wsi.ProcessIncoming(packet)
-
-		return nil
-	}))
-
-	ws.Set("onerror", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
-		debug.Log(debug.DEBUG_ERROR, "WebSocket error", "name", wsi.Name)
-		return nil
-	}))
-
-	ws.Set("onclose", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
-		wsi.mutex.Lock()
-		wsi.connected = false
-		wsi.Online = false
-		wsi.mutex.Unlock()
-
-		debug.Log(debug.DEBUG_INFO, "WebSocket closed", "name", wsi.Name)
-
-		if wsi.Enabled && !wsi.Detached {
-			time.Sleep(2 * time.Second)
-			go wsi.Start()
-		}
-
-		return nil
-	}))
-
-	wsi.ws = ws
-
-	return nil
-}
-
-func (wsi *WebSocketInterface) Stop() error {
-	wsi.mutex.Lock()
-	defer wsi.mutex.Unlock()
-	wsi.Enabled = false
-	wsi.closeWebSocket()
-	return nil
-}
-
-func (wsi *WebSocketInterface) closeWebSocket() {
-	if wsi.ws.Truthy() {
-		wsi.ws.Call("close")
-		wsi.ws = js.Value{}
-	}
-	wsi.connected = false
-	wsi.Online = false
-}
-
-func (wsi *WebSocketInterface) Send(data []byte, addr string) error {
-	if !wsi.IsEnabled() {
-		return fmt.Errorf("interface not enabled")
-	}
-
-	wsi.mutex.Lock()
-	wsi.TxBytes += uint64(len(data))
-	wsi.mutex.Unlock()
-
-	if !wsi.connected {
-		wsi.mutex.Lock()
-		wsi.messageQueue = append(wsi.messageQueue, data)
-		wsi.mutex.Unlock()
-		return nil
-	}
-
-	return wsi.sendWebSocketMessage(data)
-}
-
-func (wsi *WebSocketInterface) sendWebSocketMessage(data []byte) error {
-	if !wsi.ws.Truthy() {
-		return fmt.Errorf("WebSocket not initialized")
-	}
-
-	if wsi.ws.Get("readyState").Int() != 1 {
-		return fmt.Errorf("WebSocket not open")
-	}
-
-	packetLen := uint32(len(data))
-	packet := make([]byte, 4+len(data))
-	binary.BigEndian.PutUint32(packet[:4], packetLen)
-	copy(packet[4:], data)
-
-	array := js.Global().Get("Uint8Array").New(len(packet))
-	js.CopyBytesToJS(array, packet)
-
-	wsi.ws.Call("send", array)
-
-	debug.Log(debug.DEBUG_VERBOSE, "WebSocket sent packet", "name", wsi.Name, "bytes", len(data))
-	return nil
-}
-
-func (wsi *WebSocketInterface) ProcessOutgoing(data []byte) error {
-	return wsi.Send(data, "")
-}
-
-func (wsi *WebSocketInterface) GetConn() net.Conn {
-	return nil
-}
-
-func (wsi *WebSocketInterface) GetMTU() int {
-	return wsi.MTU
-}
-
-func (wsi *WebSocketInterface) IsEnabled() bool {
-	wsi.mutex.RLock()
-	defer wsi.mutex.RUnlock()
-	return wsi.Enabled && wsi.Online && !wsi.Detached
-}

pkg/link/establishment_test.go

@@ -1,364 +0,0 @@
-package link
-
-import (
-	"testing"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/destination"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/packet"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/transport"
-)
-
-func TestEphemeralKeyGeneration(t *testing.T) {
-	link := &Link{}
-
-	if err := link.generateEphemeralKeys(); err != nil {
-		t.Fatalf("Failed to generate ephemeral keys: %v", err)
-	}
-
-	if len(link.prv) != KEYSIZE {
-		t.Errorf("Expected private key length %d, got %d", KEYSIZE, len(link.prv))
-	}
-
-	if len(link.pub) != KEYSIZE {
-		t.Errorf("Expected public key length %d, got %d", KEYSIZE, len(link.pub))
-	}
-
-	if len(link.sigPriv) != 64 {
-		t.Errorf("Expected signing private key length 64, got %d", len(link.sigPriv))
-	}
-
-	if len(link.sigPub) != 32 {
-		t.Errorf("Expected signing public key length 32, got %d", len(link.sigPub))
-	}
-}
-
-func TestSignallingBytes(t *testing.T) {
-	mtu := 500
-	mode := byte(MODE_AES256_CBC)
-
-	bytes := signallingBytes(mtu, mode)
-
-	if len(bytes) != LINK_MTU_SIZE {
-		t.Errorf("Expected signalling bytes length %d, got %d", LINK_MTU_SIZE, len(bytes))
-	}
-
-	extractedMTU := (int(bytes[0]&0x1F) << 16) | (int(bytes[1]) << 8) | int(bytes[2])
-	if extractedMTU != mtu {
-		t.Errorf("Expected MTU %d, got %d", mtu, extractedMTU)
-	}
-
-	extractedMode := (bytes[0] & MODE_BYTEMASK) >> 5
-	if extractedMode != mode {
-		t.Errorf("Expected mode %d, got %d", mode, extractedMode)
-	}
-}
-
-func TestLinkIDGeneration(t *testing.T) {
-	responderIdent, err := identity.NewIdentity()
-	if err != nil {
-		t.Fatalf("Failed to create responder identity: %v", err)
-	}
-
-	cfg := &common.ReticulumConfig{}
-	transportInstance := transport.NewTransport(cfg)
-
-	dest, err := destination.New(responderIdent, destination.IN, destination.SINGLE, "test", transportInstance, "link")
-	if err != nil {
-		t.Fatalf("Failed to create destination: %v", err)
-	}
-
-	link := &Link{
-		destination: dest,
-		transport:   transportInstance,
-		initiator:   true,
-	}
-
-	if err := link.generateEphemeralKeys(); err != nil {
-		t.Fatalf("Failed to generate keys: %v", err)
-	}
-
-	link.mode = MODE_DEFAULT
-	link.mtu = 500
-
-	signalling := signallingBytes(link.mtu, link.mode)
-	requestData := make([]byte, 0, ECPUBSIZE+LINK_MTU_SIZE)
-	requestData = append(requestData, link.pub...)
-	requestData = append(requestData, link.sigPub...)
-	requestData = append(requestData, signalling...)
-
-	pkt := &packet.Packet{
-		HeaderType:      packet.HeaderType1,
-		PacketType:      packet.PacketTypeLinkReq,
-		TransportType:   0,
-		Context:         packet.ContextNone,
-		ContextFlag:     packet.FlagUnset,
-		Hops:            0,
-		DestinationType: dest.GetType(),
-		DestinationHash: dest.GetHash(),
-		Data:            requestData,
-	}
-
-	if err := pkt.Pack(); err != nil {
-		t.Fatalf("Failed to pack packet: %v", err)
-	}
-
-	linkID := linkIDFromPacket(pkt)
-
-	if len(linkID) != 16 {
-		t.Errorf("Expected link ID length 16, got %d", len(linkID))
-	}
-
-	t.Logf("Generated link ID: %x", linkID)
-}
-
-func TestHandshake(t *testing.T) {
-	link1 := &Link{}
-	link2 := &Link{}
-
-	if err := link1.generateEphemeralKeys(); err != nil {
-		t.Fatalf("Failed to generate keys for link1: %v", err)
-	}
-
-	if err := link2.generateEphemeralKeys(); err != nil {
-		t.Fatalf("Failed to generate keys for link2: %v", err)
-	}
-
-	link1.peerPub = link2.pub
-	link2.peerPub = link1.pub
-
-	link1.linkID = []byte("test-link-id-abc")
-	link2.linkID = []byte("test-link-id-abc")
-
-	link1.mode = MODE_AES256_CBC
-	link2.mode = MODE_AES256_CBC
-
-	if err := link1.performHandshake(); err != nil {
-		t.Fatalf("Link1 handshake failed: %v", err)
-	}
-
-	if err := link2.performHandshake(); err != nil {
-		t.Fatalf("Link2 handshake failed: %v", err)
-	}
-
-	if string(link1.sharedKey) != string(link2.sharedKey) {
-		t.Error("Shared keys do not match")
-	}
-
-	if string(link1.derivedKey) != string(link2.derivedKey) {
-		t.Error("Derived keys do not match")
-	}
-
-	if link1.status != STATUS_HANDSHAKE {
-		t.Errorf("Expected link1 status HANDSHAKE, got %d", link1.status)
-	}
-
-	if link2.status != STATUS_HANDSHAKE {
-		t.Errorf("Expected link2 status HANDSHAKE, got %d", link2.status)
-	}
-}
-
-func TestLinkEstablishment(t *testing.T) {
-	responderIdent, err := identity.NewIdentity()
-	if err != nil {
-		t.Fatalf("Failed to create responder identity: %v", err)
-	}
-
-	cfg := &common.ReticulumConfig{}
-	transportInstance := transport.NewTransport(cfg)
-
-	dest, err := destination.New(responderIdent, destination.IN, destination.SINGLE, "test", transportInstance, "link")
-	if err != nil {
-		t.Fatalf("Failed to create destination: %v", err)
-	}
-
-	initiatorLink := &Link{
-		destination: dest,
-		transport:   transportInstance,
-		initiator:   true,
-	}
-
-	responderLink := &Link{
-		transport: transportInstance,
-		initiator: false,
-	}
-
-	if err := initiatorLink.generateEphemeralKeys(); err != nil {
-		t.Fatalf("Failed to generate initiator keys: %v", err)
-	}
-
-	initiatorLink.mode = MODE_DEFAULT
-	initiatorLink.mtu = 500
-
-	signalling := signallingBytes(initiatorLink.mtu, initiatorLink.mode)
-	requestData := make([]byte, 0, ECPUBSIZE+LINK_MTU_SIZE)
-	requestData = append(requestData, initiatorLink.pub...)
-	requestData = append(requestData, initiatorLink.sigPub...)
-	requestData = append(requestData, signalling...)
-
-	linkRequestPkt := &packet.Packet{
-		HeaderType:      packet.HeaderType1,
-		PacketType:      packet.PacketTypeLinkReq,
-		TransportType:   0,
-		Context:         packet.ContextNone,
-		ContextFlag:     packet.FlagUnset,
-		Hops:            0,
-		DestinationType: dest.GetType(),
-		DestinationHash: dest.GetHash(),
-		Data:            requestData,
-	}
-
-	if err := linkRequestPkt.Pack(); err != nil {
-		t.Fatalf("Failed to pack link request: %v", err)
-	}
-
-	initiatorLink.linkID = linkIDFromPacket(linkRequestPkt)
-	initiatorLink.requestTime = time.Now()
-	initiatorLink.status = STATUS_PENDING
-
-	t.Logf("Initiator link request created, link_id=%x", initiatorLink.linkID)
-
-	responderLink.peerPub = linkRequestPkt.Data[0:KEYSIZE]
-	responderLink.peerSigPub = linkRequestPkt.Data[KEYSIZE:ECPUBSIZE]
-	responderLink.linkID = linkIDFromPacket(linkRequestPkt)
-	responderLink.initiator = false
-
-	t.Logf("Responder link ID=%x (len=%d)", responderLink.linkID, len(responderLink.linkID))
-
-	if len(responderLink.linkID) == 0 {
-		t.Fatal("Responder link ID is empty!")
-	}
-
-	if len(linkRequestPkt.Data) >= ECPUBSIZE+LINK_MTU_SIZE {
-		mtuBytes := linkRequestPkt.Data[ECPUBSIZE : ECPUBSIZE+LINK_MTU_SIZE]
-		responderLink.mtu = (int(mtuBytes[0]&0x1F) << 16) | (int(mtuBytes[1]) << 8) | int(mtuBytes[2])
-		responderLink.mode = (mtuBytes[0] & MODE_BYTEMASK) >> 5
-	}
-
-	if err := responderLink.generateEphemeralKeys(); err != nil {
-		t.Fatalf("Failed to generate responder keys: %v", err)
-	}
-
-	if err := responderLink.performHandshake(); err != nil {
-		t.Fatalf("Responder handshake failed: %v", err)
-	}
-
-	responderLink.status = STATUS_ACTIVE
-	responderLink.establishedAt = time.Now()
-
-	if string(responderLink.linkID) != string(initiatorLink.linkID) {
-		t.Error("Link IDs do not match between initiator and responder")
-	}
-
-	t.Logf("Responder handshake successful, shared_key_len=%d", len(responderLink.sharedKey))
-}
-
-func TestLinkProofValidation(t *testing.T) {
-	responderIdent, err := identity.NewIdentity()
-	if err != nil {
-		t.Fatalf("Failed to create responder identity: %v", err)
-	}
-
-	cfg := &common.ReticulumConfig{}
-	transportInstance := transport.NewTransport(cfg)
-
-	dest, err := destination.New(responderIdent, destination.IN, destination.SINGLE, "test", transportInstance, "link")
-	if err != nil {
-		t.Fatalf("Failed to create destination: %v", err)
-	}
-
-	initiatorLink := &Link{
-		destination: dest,
-		transport:   transportInstance,
-		initiator:   true,
-	}
-
-	responderLink := &Link{
-		transport: transportInstance,
-		initiator: false,
-	}
-
-	if err := initiatorLink.generateEphemeralKeys(); err != nil {
-		t.Fatalf("Failed to generate initiator keys: %v", err)
-	}
-
-	initiatorLink.mode = MODE_DEFAULT
-	initiatorLink.mtu = 500
-
-	signalling := signallingBytes(initiatorLink.mtu, initiatorLink.mode)
-	requestData := make([]byte, 0, ECPUBSIZE+LINK_MTU_SIZE)
-	requestData = append(requestData, initiatorLink.pub...)
-	requestData = append(requestData, initiatorLink.sigPub...)
-	requestData = append(requestData, signalling...)
-
-	linkRequestPkt := &packet.Packet{
-		HeaderType:      packet.HeaderType1,
-		PacketType:      packet.PacketTypeLinkReq,
-		TransportType:   0,
-		Context:         packet.ContextNone,
-		ContextFlag:     packet.FlagUnset,
-		Hops:            0,
-		DestinationType: dest.GetType(),
-		DestinationHash: dest.GetHash(),
-		Data:            requestData,
-	}
-
-	if err := linkRequestPkt.Pack(); err != nil {
-		t.Fatalf("Failed to pack link request: %v", err)
-	}
-
-	initiatorLink.linkID = linkIDFromPacket(linkRequestPkt)
-	initiatorLink.requestTime = time.Now()
-	initiatorLink.status = STATUS_PENDING
-
-	responderLink.peerPub = linkRequestPkt.Data[0:KEYSIZE]
-	responderLink.peerSigPub = linkRequestPkt.Data[KEYSIZE:ECPUBSIZE]
-	responderLink.linkID = linkIDFromPacket(linkRequestPkt)
-	responderLink.initiator = false
-
-	if len(linkRequestPkt.Data) >= ECPUBSIZE+LINK_MTU_SIZE {
-		mtuBytes := linkRequestPkt.Data[ECPUBSIZE : ECPUBSIZE+LINK_MTU_SIZE]
-		responderLink.mtu = (int(mtuBytes[0]&0x1F) << 16) | (int(mtuBytes[1]) << 8) | int(mtuBytes[2])
-		responderLink.mode = (mtuBytes[0] & MODE_BYTEMASK) >> 5
-	} else {
-		responderLink.mtu = 500
-		responderLink.mode = MODE_DEFAULT
-	}
-
-	if err := responderLink.generateEphemeralKeys(); err != nil {
-		t.Fatalf("Failed to generate responder keys: %v", err)
-	}
-
-	if err := responderLink.performHandshake(); err != nil {
-		t.Fatalf("Responder handshake failed: %v", err)
-	}
-
-	proofPkt, err := responderLink.GenerateLinkProof(responderIdent)
-	if err != nil {
-		t.Fatalf("Failed to generate link proof: %v", err)
-	}
-
-	if err := initiatorLink.ValidateLinkProof(proofPkt, nil); err != nil {
-		t.Fatalf("Initiator failed to validate link proof: %v", err)
-	}
-
-	if initiatorLink.status != STATUS_ACTIVE {
-		t.Errorf("Expected initiator status ACTIVE, got %d", initiatorLink.status)
-	}
-
-	if string(initiatorLink.sharedKey) != string(responderLink.sharedKey) {
-		t.Error("Shared keys do not match after full handshake")
-	}
-
-	if string(initiatorLink.derivedKey) != string(responderLink.derivedKey) {
-		t.Error("Derived keys do not match after full handshake")
-	}
-
-	t.Logf("Full link establishment successful")
-	t.Logf("Link ID: %x", initiatorLink.linkID)
-	t.Logf("Shared key length: %d", len(initiatorLink.sharedKey))
-	t.Logf("Derived key length: %d", len(initiatorLink.derivedKey))
-	t.Logf("RTT: %.3f seconds", initiatorLink.rtt)
-}

pkg/link/link_test.go

@@ -1,218 +0,0 @@
-package link
-
-import (
-	"bytes"
-	"testing"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/destination"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/packet"
-)
-
-type mockTransport struct {
-	sentPackets []*packet.Packet
-}
-
-func (m *mockTransport) SendPacket(pkt *packet.Packet) error {
-	m.sentPackets = append(m.sentPackets, pkt)
-	return nil
-}
-
-func (m *mockTransport) RegisterLink(linkID []byte, link interface{}) {
-}
-
-func (m *mockTransport) GetConfig() *common.ReticulumConfig {
-	return &common.ReticulumConfig{}
-}
-
-func (m *mockTransport) GetInterfaces() map[string]common.NetworkInterface {
-	return make(map[string]common.NetworkInterface)
-}
-
-func (m *mockTransport) RegisterDestination(hash []byte, dest interface{}) {
-}
-
-type mockInterface struct {
-	name string
-}
-
-func (m *mockInterface) GetName() string {
-	return m.name
-}
-
-func (m *mockInterface) Start() error {
-	return nil
-}
-
-func (m *mockInterface) Stop() error {
-	return nil
-}
-
-func (m *mockInterface) Send(data []byte, address string) error {
-	return nil
-}
-
-func (m *mockInterface) ProcessIncoming(data []byte) error {
-	return nil
-}
-
-func (m *mockInterface) SetPacketCallback(cb func([]byte, common.NetworkInterface)) {
-}
-
-func (m *mockInterface) GetType() string {
-	return "mock"
-}
-
-func (m *mockInterface) GetMTU() int {
-	return 500
-}
-
-func (m *mockInterface) Detach() {
-}
-
-func (m *mockInterface) Enable() {
-}
-
-func (m *mockInterface) Disable() {
-}
-
-func (m *mockInterface) IsEnabled() bool {
-	return true
-}
-
-func (m *mockInterface) IsOnline() bool {
-	return true
-}
-
-func (m *mockInterface) IsDetached() bool {
-	return false
-}
-
-func (m *mockInterface) GetPacketCallback() func([]byte, common.NetworkInterface) {
-	return nil
-}
-
-func (m *mockInterface) GetConn() interface{} {
-	return nil
-}
-
-func (m *mockInterface) ProcessOutgoing(data []byte) ([]byte, error) {
-	return data, nil
-}
-
-func (m *mockInterface) SendPathRequest(destHash []byte) error {
-	return nil
-}
-
-func (m *mockInterface) SendLinkPacket(data []byte) error {
-	return nil
-}
-
-func (m *mockInterface) GetBandwidthAvailable() float64 {
-	return 1.0
-}
-
-func TestLinkRequestResponse(t *testing.T) {
-	serverIdent, err := identity.New()
-	if err != nil {
-		t.Fatalf("Failed to create server identity: %v", err)
-	}
-
-	clientIdent, err := identity.New()
-	if err != nil {
-		t.Fatalf("Failed to create client identity: %v", err)
-	}
-
-	mockTrans := &mockTransport{
-		sentPackets: make([]*packet.Packet, 0),
-	}
-
-	serverDest, err := destination.New(serverIdent, destination.IN, destination.SINGLE, "testapp", mockTrans, "server")
-	if err != nil {
-		t.Fatalf("Failed to create server destination: %v", err)
-	}
-
-	expectedResponse := []byte("response data")
-	testPath := "/test/path"
-
-	err = serverDest.RegisterRequestHandler(testPath, func(path string, data []byte, requestID []byte, linkID []byte, remoteIdentity *identity.Identity, requestedAt int64) []byte {
-		if path != testPath {
-			t.Errorf("Expected path %s, got %s", testPath, path)
-		}
-		return expectedResponse
-	}, destination.ALLOW_ALL, nil)
-	if err != nil {
-		t.Fatalf("Failed to register request handler: %v", err)
-	}
-
-	// Test the handler is registered correctly
-	pathHash := identity.TruncatedHash([]byte(testPath))
-	handler := serverDest.GetRequestHandler(pathHash)
-	if handler == nil {
-		t.Fatal("Handler not found after registration")
-	}
-
-	// Call the handler
-	testLinkID := make([]byte, 16)
-	result := handler(pathHash, []byte("test data"), []byte("request-id"), testLinkID, clientIdent, time.Now())
-
-	if result == nil {
-		t.Fatal("Handler returned nil")
-	}
-
-	responseBytes, ok := result.([]byte)
-	if !ok {
-		t.Fatalf("Handler returned unexpected type: %T", result)
-	}
-
-	if !bytes.Equal(responseBytes, expectedResponse) {
-		t.Errorf("Expected response %q, got %q", expectedResponse, responseBytes)
-	}
-}
-
-func TestLinkRequestHandlerNotFound(t *testing.T) {
-	serverIdent, _ := identity.New()
-	mockTrans := &mockTransport{sentPackets: make([]*packet.Packet, 0)}
-
-	serverDest, _ := destination.New(serverIdent, destination.IN, destination.SINGLE, "testapp", mockTrans, "server")
-
-	nonExistentPath := "/does/not/exist"
-	pathHash := identity.TruncatedHash([]byte(nonExistentPath))
-
-	handler := serverDest.GetRequestHandler(pathHash)
-	if handler != nil {
-		t.Error("Expected no handler for non-existent path, but found one")
-	}
-}
-
-func TestLinkResponseHandling(t *testing.T) {
-	// This test verifies the basic structure for response handling
-	// Full integration testing would require a proper transport setup
-
-	requestID := []byte("test-request-id-")
-	responseData := []byte("response payload")
-
-	receipt := &RequestReceipt{
-		requestID: requestID,
-		status:    STATUS_PENDING,
-	}
-
-	// Verify initial state
-	if receipt.status != STATUS_PENDING {
-		t.Errorf("Expected initial status PENDING, got %d", receipt.status)
-	}
-
-	// Simulate setting response
-	receipt.response = responseData
-	receipt.status = STATUS_ACTIVE
-
-	if !bytes.Equal(receipt.response, responseData) {
-		t.Errorf("Expected response %q, got %q", responseData, receipt.response)
-	}
-
-	if receipt.status != STATUS_ACTIVE {
-		t.Errorf("Expected status ACTIVE after response, got %d", receipt.status)
-	}
-}

pkg/packet/packet.go

@@ -6,10 +6,10 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"log"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/identity"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
 )
 
 const (
@@ -67,7 +67,6 @@ type Packet struct {
 
 	DestinationType byte
 	DestinationHash []byte
-	Destination     interface{}
 	TransportID     []byte
 	Data            []byte
 
@@ -86,21 +85,6 @@ type Packet struct {
 	Q    *float64
 
 	Addresses []byte
-	Link      interface{}
-
-	receipt *PacketReceipt
-}
-
-type PacketConfig struct {
-	DestType      byte
-	Data          []byte
-	PacketType    byte
-	Context       byte
-	TransportType byte
-	HeaderType    byte
-	TransportID   []byte
-	CreateReceipt bool
-	ContextFlag   byte
 }
 
 func NewPacket(destType byte, data []byte, packetType byte, context byte,
@@ -129,7 +113,7 @@ func (p *Packet) Pack() error {
 		return nil
 	}
 
-	debug.Log(debug.DEBUG_PACKETS, "Packing packet", "type", p.PacketType, "header", p.HeaderType)
+	log.Printf("[DEBUG-6] Packing packet: type=%d, header=%d", p.PacketType, p.HeaderType)
 
 	// Create header byte (Corrected order)
 	flags := byte(0)
@@ -140,23 +124,23 @@ func (p *Packet) Pack() error {
 	flags |= p.PacketType & 0b00000011
 
 	header := []byte{flags, p.Hops}
-	debug.Log(debug.DEBUG_TRACE, "Created packet header", "flags", fmt.Sprintf("%08b", flags), "hops", p.Hops)
+	log.Printf("[DEBUG-5] Created packet header: flags=%08b, hops=%d", flags, p.Hops)
 
 	header = append(header, p.DestinationHash...)
-
+	
 	if p.HeaderType == HeaderType2 {
 		if p.TransportID == nil {
 			return errors.New("transport ID required for header type 2")
 		}
 		header = append(header, p.TransportID...)
-		debug.Log(debug.DEBUG_ALL, "Added transport ID to header", "transport_id", fmt.Sprintf("%x", p.TransportID))
+		log.Printf("[DEBUG-7] Added transport ID to header: %x", p.TransportID)
 	}
 
 	header = append(header, p.Context)
-	debug.Log(debug.DEBUG_PACKETS, "Final header length", "bytes", len(header))
+	log.Printf("[DEBUG-6] Final header length: %d bytes", len(header))
 
 	p.Raw = append(header, p.Data...)
-	debug.Log(debug.DEBUG_TRACE, "Final packet size", "bytes", len(p.Raw))
+	log.Printf("[DEBUG-5] Final packet size: %d bytes", len(p.Raw))
 
 	if len(p.Raw) > MTU {
 		return errors.New("packet size exceeds MTU")
@@ -164,7 +148,7 @@ func (p *Packet) Pack() error {
 
 	p.Packed = true
 	p.updateHash()
-	debug.Log(debug.DEBUG_ALL, "Packet hash", "hash", fmt.Sprintf("%x", p.PacketHash))
+	log.Printf("[DEBUG-7] Packet hash: %x", p.PacketHash)
 	return nil
 }
 
@@ -189,8 +173,8 @@ func (p *Packet) Unpack() error {
 		if len(p.Raw) < 2*dstLen+3 {
 			return errors.New("packet too short for header type 2")
 		}
-		p.DestinationHash = p.Raw[2 : dstLen+2]      // Destination hash first
+		p.DestinationHash = p.Raw[2 : dstLen+2]           // Destination hash first
-		p.TransportID = p.Raw[dstLen+2 : 2*dstLen+2] // Transport ID second
+		p.TransportID = p.Raw[dstLen+2 : 2*dstLen+2]      // Transport ID second
 		p.Context = p.Raw[2*dstLen+2]
 		p.Data = p.Raw[2*dstLen+3:]
 	} else {
@@ -218,14 +202,14 @@ func (p *Packet) GetHash() []byte {
 func (p *Packet) getHashablePart() []byte {
 	hashable := []byte{p.Raw[0] & 0b00001111} // Lower 4 bits of flags
 	if p.HeaderType == HeaderType2 {
-		// Start hash from DestHash (index 18), skipping TransportID
+		// Match Python: Start hash from DestHash (index 18), skipping TransportID
 		dstLen := 16 // RNS.Identity.TRUNCATED_HASHLENGTH / 8
 		startIndex := dstLen + 2
 		if len(p.Raw) > startIndex {
 			hashable = append(hashable, p.Raw[startIndex:]...)
 		}
 	} else {
-		// Start hash from DestHash (index 2)
+		// Match Python: Start hash from DestHash (index 2)
 		if len(p.Raw) > 2 {
 			hashable = append(hashable, p.Raw[2:]...)
 		}
@@ -237,18 +221,6 @@ func (p *Packet) updateHash() {
 	p.PacketHash = p.GetHash()
 }
 
-func (p *Packet) Hash() []byte {
-	return p.GetHash()
-}
-
-func (p *Packet) TruncatedHash() []byte {
-	hash := p.GetHash()
-	if len(hash) >= 16 {
-		return hash[:16]
-	}
-	return hash
-}
-
 func (p *Packet) Serialize() ([]byte, error) {
 	if !p.Packed {
 		if err := p.Pack(); err != nil {
@@ -262,13 +234,13 @@ func (p *Packet) Serialize() ([]byte, error) {
 }
 
 func NewAnnouncePacket(destHash []byte, identity *identity.Identity, appData []byte, transportID []byte) (*Packet, error) {
-	debug.Log(debug.DEBUG_ALL, "Creating new announce packet", "dest_hash", fmt.Sprintf("%x", destHash), "app_data", fmt.Sprintf("%x", appData))
+	log.Printf("[DEBUG-7] Creating new announce packet: destHash=%x, appData=%s", destHash, fmt.Sprintf("%x", appData))
 
 	// Get public key separated into encryption and signing keys
 	pubKey := identity.GetPublicKey()
 	encKey := pubKey[:32]
 	signKey := pubKey[32:]
-	debug.Log(debug.DEBUG_PACKETS, "Using public keys", "enc_key", fmt.Sprintf("%x", encKey), "sign_key", fmt.Sprintf("%x", signKey))
+	log.Printf("[DEBUG-6] Using public keys: encKey=%x, signKey=%x", encKey, signKey)
 
 	// Parse app name from first msgpack element if possible
 	// For nodes, we'll use "reticulum.node" as the name hash
@@ -293,19 +265,19 @@ func NewAnnouncePacket(destHash []byte, identity *identity.Identity, appData []b
 	// Create name hash (10 bytes)
 	nameHash := sha256.Sum256([]byte(appName))
 	nameHash10 := nameHash[:10]
-	debug.Log(debug.DEBUG_PACKETS, "Using name hash", "name", appName, "hash", fmt.Sprintf("%x", nameHash10))
+	log.Printf("[DEBUG-6] Using name hash for '%s': %x", appName, nameHash10)
 
 	// Create random hash (10 bytes) - 5 bytes random + 5 bytes time
 	randomHash := make([]byte, 10)
 	_, err := rand.Read(randomHash[:5]) // #nosec G104
 	if err != nil {
-		debug.Log(debug.DEBUG_PACKETS, "Failed to read random bytes for hash", "error", err)
+		log.Printf("[DEBUG-6] Failed to read random bytes for hash: %v", err)
 		return nil, err // Or handle the error appropriately
 	}
 	timeBytes := make([]byte, 8)
 	binary.BigEndian.PutUint64(timeBytes, uint64(time.Now().Unix())) // #nosec G115
 	copy(randomHash[5:], timeBytes[:5])
-	debug.Log(debug.DEBUG_PACKETS, "Generated random hash", "hash", fmt.Sprintf("%x", randomHash))
+	log.Printf("[DEBUG-6] Generated random hash: %x", randomHash)
 
 	// Prepare ratchet ID if available (not yet implemented)
 	var ratchetID []byte
@@ -319,11 +291,11 @@ func NewAnnouncePacket(destHash []byte, identity *identity.Identity, appData []b
 	signedData = append(signedData, nameHash10...)
 	signedData = append(signedData, randomHash...)
 	signedData = append(signedData, appData...)
-	debug.Log(debug.DEBUG_TRACE, "Created signed data", "bytes", len(signedData))
+	log.Printf("[DEBUG-5] Created signed data (%d bytes)", len(signedData))
 
 	// Sign the data
 	signature := identity.Sign(signedData)
-	debug.Log(debug.DEBUG_PACKETS, "Generated signature", "signature", fmt.Sprintf("%x", signature))
+	log.Printf("[DEBUG-6] Generated signature: %x", signature)
 
 	// Combine all fields according to spec
 	// Data structure: Public Key (32) + Signing Key (32) + Name Hash (10) + Random Hash (10) + Ratchet (optional) + Signature (64) + App Data
@@ -338,7 +310,7 @@ func NewAnnouncePacket(destHash []byte, identity *identity.Identity, appData []b
 	data = append(data, signature...) // Signature (64 bytes)
 	data = append(data, appData...)   // Application data (variable)
 
-	debug.Log(debug.DEBUG_TRACE, "Combined packet data", "bytes", len(data))
+	log.Printf("[DEBUG-5] Combined packet data (%d bytes)", len(data))
 
 	// Create the packet with header type 2 (two address fields)
 	p := &Packet{
@@ -349,6 +321,6 @@ func NewAnnouncePacket(destHash []byte, identity *identity.Identity, appData []b
 		Data:            data,
 	}
 
-	debug.Log(debug.DEBUG_VERBOSE, "Created announce packet", "type", p.PacketType, "header", p.HeaderType)
+	log.Printf("[DEBUG-4] Created announce packet: type=%d, header=%d", p.PacketType, p.HeaderType)
 	return p, nil
 }

pkg/packet/receipt.go

@@ -1,342 +0,0 @@
-package packet
-
-import (
-	"fmt"
-	"sync"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
-)
-
-const (
-	RECEIPT_FAILED    = 0x00
-	RECEIPT_SENT      = 0x01
-	RECEIPT_DELIVERED = 0x02
-	RECEIPT_CULLED    = 0xFF
-
-	EXPL_LENGTH = (identity.HASHLENGTH + identity.SIGLENGTH) / 8
-	IMPL_LENGTH = identity.SIGLENGTH / 8
-)
-
-type PacketReceipt struct {
-	mutex sync.RWMutex
-
-	hash          []byte
-	truncatedHash []byte
-	sent          bool
-	sentAt        time.Time
-	proved        bool
-	status        byte
-	destination   interface{}
-	timeout       time.Duration
-	concludedAt   time.Time
-	proofPacket   *Packet
-
-	deliveryCallback func(*PacketReceipt)
-	timeoutCallback  func(*PacketReceipt)
-
-	link             interface{}
-	destinationHash  []byte
-	destinationIdent *identity.Identity
-	timeoutCheckDone chan bool
-}
-
-func NewPacketReceipt(pkt *Packet) *PacketReceipt {
-	hash := pkt.Hash()
-	receipt := &PacketReceipt{
-		hash:             hash,
-		truncatedHash:    pkt.TruncatedHash(),
-		sent:             true,
-		sentAt:           time.Now(),
-		proved:           false,
-		status:           RECEIPT_SENT,
-		destination:      pkt.Destination,
-		timeout:          calculateTimeout(pkt),
-		timeoutCheckDone: make(chan bool, 1),
-	}
-
-	go receipt.timeoutWatchdog()
-
-	debug.Log(debug.DEBUG_PACKETS, "Created packet receipt", "hash", fmt.Sprintf("%x", receipt.truncatedHash))
-	return receipt
-}
-
-func calculateTimeout(pkt *Packet) time.Duration {
-	baseTimeout := 15 * time.Second
-
-	if pkt.Hops > 0 {
-		baseTimeout += time.Duration(pkt.Hops) * (3 * time.Second)
-	}
-
-	return baseTimeout
-}
-
-func (pr *PacketReceipt) GetStatus() byte {
-	pr.mutex.RLock()
-	defer pr.mutex.RUnlock()
-	return pr.status
-}
-
-func (pr *PacketReceipt) GetHash() []byte {
-	pr.mutex.RLock()
-	defer pr.mutex.RUnlock()
-	return pr.hash
-}
-
-func (pr *PacketReceipt) IsDelivered() bool {
-	pr.mutex.RLock()
-	defer pr.mutex.RUnlock()
-	return pr.status == RECEIPT_DELIVERED
-}
-
-func (pr *PacketReceipt) IsFailed() bool {
-	pr.mutex.RLock()
-	defer pr.mutex.RUnlock()
-	return pr.status == RECEIPT_FAILED
-}
-
-func (pr *PacketReceipt) ValidateProofPacket(proofPacket *Packet) bool {
-	if proofPacket.Link != nil {
-		return pr.ValidateLinkProof(proofPacket.Data, proofPacket.Link, proofPacket)
-	}
-	return pr.ValidateProof(proofPacket.Data, proofPacket)
-}
-
-func (pr *PacketReceipt) ValidateLinkProof(proof []byte, link interface{}, proofPacket *Packet) bool {
-	if len(proof) == EXPL_LENGTH {
-		proofHash := proof[:identity.HASHLENGTH/8]
-		signature := proof[identity.HASHLENGTH/8 : identity.HASHLENGTH/8+identity.SIGLENGTH/8]
-
-		pr.mutex.RLock()
-		hashMatch := string(proofHash) == string(pr.hash)
-		pr.mutex.RUnlock()
-
-		if !hashMatch {
-			return false
-		}
-
-		proofValid := pr.validateLinkSignature(signature, link)
-		if proofValid {
-			pr.mutex.Lock()
-			pr.status = RECEIPT_DELIVERED
-			pr.proved = true
-			pr.concludedAt = time.Now()
-			pr.proofPacket = proofPacket
-			callback := pr.deliveryCallback
-			pr.mutex.Unlock()
-
-			if callback != nil {
-				go callback(pr)
-			}
-
-			debug.Log(debug.DEBUG_PACKETS, "Link proof validated", "hash", fmt.Sprintf("%x", pr.truncatedHash))
-			return true
-		}
-	} else if len(proof) == IMPL_LENGTH {
-		debug.Log(debug.DEBUG_TRACE, "Implicit link proof not yet implemented")
-	}
-
-	return false
-}
-
-func (pr *PacketReceipt) ValidateProof(proof []byte, proofPacket *Packet) bool {
-	if len(proof) == EXPL_LENGTH {
-		proofHash := proof[:identity.HASHLENGTH/8]
-		signature := proof[identity.HASHLENGTH/8 : identity.HASHLENGTH/8+identity.SIGLENGTH/8]
-
-		pr.mutex.RLock()
-		hashMatch := string(proofHash) == string(pr.hash)
-		ident := pr.destinationIdent
-		pr.mutex.RUnlock()
-
-		debug.Log(debug.DEBUG_PACKETS, "Explicit proof validation", "len", len(proof), "hashMatch", hashMatch, "hasIdent", ident != nil)
-
-		if !hashMatch {
-			debug.Log(debug.DEBUG_PACKETS, "Proof hash mismatch")
-			return false
-		}
-
-		if ident == nil {
-			debug.Log(debug.DEBUG_VERBOSE, "Cannot validate proof without destination identity")
-			return false
-		}
-
-		proofValid := ident.Verify(pr.hash, signature)
-		debug.Log(debug.DEBUG_PACKETS, "Signature verification result", "valid", proofValid)
-		if proofValid {
-			pr.mutex.Lock()
-			pr.status = RECEIPT_DELIVERED
-			pr.proved = true
-			pr.concludedAt = time.Now()
-			pr.proofPacket = proofPacket
-			callback := pr.deliveryCallback
-			pr.mutex.Unlock()
-
-			if callback != nil {
-				go callback(pr)
-			}
-
-			debug.Log(debug.DEBUG_PACKETS, "Proof validated", "hash", fmt.Sprintf("%x", pr.truncatedHash))
-			return true
-		}
-	} else if len(proof) == IMPL_LENGTH {
-		signature := proof[:identity.SIGLENGTH/8]
-
-		pr.mutex.RLock()
-		ident := pr.destinationIdent
-		pr.mutex.RUnlock()
-
-		if ident == nil {
-			return false
-		}
-
-		proofValid := ident.Verify(pr.hash, signature)
-		if proofValid {
-			pr.mutex.Lock()
-			pr.status = RECEIPT_DELIVERED
-			pr.proved = true
-			pr.concludedAt = time.Now()
-			pr.proofPacket = proofPacket
-			callback := pr.deliveryCallback
-			pr.mutex.Unlock()
-
-			if callback != nil {
-				go callback(pr)
-			}
-
-			debug.Log(debug.DEBUG_PACKETS, "Implicit proof validated", "hash", fmt.Sprintf("%x", pr.truncatedHash))
-			return true
-		}
-	}
-
-	return false
-}
-
-func (pr *PacketReceipt) validateLinkSignature(signature []byte, link interface{}) bool {
-	type linkValidator interface {
-		Validate(signature, message []byte) bool
-	}
-
-	if validator, ok := link.(linkValidator); ok {
-		return validator.Validate(signature, pr.hash)
-	}
-
-	debug.Log(debug.DEBUG_TRACE, "Link does not implement Validate method")
-	return false
-}
-
-func (pr *PacketReceipt) GetRTT() time.Duration {
-	pr.mutex.RLock()
-	defer pr.mutex.RUnlock()
-
-	if pr.concludedAt.IsZero() {
-		return 0
-	}
-
-	return pr.concludedAt.Sub(pr.sentAt)
-}
-
-func (pr *PacketReceipt) IsTimedOut() bool {
-	pr.mutex.RLock()
-	defer pr.mutex.RUnlock()
-
-	return time.Since(pr.sentAt) > pr.timeout
-}
-
-func (pr *PacketReceipt) checkTimeout() {
-	pr.mutex.Lock()
-
-	if pr.status != RECEIPT_SENT {
-		pr.mutex.Unlock()
-		return
-	}
-
-	if time.Since(pr.sentAt) <= pr.timeout {
-		pr.mutex.Unlock()
-		return
-	}
-
-	if pr.timeout < 0 {
-		pr.status = RECEIPT_CULLED
-	} else {
-		pr.status = RECEIPT_FAILED
-	}
-
-	pr.concludedAt = time.Now()
-	callback := pr.timeoutCallback
-	pr.mutex.Unlock()
-
-	debug.Log(debug.DEBUG_VERBOSE, "Packet receipt timed out", "hash", fmt.Sprintf("%x", pr.truncatedHash))
-
-	if callback != nil {
-		go callback(pr)
-	}
-}
-
-func (pr *PacketReceipt) timeoutWatchdog() {
-	ticker := time.NewTicker(1 * time.Second)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ticker.C:
-			pr.checkTimeout()
-
-			pr.mutex.RLock()
-			status := pr.status
-			pr.mutex.RUnlock()
-
-			if status != RECEIPT_SENT {
-				return
-			}
-		case <-pr.timeoutCheckDone:
-			return
-		}
-	}
-}
-
-func (pr *PacketReceipt) SetTimeout(timeout time.Duration) {
-	pr.mutex.Lock()
-	defer pr.mutex.Unlock()
-	pr.timeout = timeout
-}
-
-func (pr *PacketReceipt) SetDeliveryCallback(callback func(*PacketReceipt)) {
-	pr.mutex.Lock()
-	defer pr.mutex.Unlock()
-	pr.deliveryCallback = callback
-}
-
-func (pr *PacketReceipt) SetTimeoutCallback(callback func(*PacketReceipt)) {
-	pr.mutex.Lock()
-	defer pr.mutex.Unlock()
-	pr.timeoutCallback = callback
-}
-
-func (pr *PacketReceipt) SetDestinationIdentity(ident *identity.Identity) {
-	pr.mutex.Lock()
-	defer pr.mutex.Unlock()
-	pr.destinationIdent = ident
-}
-
-func (pr *PacketReceipt) SetLink(link interface{}) {
-	pr.mutex.Lock()
-	defer pr.mutex.Unlock()
-	pr.link = link
-}
-
-func (pr *PacketReceipt) Cancel() {
-	pr.mutex.Lock()
-	defer pr.mutex.Unlock()
-
-	if pr.status == RECEIPT_SENT {
-		pr.status = RECEIPT_CULLED
-		pr.concludedAt = time.Now()
-	}
-
-	select {
-	case pr.timeoutCheckDone <- true:
-	default:
-	}
-}

pkg/packet/receipt_test.go

@@ -1,209 +0,0 @@
-package packet
-
-import (
-	"testing"
-	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
-)
-
-func TestPacketReceiptCreation(t *testing.T) {
-	testIdent, err := identity.NewIdentity()
-	if err != nil {
-		t.Fatalf("Failed to create identity: %v", err)
-	}
-
-	destHash := testIdent.Hash()
-	data := []byte("test packet data")
-
-	pkt := &Packet{
-		HeaderType:      HeaderType1,
-		PacketType:      PacketTypeData,
-		TransportType:   0,
-		Context:         ContextNone,
-		ContextFlag:     FlagUnset,
-		Hops:            0,
-		DestinationType: 0x00,
-		DestinationHash: destHash,
-		Data:            data,
-		CreateReceipt:   true,
-	}
-
-	if err := pkt.Pack(); err != nil {
-		t.Fatalf("Failed to pack packet: %v", err)
-	}
-
-	receipt := NewPacketReceipt(pkt)
-	if receipt == nil {
-		t.Fatal("Receipt creation failed")
-	}
-
-	if receipt.GetStatus() != RECEIPT_SENT {
-		t.Errorf("Expected status SENT, got %d", receipt.GetStatus())
-	}
-
-	hash := receipt.GetHash()
-	if len(hash) == 0 {
-		t.Error("Receipt hash is empty")
-	}
-}
-
-func TestPacketReceiptTimeout(t *testing.T) {
-	testIdent, err := identity.NewIdentity()
-	if err != nil {
-		t.Fatalf("Failed to create identity: %v", err)
-	}
-
-	destHash := testIdent.Hash()
-	data := []byte("test data")
-
-	pkt := &Packet{
-		HeaderType:      HeaderType1,
-		PacketType:      PacketTypeData,
-		TransportType:   0,
-		Context:         ContextNone,
-		ContextFlag:     FlagUnset,
-		Hops:            0,
-		DestinationType: 0x00,
-		DestinationHash: destHash,
-		Data:            data,
-		CreateReceipt:   true,
-	}
-
-	if err := pkt.Pack(); err != nil {
-		t.Fatalf("Failed to pack packet: %v", err)
-	}
-
-	receipt := NewPacketReceipt(pkt)
-	receipt.SetTimeout(100 * time.Millisecond)
-
-	time.Sleep(150 * time.Millisecond)
-
-	if !receipt.IsTimedOut() {
-		t.Error("Receipt should be timed out")
-	}
-}
-
-func TestPacketReceiptProofValidation(t *testing.T) {
-	testIdent, err := identity.NewIdentity()
-	if err != nil {
-		t.Fatalf("Failed to create identity: %v", err)
-	}
-
-	destHash := testIdent.Hash()
-	data := []byte("test data")
-
-	pkt := &Packet{
-		HeaderType:      HeaderType1,
-		PacketType:      PacketTypeData,
-		TransportType:   0,
-		Context:         ContextNone,
-		ContextFlag:     FlagUnset,
-		Hops:            0,
-		DestinationType: 0x00,
-		DestinationHash: destHash,
-		Data:            data,
-		CreateReceipt:   true,
-	}
-
-	if err := pkt.Pack(); err != nil {
-		t.Fatalf("Failed to pack packet: %v", err)
-	}
-
-	receipt := NewPacketReceipt(pkt)
-	receipt.SetDestinationIdentity(testIdent)
-
-	packetHash := pkt.GetHash()
-	t.Logf("Packet hash: %x", packetHash)
-
-	signature := testIdent.Sign(packetHash)
-
-	t.Logf("PacketHash length: %d", len(packetHash))
-	t.Logf("Signature length: %d", len(signature))
-	t.Logf("EXPL_LENGTH constant: %d", EXPL_LENGTH)
-
-	if testIdent.Verify(packetHash, signature) {
-		t.Log("Direct verification succeeded")
-	} else {
-		t.Error("Direct verification failed")
-	}
-
-	proof := make([]byte, 0, EXPL_LENGTH)
-	proof = append(proof, packetHash...)
-	proof = append(proof, signature...)
-
-	t.Logf("Proof length: %d", len(proof))
-
-	proofPacket := &Packet{
-		PacketType: PacketTypeProof,
-		Data:       proof,
-	}
-
-	if !receipt.ValidateProof(proof, proofPacket) {
-		t.Errorf("Valid proof was rejected. Proof len=%d, expected=%d", len(proof), EXPL_LENGTH)
-	}
-
-	if receipt.GetStatus() != RECEIPT_DELIVERED {
-		t.Errorf("Expected status DELIVERED, got %d", receipt.GetStatus())
-	}
-
-	if !receipt.IsDelivered() {
-		t.Error("Receipt should be marked as delivered")
-	}
-}
-
-func TestPacketReceiptCallbacks(t *testing.T) {
-	testIdent, err := identity.NewIdentity()
-	if err != nil {
-		t.Fatalf("Failed to create identity: %v", err)
-	}
-
-	destHash := testIdent.Hash()
-	data := []byte("test data")
-
-	pkt := &Packet{
-		HeaderType:      HeaderType1,
-		PacketType:      PacketTypeData,
-		TransportType:   0,
-		Context:         ContextNone,
-		ContextFlag:     FlagUnset,
-		Hops:            0,
-		DestinationType: 0x00,
-		DestinationHash: destHash,
-		Data:            data,
-		CreateReceipt:   true,
-	}
-
-	if err := pkt.Pack(); err != nil {
-		t.Fatalf("Failed to pack packet: %v", err)
-	}
-
-	receipt := NewPacketReceipt(pkt)
-	receipt.SetDestinationIdentity(testIdent)
-
-	deliveryCalled := make(chan bool, 1)
-	receipt.SetDeliveryCallback(func(r *PacketReceipt) {
-		deliveryCalled <- true
-	})
-
-	packetHash := pkt.GetHash()
-	signature := testIdent.Sign(packetHash)
-
-	proof := make([]byte, 0, EXPL_LENGTH)
-	proof = append(proof, packetHash...)
-	proof = append(proof, signature...)
-
-	proofPacket := &Packet{
-		PacketType: PacketTypeProof,
-		Data:       proof,
-	}
-
-	receipt.ValidateProof(proof, proofPacket)
-
-	select {
-	case <-deliveryCalled:
-		// Success
-	case <-time.After(100 * time.Millisecond):
-		t.Error("Delivery callback was not called")
-	}
-}

pkg/pathfinder/pathfinder_test.go

@@ -1,134 +0,0 @@
-package pathfinder
-
-import (
-	"testing"
-	"time"
-)
-
-func TestNewPathFinder(t *testing.T) {
-	pf := NewPathFinder()
-	if pf == nil {
-		t.Fatal("NewPathFinder() returned nil")
-	}
-	if pf.paths == nil {
-		t.Error("NewPathFinder() paths map is nil")
-	}
-}
-
-func TestPathFinder_AddPath(t *testing.T) {
-	pf := NewPathFinder()
-
-	destHash := "test-dest-hash"
-	nextHop := []byte{0x01, 0x02, 0x03, 0x04}
-	iface := "eth0"
-	hops := byte(5)
-
-	pf.AddPath(destHash, nextHop, iface, hops)
-
-	path, exists := pf.GetPath(destHash)
-	if !exists {
-		t.Fatal("GetPath() returned false after AddPath()")
-	}
-
-	if string(path.NextHop) != string(nextHop) {
-		t.Errorf("NextHop = %v, want %v", path.NextHop, nextHop)
-	}
-	if path.Interface != iface {
-		t.Errorf("Interface = %s, want %s", path.Interface, iface)
-	}
-	if path.HopCount != hops {
-		t.Errorf("HopCount = %d, want %d", path.HopCount, hops)
-	}
-	if path.LastUpdated == 0 {
-		t.Error("LastUpdated should be set")
-	}
-}
-
-func TestPathFinder_GetPath(t *testing.T) {
-	pf := NewPathFinder()
-
-	destHash := "test-dest-hash"
-	_, exists := pf.GetPath(destHash)
-	if exists {
-		t.Error("GetPath() should return false for non-existent path")
-	}
-
-	nextHop := []byte{0x01, 0x02}
-	pf.AddPath(destHash, nextHop, "eth0", 3)
-
-	path, exists := pf.GetPath(destHash)
-	if !exists {
-		t.Fatal("GetPath() returned false for existing path")
-	}
-	if string(path.NextHop) != string(nextHop) {
-		t.Errorf("NextHop = %v, want %v", path.NextHop, nextHop)
-	}
-}
-
-func TestPathFinder_UpdatePath(t *testing.T) {
-	pf := NewPathFinder()
-
-	destHash := "test-dest-hash"
-	nextHop1 := []byte{0x01, 0x02}
-	nextHop2 := []byte{0x03, 0x04}
-
-	pf.AddPath(destHash, nextHop1, "eth0", 3)
-	time.Sleep(10 * time.Millisecond)
-	firstUpdate := time.Now().Unix()
-
-	pf.AddPath(destHash, nextHop2, "eth1", 5)
-
-	path, exists := pf.GetPath(destHash)
-	if !exists {
-		t.Fatal("GetPath() returned false")
-	}
-
-	if string(path.NextHop) != string(nextHop2) {
-		t.Errorf("NextHop = %v, want %v", path.NextHop, nextHop2)
-	}
-	if path.Interface != "eth1" {
-		t.Errorf("Interface = %s, want eth1", path.Interface)
-	}
-	if path.HopCount != 5 {
-		t.Errorf("HopCount = %d, want 5", path.HopCount)
-	}
-	if path.LastUpdated < firstUpdate {
-		t.Error("LastUpdated should be updated")
-	}
-}
-
-func TestPathFinder_MultiplePaths(t *testing.T) {
-	pf := NewPathFinder()
-
-	paths := []struct {
-		hash    string
-		nextHop []byte
-		iface   string
-		hops    byte
-	}{
-		{"hash1", []byte{0x01}, "eth0", 1},
-		{"hash2", []byte{0x02}, "eth1", 2},
-		{"hash3", []byte{0x03}, "eth2", 3},
-	}
-
-	for _, p := range paths {
-		pf.AddPath(p.hash, p.nextHop, p.iface, p.hops)
-	}
-
-	for _, p := range paths {
-		path, exists := pf.GetPath(p.hash)
-		if !exists {
-			t.Errorf("GetPath() returned false for %s", p.hash)
-			continue
-		}
-		if string(path.NextHop) != string(p.nextHop) {
-			t.Errorf("NextHop for %s = %v, want %v", p.hash, path.NextHop, p.nextHop)
-		}
-		if path.Interface != p.iface {
-			t.Errorf("Interface for %s = %s, want %s", p.hash, path.Interface, p.iface)
-		}
-		if path.HopCount != p.hops {
-			t.Errorf("HopCount for %s = %d, want %d", p.hash, path.HopCount, p.hops)
-		}
-	}
-}

pkg/rate/rate.go

@@ -3,8 +3,6 @@ package rate
 import (
 	"sync"
 	"time"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
 )
 
 const (
@@ -17,29 +15,22 @@ const (
 	DefaultBurstPenalty        = 300    // Default seconds penalty after burst
 	DefaultMaxHeldAnnounces    = 256    // Default max announces in hold queue
 	DefaultHeldReleaseInterval = 30     // Default seconds between releasing held announces
-
-	// Allowance thresholds
-	AllowanceMinThreshold = 1.0
-	AllowanceDecrement    = 1.0
-
-	// History check threshold
-	HistoryGraceThreshold = 1
 )
 
 type Limiter struct {
 	rate       float64
-	capacity   float64
+	interval   time.Duration
 	lastUpdate time.Time
 	allowance  float64
 	mutex      sync.Mutex
 }
 
-func NewLimiter(rate float64, capacity float64) *Limiter {
+func NewLimiter(rate float64, interval time.Duration) *Limiter {
 	return &Limiter{
 		rate:       rate,
-		capacity:   capacity,
+		interval:   interval,
 		lastUpdate: time.Now(),
-		allowance:  capacity,
+		allowance:  rate,
 	}
 }
 
@@ -52,15 +43,15 @@ func (l *Limiter) Allow() bool {
 	l.lastUpdate = now
 
 	l.allowance += elapsed.Seconds() * l.rate
-	if l.allowance > l.capacity {
+	if l.allowance > l.rate {
-		l.allowance = l.capacity
+		l.allowance = l.rate
 	}
 
-	if l.allowance < AllowanceMinThreshold {
+	if l.allowance < 1.0 {
 		return false
 	}
 
-	l.allowance -= AllowanceDecrement
+	l.allowance -= 1.0
 	return true
 }
 
@@ -109,7 +100,7 @@ func (arc *AnnounceRateControl) AllowAnnounce(destHash string) bool {
 	// Check rate
 	lastAnnounce := history[len(history)-1]
 	waitTime := arc.rateTarget
-	if len(history) > arc.rateGrace+HistoryGraceThreshold {
+	if len(history) > arc.rateGrace {
 		waitTime += arc.ratePenalty
 	}
 
@@ -164,7 +155,7 @@ func (ic *IngressControl) ProcessAnnounce(announceHash string, announceData []by
 
 	// Reset counter if enough time has passed
 	if elapsed > ic.burstHold+ic.burstPenalty {
-		ic.announceCount = common.ZERO
+		ic.announceCount = 0
 		ic.lastBurst = now
 	}
 
@@ -175,13 +166,7 @@ func (ic *IngressControl) ProcessAnnounce(announceHash string, announceData []by
 	}
 
 	ic.announceCount++
-
+	burstFreq := float64(ic.announceCount) / elapsed.Seconds()
-	// Avoid division by zero and handle very small elapsed times
-	seconds := elapsed.Seconds()
-	if seconds < 0.01 {
-		seconds = 0.01
-	}
-	burstFreq := float64(ic.announceCount) / seconds
 
 	// Hold announce if burst frequency exceeded
 	if burstFreq > maxFreq {

pkg/rate/rate_test.go

@@ -1,150 +0,0 @@
-package rate
-
-import (
-	"testing"
-	"time"
-)
-
-func TestNewLimiter(t *testing.T) {
-	limiter := NewLimiter(10.0, 1.0)
-	if limiter == nil {
-		t.Fatal("NewLimiter() returned nil")
-	}
-}
-
-func TestLimiter_Allow(t *testing.T) {
-	limiter := NewLimiter(10.0, 1.0)
-
-	if !limiter.Allow() {
-		t.Error("Allow() should return true initially")
-	}
-
-	for i := 0; i < 10; i++ {
-		limiter.Allow()
-	}
-
-	if limiter.Allow() {
-		t.Error("Allow() should return false after exceeding rate")
-	}
-
-	time.Sleep(1100 * time.Millisecond)
-
-	if !limiter.Allow() {
-		t.Error("Allow() should return true after waiting")
-	}
-}
-
-func TestNewAnnounceRateControl(t *testing.T) {
-	arc := NewAnnounceRateControl(3600.0, 3, 7200.0)
-	if arc == nil {
-		t.Fatal("NewAnnounceRateControl() returned nil")
-	}
-}
-
-func TestAnnounceRateControl_AllowAnnounce(t *testing.T) {
-	arc := NewAnnounceRateControl(1.0, 2, 2.0)
-
-	hash := "test-dest-hash"
-
-	if !arc.AllowAnnounce(hash) {
-		t.Error("AllowAnnounce() should return true for first announce")
-	}
-
-	if !arc.AllowAnnounce(hash) {
-		t.Error("AllowAnnounce() should return true for second announce (within grace)")
-	}
-
-	if arc.AllowAnnounce(hash) {
-		t.Error("AllowAnnounce() should return false for third announce (exceeds grace)")
-	}
-
-	time.Sleep(1100 * time.Millisecond)
-
-	if !arc.AllowAnnounce(hash) {
-		t.Error("AllowAnnounce() should return true after waiting")
-	}
-}
-
-func TestAnnounceRateControl_AllowAnnounce_DifferentHashes(t *testing.T) {
-	arc := NewAnnounceRateControl(1.0, 1, 1.0)
-
-	hash1 := "hash1"
-	hash2 := "hash2"
-
-	if !arc.AllowAnnounce(hash1) {
-		t.Error("AllowAnnounce() should return true for hash1")
-	}
-
-	if !arc.AllowAnnounce(hash2) {
-		t.Error("AllowAnnounce() should return true for hash2 (different hash)")
-	}
-}
-
-func TestNewIngressControl(t *testing.T) {
-	ic := NewIngressControl(true)
-	if ic == nil {
-		t.Fatal("NewIngressControl() returned nil")
-	}
-}
-
-func TestIngressControl_ProcessAnnounce(t *testing.T) {
-	ic := NewIngressControl(true)
-
-	hash := "test-hash"
-	data := []byte("announce data")
-
-	ic.mutex.Lock()
-	ic.lastBurst = time.Now().Add(-time.Second)
-	ic.mutex.Unlock()
-
-	if !ic.ProcessAnnounce(hash, data, false) {
-		t.Error("ProcessAnnounce() should return true for first announce")
-	}
-
-	time.Sleep(10 * time.Millisecond)
-
-	for i := 0; i < 200; i++ {
-		ic.ProcessAnnounce(hash, data, false)
-	}
-
-	result := ic.ProcessAnnounce(hash, data, false)
-	if result {
-		t.Error("ProcessAnnounce() should return false when burst frequency exceeded")
-	}
-}
-
-func TestIngressControl_ProcessAnnounce_Disabled(t *testing.T) {
-	ic := NewIngressControl(false)
-
-	hash := "test-hash"
-	data := []byte("announce data")
-
-	if !ic.ProcessAnnounce(hash, data, false) {
-		t.Error("ProcessAnnounce() should return true when disabled")
-	}
-}
-
-func TestIngressControl_ReleaseHeldAnnounce(t *testing.T) {
-	ic := NewIngressControl(true)
-
-	hash, data, found := ic.ReleaseHeldAnnounce()
-	if found {
-		t.Error("ReleaseHeldAnnounce() should return false when no announces held")
-	}
-
-	ic.ProcessAnnounce("hash1", []byte("data1"), false)
-	for i := 0; i < 200; i++ {
-		ic.ProcessAnnounce("hash1", []byte("data1"), false)
-	}
-
-	hash, data, found = ic.ReleaseHeldAnnounce()
-	if !found {
-		t.Error("ReleaseHeldAnnounce() should return true when announces are held")
-	}
-	if hash == "" {
-		t.Error("ReleaseHeldAnnounce() should return non-empty hash")
-	}
-	if len(data) == 0 {
-		t.Error("ReleaseHeldAnnounce() should return non-empty data")
-	}
-}

pkg/resolver/resolver.go

@@ -7,18 +7,7 @@ import (
 	"strings"
 	"sync"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/identity"
-)
-
-const (
-	// Hash length conversion (bits to bytes)
-	BitsPerByte = 8
-
-	// Known destination data index
-	KnownDestIdentityIndex = 2
-
-	// Minimum name parts for hierarchical resolution
-	MinNameParts = 2
 )
 
 type Resolver struct {
@@ -47,12 +36,12 @@ func (r *Resolver) ResolveIdentity(fullName string) (*identity.Identity, error)
 	// Hash the full name to create a deterministic identity
 	h := sha256.New()
 	h.Write([]byte(fullName))
-	nameHash := h.Sum(nil)[:identity.NAME_HASH_LENGTH/BitsPerByte]
+	nameHash := h.Sum(nil)[:identity.NAME_HASH_LENGTH/8]
 	hashStr := hex.EncodeToString(nameHash)
 
 	// Check if this identity is known
 	if knownData, exists := identity.GetKnownDestination(hashStr); exists {
-		if id, ok := knownData[KnownDestIdentityIndex].(*identity.Identity); ok {
+		if id, ok := knownData[2].(*identity.Identity); ok {
 			r.cacheLock.Lock()
 			r.cache[fullName] = id
 			r.cacheLock.Unlock()
@@ -62,7 +51,7 @@ func (r *Resolver) ResolveIdentity(fullName string) (*identity.Identity, error)
 
 	// Split name into parts for hierarchical resolution
 	parts := strings.Split(fullName, ".")
-	if len(parts) < MinNameParts {
+	if len(parts) < 2 {
 		return nil, errors.New("invalid identity name format")
 	}
 

pkg/resolver/resolver_test.go

@@ -1,118 +0,0 @@
-package resolver
-
-import (
-	"testing"
-)
-
-func TestNew(t *testing.T) {
-	r := New()
-	if r == nil {
-		t.Fatal("New() returned nil")
-	}
-	if r.cache == nil {
-		t.Error("New() cache map is nil")
-	}
-}
-
-func TestResolver_ResolveIdentity(t *testing.T) {
-	r := New()
-
-	tests := []struct {
-		name      string
-		fullName  string
-		wantError bool
-	}{
-		{
-			name:      "ValidName",
-			fullName:  "app.aspect",
-			wantError: false,
-		},
-		{
-			name:      "EmptyName",
-			fullName:  "",
-			wantError: true,
-		},
-		{
-			name:      "InvalidFormat",
-			fullName:  "app",
-			wantError: true,
-		},
-		{
-			name:      "MultiPartName",
-			fullName:  "app.aspect1.aspect2",
-			wantError: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			id, err := r.ResolveIdentity(tt.fullName)
-			if (err != nil) != tt.wantError {
-				t.Errorf("ResolveIdentity() error = %v, wantError %v", err, tt.wantError)
-				return
-			}
-			if !tt.wantError && id == nil {
-				t.Error("ResolveIdentity() returned nil identity for valid name")
-			}
-		})
-	}
-}
-
-func TestResolver_ResolveIdentity_Caching(t *testing.T) {
-	r := New()
-
-	fullName := "app.aspect"
-	id1, err := r.ResolveIdentity(fullName)
-	if err != nil {
-		t.Fatalf("ResolveIdentity() error = %v", err)
-	}
-
-	id2, err := r.ResolveIdentity(fullName)
-	if err != nil {
-		t.Fatalf("ResolveIdentity() error = %v", err)
-	}
-
-	if id1 == nil || id2 == nil {
-		t.Fatal("ResolveIdentity() returned nil")
-	}
-
-	if id1.GetPublicKey() == nil || id2.GetPublicKey() == nil {
-		t.Fatal("Identity public key is nil")
-	}
-
-	if string(id1.GetPublicKey()) != string(id2.GetPublicKey()) {
-		t.Error("ResolveIdentity() should return cached identity")
-	}
-}
-
-func TestResolveIdentity(t *testing.T) {
-	id, err := ResolveIdentity("app.aspect")
-	if err != nil {
-		t.Fatalf("ResolveIdentity() error = %v", err)
-	}
-	if id == nil {
-		t.Error("ResolveIdentity() returned nil")
-	}
-}
-
-func TestResolver_ResolveIdentity_Concurrent(t *testing.T) {
-	r := New()
-
-	done := make(chan bool, 10)
-	for i := 0; i < 10; i++ {
-		go func() {
-			id, err := r.ResolveIdentity("app.aspect")
-			if err != nil {
-				t.Errorf("ResolveIdentity() error = %v", err)
-			}
-			if id == nil {
-				t.Error("ResolveIdentity() returned nil")
-			}
-			done <- true
-		}()
-	}
-
-	for i := 0; i < 10; i++ {
-		<-done
-	}
-}

pkg/resource/advertisement.go

@@ -1,253 +0,0 @@
-package resource
-
-import (
-	"fmt"
-	"math"
-
-	"github.com/vmihailenco/msgpack/v5"
-)
-
-const (
-	OVERHEAD             = 134
-	COLLISION_GUARD_SIZE = 2*WINDOW_MAX + 100
-)
-
-type ResourceAdvertisement struct {
-	TransferSize  int64
-	DataSize      int64
-	Parts         int
-	Hash          []byte
-	RandomHash    []byte
-	OriginalHash  []byte
-	Hashmap       []byte
-	Compressed    bool
-	Encrypted     bool
-	Split         bool
-	HasMetadata   bool
-	SegmentIndex  uint16
-	TotalSegments uint16
-	RequestID     []byte
-	IsRequest     bool
-	IsResponse    bool
-	Flags         byte
-}
-
-func NewResourceAdvertisement(res *Resource) *ResourceAdvertisement {
-	if res == nil {
-		return nil
-	}
-
-	flags := byte(0x00)
-	if res.HasMetadata() {
-		flags |= 0x20
-	}
-	if res.IsResponse() {
-		flags |= 0x10
-	}
-	if res.IsRequest() {
-		flags |= 0x08
-	}
-
-	res.mutex.RLock()
-	split := res.split
-	compressed := res.compressed
-	encrypted := res.encrypted
-	randomHash := res.randomHash
-	originalHash := res.originalHash
-	segmentIndex := res.segmentIndex
-	totalSegments := res.totalSegments
-	res.mutex.RUnlock()
-
-	if split {
-		flags |= 0x04
-	}
-	if compressed {
-		flags |= 0x02
-	}
-	if encrypted {
-		flags |= 0x01
-	}
-
-	hashmap := res.getHashmap()
-
-	return &ResourceAdvertisement{
-		TransferSize:  res.GetTransferSize(),
-		DataSize:      res.GetDataSize(),
-		Parts:         int(res.GetSegments()),
-		Hash:          res.GetHash(),
-		RandomHash:    randomHash,
-		OriginalHash:  originalHash,
-		Hashmap:       hashmap,
-		Compressed:    compressed,
-		Encrypted:     encrypted,
-		Split:         split,
-		HasMetadata:   res.HasMetadata(),
-		SegmentIndex:  segmentIndex,
-		TotalSegments: totalSegments,
-		RequestID:     res.GetRequestID(),
-		IsRequest:     res.IsRequest(),
-		IsResponse:    res.IsResponse(),
-		Flags:         flags,
-	}
-}
-
-func (ra *ResourceAdvertisement) Pack(segment int) ([]byte, error) {
-	hashmapMaxLen := getHashmapMaxLen()
-	hashmapStart := segment * hashmapMaxLen
-	hashmapEnd := hashmapStart + hashmapMaxLen
-	if hashmapEnd > len(ra.Hashmap)/MAPHASH_LEN {
-		hashmapEnd = len(ra.Hashmap) / MAPHASH_LEN
-	}
-
-	hashmap := ra.Hashmap[hashmapStart*MAPHASH_LEN : hashmapEnd*MAPHASH_LEN]
-
-	dict := map[string]interface{}{
-		"t": ra.TransferSize,
-		"d": ra.DataSize,
-		"n": ra.Parts,
-		"h": ra.Hash,
-		"r": ra.RandomHash,
-		"o": ra.OriginalHash,
-		"i": ra.SegmentIndex,
-		"l": ra.TotalSegments,
-		"q": ra.RequestID,
-		"f": ra.Flags,
-		"m": hashmap,
-	}
-
-	return msgpack.Marshal(dict)
-}
-
-func UnpackResourceAdvertisement(data []byte) (*ResourceAdvertisement, error) {
-	var dict map[string]interface{}
-	if err := msgpack.Unmarshal(data, &dict); err != nil {
-		return nil, fmt.Errorf("failed to unpack advertisement: %w", err)
-	}
-
-	ra := &ResourceAdvertisement{}
-
-	if t, ok := dict["t"].(int64); ok {
-		ra.TransferSize = t
-	} else if t, ok := dict["t"].(uint64); ok {
-		if t > uint64(math.MaxInt64) {
-			return nil, fmt.Errorf("transfer size overflow")
-		}
-		ra.TransferSize = int64(t) // #nosec G115 - checked for overflow
-	}
-
-	if d, ok := dict["d"].(int64); ok {
-		ra.DataSize = d
-	} else if d, ok := dict["d"].(uint64); ok {
-		if d > uint64(math.MaxInt64) {
-			return nil, fmt.Errorf("data size overflow")
-		}
-		ra.DataSize = int64(d) // #nosec G115 - checked for overflow
-	}
-
-	if n, ok := dict["n"].(int); ok {
-		ra.Parts = n
-	} else if n, ok := dict["n"].(uint64); ok {
-		if n > uint64(math.MaxInt32) {
-			return nil, fmt.Errorf("parts count overflow")
-		}
-		ra.Parts = int(n) // #nosec G115 - checked for overflow
-	}
-
-	if h, ok := dict["h"].([]byte); ok {
-		ra.Hash = h
-	}
-
-	if r, ok := dict["r"].([]byte); ok {
-		ra.RandomHash = r
-	}
-
-	if o, ok := dict["o"].([]byte); ok {
-		ra.OriginalHash = o
-	}
-
-	if m, ok := dict["m"].([]byte); ok {
-		ra.Hashmap = m
-	}
-
-	if f, ok := dict["f"].(byte); ok {
-		ra.Flags = f
-	} else if f, ok := dict["f"].(uint64); ok {
-		ra.Flags = byte(f)
-	}
-
-	ra.Encrypted = (ra.Flags & 0x01) == 0x01
-	ra.Compressed = ((ra.Flags >> 1) & 0x01) == 0x01
-	ra.Split = ((ra.Flags >> 2) & 0x01) == 0x01
-	ra.IsRequest = ((ra.Flags >> 3) & 0x01) == 0x01
-	ra.IsResponse = ((ra.Flags >> 4) & 0x01) == 0x01
-	ra.HasMetadata = ((ra.Flags >> 5) & 0x01) == 0x01
-
-	if i, ok := dict["i"].(uint16); ok {
-		ra.SegmentIndex = i
-	} else if i, ok := dict["i"].(uint64); ok {
-		if i > uint64(math.MaxUint16) {
-			return nil, fmt.Errorf("segment index overflow")
-		}
-		ra.SegmentIndex = uint16(i) // #nosec G115 - checked for overflow
-	}
-
-	if l, ok := dict["l"].(uint16); ok {
-		ra.TotalSegments = l
-	} else if l, ok := dict["l"].(uint64); ok {
-		if l > uint64(math.MaxUint16) {
-			return nil, fmt.Errorf("total segments overflow")
-		}
-		ra.TotalSegments = uint16(l) // #nosec G115 - checked for overflow
-	}
-
-	if q, ok := dict["q"].([]byte); ok {
-		ra.RequestID = q
-	}
-
-	return ra, nil
-}
-
-func getHashmapMaxLen() int {
-	mdu := 384
-	return (mdu - OVERHEAD) / MAPHASH_LEN
-}
-
-func IsRequestAdvertisement(data []byte) bool {
-	adv, err := UnpackResourceAdvertisement(data)
-	if err != nil {
-		return false
-	}
-	return adv.IsRequest && adv.RequestID != nil
-}
-
-func IsResponseAdvertisement(data []byte) bool {
-	adv, err := UnpackResourceAdvertisement(data)
-	if err != nil {
-		return false
-	}
-	return adv.IsResponse && adv.RequestID != nil
-}
-
-func ReadRequestID(data []byte) []byte {
-	adv, err := UnpackResourceAdvertisement(data)
-	if err != nil {
-		return nil
-	}
-	return adv.RequestID
-}
-
-func ReadTransferSize(data []byte) int64 {
-	adv, err := UnpackResourceAdvertisement(data)
-	if err != nil {
-		return 0
-	}
-	return adv.TransferSize
-}
-
-func ReadSize(data []byte) int64 {
-	adv, err := UnpackResourceAdvertisement(data)
-	if err != nil {
-		return 0
-	}
-	return adv.DataSize
-}

pkg/resource/resource.go

@@ -58,7 +58,6 @@ const (
 	PROCESSING_GRACE              = 1.0
 	RETRY_GRACE_TIME              = 0.25
 	PER_RETRY_DELAY               = 0.5
-	RESPONSE_MAX_GRACE_TIME       = 10.0
 )
 
 type Resource struct {
@@ -93,10 +92,6 @@ type Resource struct {
 	callback           func(*Resource)
 	progressCallback   func(*Resource)
 	readOffset         int64
-	requestID          []byte
-	isResponse         bool
-	hashmap            []byte
-	parts              [][]byte
 }
 
 func New(data interface{}, autoCompress bool) (*Resource, error) {
@@ -224,6 +219,12 @@ func (r *Resource) GetSegments() uint16 {
 	return r.segments
 }
 
+func (r *Resource) IsCompressed() bool {
+	r.mutex.RLock()
+	defer r.mutex.RUnlock()
+	return r.compressed
+}
+
 func (r *Resource) Cancel() {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
@@ -420,97 +421,3 @@ func (r *Resource) GetSize() int64 {
 	defer r.mutex.RUnlock()
 	return r.dataSize
 }
-
-func (r *Resource) HasMetadata() bool {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	return false
-}
-
-func (r *Resource) IsRequest() bool {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	return r.requestID != nil && !r.isResponse
-}
-
-func (r *Resource) IsResponse() bool {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	return r.isResponse
-}
-
-func (r *Resource) GetRequestID() []byte {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	if r.requestID == nil {
-		return nil
-	}
-	return append([]byte{}, r.requestID...)
-}
-
-func (r *Resource) SetRequestID(id []byte) {
-	r.mutex.Lock()
-	defer r.mutex.Unlock()
-	if id == nil {
-		r.requestID = nil
-		return
-	}
-	r.requestID = append([]byte{}, id...)
-}
-
-func (r *Resource) SetIsResponse(isResponse bool) {
-	r.mutex.Lock()
-	defer r.mutex.Unlock()
-	r.isResponse = isResponse
-}
-
-func (r *Resource) getHashmap() []byte {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	if r.hashmap == nil {
-		return nil
-	}
-	return append([]byte{}, r.hashmap...)
-}
-
-func (r *Resource) GetRandomHash() []byte {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	if r.randomHash == nil {
-		return nil
-	}
-	return append([]byte{}, r.randomHash...)
-}
-
-func (r *Resource) GetOriginalHash() []byte {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	if r.originalHash == nil {
-		return nil
-	}
-	return append([]byte{}, r.originalHash...)
-}
-
-func (r *Resource) GetSegmentIndex() uint16 {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	return r.segmentIndex
-}
-
-func (r *Resource) GetTotalSegments() uint16 {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	return r.totalSegments
-}
-
-func (r *Resource) IsEncrypted() bool {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	return r.encrypted
-}
-
-func (r *Resource) IsSplit() bool {
-	r.mutex.RLock()
-	defer r.mutex.RUnlock()
-	return r.split
-}

pkg/resource/resource_test.go

@@ -1,153 +0,0 @@
-package resource
-
-import (
-	"bytes"
-	"io"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestNewResourceFromBytes(t *testing.T) {
-	data := []byte("hello world")
-	r, err := New(data, false)
-	if err != nil {
-		t.Fatalf("New failed: %v", err)
-	}
-	if r.GetDataSize() != int64(len(data)) {
-		t.Errorf("Expected size %d, got %d", len(data), r.GetDataSize())
-	}
-	if r.GetSegments() != 1 {
-		t.Errorf("Expected 1 segment, got %d", r.GetSegments())
-	}
-}
-
-func TestNewResourceFromFile(t *testing.T) {
-	tmpDir := t.TempDir()
-	tmpFile := filepath.Join(tmpDir, "test.txt")
-	data := []byte("file data")
-	err := os.WriteFile(tmpFile, data, 0644)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	f, err := os.OpenFile(tmpFile, os.O_RDWR, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-
-	r, err := New(f, false)
-	if err != nil {
-		t.Fatalf("New failed: %v", err)
-	}
-	if r.GetDataSize() != int64(len(data)) {
-		t.Errorf("Expected size %d, got %d", len(data), r.GetDataSize())
-	}
-}
-
-func TestGetSegmentData(t *testing.T) {
-	data := make([]byte, DEFAULT_SEGMENT_SIZE+100)
-	for i := range data {
-		data[i] = byte(i % 256)
-	}
-
-	r, _ := New(data, false)
-	if r.GetSegments() != 2 {
-		t.Fatalf("Expected 2 segments, got %d", r.GetSegments())
-	}
-
-	seg0, err := r.GetSegmentData(0)
-	if err != nil {
-		t.Fatalf("GetSegmentData(0) failed: %v", err)
-	}
-	if !bytes.Equal(seg0, data[:DEFAULT_SEGMENT_SIZE]) {
-		t.Error("Segment 0 data mismatch")
-	}
-
-	seg1, err := r.GetSegmentData(1)
-	if err != nil {
-		t.Fatalf("GetSegmentData(1) failed: %v", err)
-	}
-	if !bytes.Equal(seg1, data[DEFAULT_SEGMENT_SIZE:]) {
-		t.Error("Segment 1 data mismatch")
-	}
-}
-
-func TestMarkSegmentComplete(t *testing.T) {
-	data := make([]byte, DEFAULT_SEGMENT_SIZE*2)
-	r, _ := New(data, false)
-
-	callbackCalled := false
-	r.SetCallback(func(res *Resource) {
-		callbackCalled = true
-	})
-
-	r.MarkSegmentComplete(0)
-	if r.GetProgress() != 0.5 {
-		t.Errorf("Expected progress 0.5, got %f", r.GetProgress())
-	}
-	if r.GetStatus() != STATUS_PENDING && r.GetStatus() != STATUS_ACTIVE {
-		t.Errorf("Wrong status: %v", r.GetStatus())
-	}
-
-	r.MarkSegmentComplete(1)
-	if r.GetProgress() != 1.0 {
-		t.Errorf("Expected progress 1.0, got %f", r.GetProgress())
-	}
-	if r.GetStatus() != STATUS_COMPLETE {
-		t.Errorf("Expected status COMPLETE, got %v", r.GetStatus())
-	}
-	if !callbackCalled {
-		t.Error("Callback was not called")
-	}
-}
-
-func TestRead(t *testing.T) {
-	data := []byte("hello world")
-	r, _ := New(data, false)
-
-	buf := make([]byte, 5)
-	n, err := r.Read(buf)
-	if err != nil {
-		t.Fatalf("Read failed: %v", err)
-	}
-	if n != 5 || !bytes.Equal(buf, []byte("hello")) {
-		t.Errorf("Read wrong data: %q", buf)
-	}
-
-	buf = make([]byte, 10)
-	n, err = r.Read(buf)
-	if err != nil {
-		t.Fatalf("Read failed: %v", err)
-	}
-	if n != 6 || !bytes.Equal(buf[:n], []byte(" world")) {
-		t.Errorf("Read wrong data: %q", buf[:n])
-	}
-
-	n, err = r.Read(buf)
-	if err != io.EOF {
-		t.Errorf("Expected EOF, got %v", err)
-	}
-}
-
-func TestCancelActivateFailed(t *testing.T) {
-	data := []byte("test")
-	r, _ := New(data, false)
-
-	r.Activate()
-	if r.GetStatus() != STATUS_ACTIVE {
-		t.Errorf("Expected ACTIVE, got %v", r.GetStatus())
-	}
-
-	r.SetFailed()
-	if r.GetStatus() != STATUS_FAILED {
-		t.Errorf("Expected FAILED, got %v", r.GetStatus())
-	}
-
-	r2, _ := New(data, false)
-	r2.Cancel()
-	if r2.GetStatus() != STATUS_CANCELLED {
-		t.Errorf("Expected CANCELLED, got %v", r2.GetStatus())
-	}
-}

pkg/transport/announce.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/rate"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/rate"
 )
 
 const (
@@ -39,7 +39,7 @@ func NewAnnounceManager() *AnnounceManager {
 	return &AnnounceManager{
 		announces:     make(map[string]*AnnounceEntry),
 		announceQueue: make(map[string][]*AnnounceEntry),
-		rateLimiter:   rate.NewLimiter(rate.DefaultBurstFreq, 10.0),
+		rateLimiter:   rate.NewLimiter(DefaultPropagationRate, 1),
 		mutex:         sync.RWMutex{},
 	}
 }

pkg/transport/transport_test.go

@@ -1,120 +1,88 @@
 package transport
 
 import (
-	"bytes"
+	"crypto/rand"
 	"testing"
 
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
+	"github.com/Sudo-Ivan/reticulum-go/pkg/common"
 )
 
-type mockInterface struct {
+func randomBytes(n int) []byte {
-	common.BaseInterface
+	b := make([]byte, n)
-	sent [][]byte
+	_, err := rand.Read(b)
-}
-
-func (m *mockInterface) Send(data []byte, address string) error {
-	m.sent = append(m.sent, data)
-	return nil
-}
-
-func (m *mockInterface) GetName() string {
-	return m.Name
-}
-
-func (m *mockInterface) IsEnabled() bool {
-	return m.Enabled
-}
-
-func TestNewTransport(t *testing.T) {
-	config := &common.ReticulumConfig{}
-	tr := NewTransport(config)
-	if tr == nil {
-		t.Fatal("NewTransport returned nil")
-	}
-	defer tr.Close()
-}
-
-func TestRegisterInterface(t *testing.T) {
-	tr := NewTransport(&common.ReticulumConfig{})
-	defer tr.Close()
-
-	iface := &mockInterface{}
-	iface.Name = "test"
-	err := tr.RegisterInterface("test", iface)
 	if err != nil {
-		t.Fatalf("RegisterInterface failed: %v", err)
+		panic("Failed to generate random bytes: " + err.Error())
+	}
+	return b
+}
+
+// BenchmarkTransportDestinationCreation benchmarks destination creation
+func BenchmarkTransportDestinationCreation(b *testing.B) {
+	// Create a basic config for transport
+	config := &common.ReticulumConfig{
+		ConfigPath: "/tmp/test_config",
 	}
 
-	retrieved, err := tr.GetInterface("test")
+	transport := NewTransport(config)
-	if err != nil {
+
-		t.Fatalf("GetInterface failed: %v", err)
+	b.ResetTimer()
-	}
+	b.ReportAllocs()
-	if retrieved != iface {
+
-		t.Error("Retrieved interface doesn't match")
+	for i := 0; i < b.N; i++ {
+		// Create destination (this allocates and initializes destination objects)
+		dest := transport.NewDestination(nil, OUT, SINGLE, "test_app")
+		_ = dest // Use the destination to avoid optimization
 	}
 }
 
-func TestPathManagement(t *testing.T) {
+// BenchmarkTransportPathLookup benchmarks path lookup operations
-	tr := NewTransport(&common.ReticulumConfig{})
+func BenchmarkTransportPathLookup(b *testing.B) {
-	defer tr.Close()
+	// Create a basic config for transport
-
+	config := &common.ReticulumConfig{
-	destHash := []byte("test-destination-hash")
+		ConfigPath: "/tmp/test_config",
-	nextHop := []byte("next-hop")
-	iface := &mockInterface{}
-	iface.Name = "iface1"
-	_ = tr.RegisterInterface("iface1", iface)
-
-	tr.UpdatePath(destHash, nextHop, "iface1", 2)
-
-	if !tr.HasPath(destHash) {
-		t.Error("Path not found after update")
 	}
 
-	if tr.HopsTo(destHash) != 2 {
+	transport := NewTransport(config)
-		t.Errorf("Expected 2 hops, got %d", tr.HopsTo(destHash))
-	}
 
-	if !bytes.Equal(tr.NextHop(destHash), nextHop) {
+	// Pre-populate with some destinations
-		t.Error("Next hop mismatch")
+	destHash1 := randomBytes(16)
-	}
+	destHash2 := randomBytes(16)
+	destHash3 := randomBytes(16)
 
-	if tr.NextHopInterface(destHash) != "iface1" {
+	// Create some destinations
-		t.Errorf("Expected iface1, got %s", tr.NextHopInterface(destHash))
+	transport.NewDestination(nil, OUT, SINGLE, "test_app")
+	transport.NewDestination(nil, OUT, SINGLE, "test_app")
+	transport.NewDestination(nil, OUT, SINGLE, "test_app")
+
+	b.ResetTimer()
+	b.ReportAllocs()
+
+	for i := 0; i < b.N; i++ {
+		// Test path lookup operations (these involve map lookups and allocations)
+		_ = transport.HasPath(destHash1)
+		_ = transport.HasPath(destHash2)
+		_ = transport.HasPath(destHash3)
 	}
 }
 
-func TestDestinationRegistration(t *testing.T) {
+// BenchmarkTransportHopsCalculation benchmarks hops calculation
-	tr := NewTransport(&common.ReticulumConfig{})
+func BenchmarkTransportHopsCalculation(b *testing.B) {
-	defer tr.Close()
+	// Create a basic config for transport
+	config := &common.ReticulumConfig{
+		ConfigPath: "/tmp/test_config",
+	}
 
-	destHash := []byte("dest")
+	transport := NewTransport(config)
-	tr.RegisterDestination(destHash, "test-dest")
 
-	tr.mutex.RLock()
+	// Create some destinations
-	dest, ok := tr.destinations[string(destHash)]
+	destHash := randomBytes(16)
-	tr.mutex.RUnlock()
+	transport.NewDestination(nil, OUT, SINGLE, "test_app")
 
-	if !ok || dest != "test-dest" {
+	b.ResetTimer()
-		t.Error("Destination not registered correctly")
+	b.ReportAllocs()
-	}
+
-}
+	for i := 0; i < b.N; i++ {
-
+		// Test hops calculation (involves internal data structure access)
-func TestTransportStatus(t *testing.T) {
+		_ = transport.HopsTo(destHash)
-	tr := NewTransport(&common.ReticulumConfig{})
-	defer tr.Close()
-
-	destHash := []byte("dest")
-	if tr.PathIsUnresponsive(destHash) {
-		t.Error("Path should not be unresponsive initially")
-	}
-
-	tr.MarkPathUnresponsive(destHash)
-	if !tr.PathIsUnresponsive(destHash) {
-		t.Error("Path should be unresponsive")
-	}
-
-	tr.MarkPathResponsive(destHash)
-	if tr.PathIsUnresponsive(destHash) {
-		t.Error("Path should be responsive again")
 	}
 }

pkg/wasm/wasm.go

@@ -1,380 +0,0 @@
-//go:build js && wasm
-// +build js,wasm
-
-package wasm
-
-import (
-	"encoding/hex"
-	"fmt"
-	"syscall/js"
-
-	"git.quad4.io/Networks/Reticulum-Go/pkg/common"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/debug"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/destination"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/identity"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/interfaces"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/packet"
-	"git.quad4.io/Networks/Reticulum-Go/pkg/transport"
-)
-
-var (
-	reticulumTransport *transport.Transport
-	reticulumDest      *destination.Destination
-	reticulumIdentity  *identity.Identity
-	userName           string
-	peerMap            = make(map[string]string)
-	stats              = struct {
-		packetsSent     int
-		packetsReceived int
-		bytesSent       int
-		bytesReceived   int
-	}{}
-)
-
-// RegisterJSFunctions registers the Reticulum WASM API to the JavaScript global scope.
-func RegisterJSFunctions() {
-	js.Global().Set("reticulum", js.ValueOf(map[string]interface{}{
-		"init":           js.FuncOf(InitReticulum),
-		"getIdentity":    js.FuncOf(GetIdentity),
-		"getDestination": js.FuncOf(GetDestination),
-		"announce":       js.FuncOf(SendAnnounce),
-		"connect":        js.FuncOf(ConnectWebSocket),
-		"disconnect":     js.FuncOf(DisconnectWebSocket),
-		"isConnected":    js.FuncOf(IsConnected),
-		"sendMessage":    js.FuncOf(SendMessage),
-		"getStats":       js.FuncOf(GetStats),
-	}))
-}
-
-func GetStats(this js.Value, args []js.Value) interface{} {
-	return js.ValueOf(map[string]interface{}{
-		"packetsSent":     stats.packetsSent,
-		"packetsReceived": stats.packetsReceived,
-		"bytesSent":       stats.bytesSent,
-		"bytesReceived":   stats.bytesReceived,
-	})
-}
-
-func InitReticulum(this js.Value, args []js.Value) interface{} {
-	if len(args) < 1 {
-		return js.ValueOf(map[string]interface{}{
-			"error": "WebSocket URL required",
-		})
-	}
-
-	if reticulumTransport != nil {
-		reticulumTransport.Close()
-		reticulumTransport = nil
-	}
-
-	wsURL := args[0].String()
-	if len(args) >= 2 {
-		userName = args[1].String()
-	}
-
-	var id *identity.Identity
-	var err error
-
-	// Check for existing identity in args
-	if len(args) >= 3 && !args[2].IsNull() && !args[2].IsUndefined() {
-		idHex := args[2].String()
-		idBytes, decodeErr := hex.DecodeString(idHex)
-		if decodeErr == nil && len(idBytes) == 64 {
-			id, err = identity.FromBytes(idBytes)
-			if err != nil {
-				debug.Log(debug.DEBUG_ERROR, "Failed to load provided identity, generating new one", "error", err)
-				id, err = identity.NewIdentity()
-			}
-		} else {
-			id, err = identity.NewIdentity()
-		}
-	} else {
-		id, err = identity.NewIdentity()
-	}
-
-	if err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Failed to handle identity: %v", err),
-		})
-	}
-
-	cfg := common.DefaultConfig()
-	t := transport.NewTransport(cfg)
-
-	dest, err := destination.New(
-		id,
-		destination.IN,
-		destination.SINGLE,
-		"wasm_core",
-		t,
-		"browser",
-	)
-	if err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Failed to create destination: %v", err),
-		})
-	}
-
-	dest.SetPacketCallback(func(data []byte, ni common.NetworkInterface) {
-		stats.packetsReceived++
-		stats.bytesReceived += len(data)
-		
-		js.Global().Call("onChatMessage", js.ValueOf(map[string]interface{}{
-			"text": string(data),
-			"from": "",
-		}))
-	})
-
-	dest.SetProofStrategy(destination.PROVE_ALL)
-
-	t.RegisterAnnounceHandler(&announceHandler{})
-
-	wsInterface, err := interfaces.NewWebSocketInterface("wasm0", wsURL, true)
-	if err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Failed to create WebSocket interface: %v", err),
-		})
-	}
-
-	wsInterface.SetPacketCallback(func(data []byte, ni common.NetworkInterface) {
-		msg := fmt.Sprintf("Received packet: %d bytes (type: 0x%02x)", len(data), data[0])
-		js.Global().Call("log", msg, "success")
-		debug.Log(debug.DEBUG_INFO, "WASM received packet", "bytes", len(data), "type", fmt.Sprintf("0x%02x", data[0]))
-		t.HandlePacket(data, ni)
-	})
-
-	if err := t.RegisterInterface("wasm0", wsInterface); err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Failed to register interface: %v", err),
-		})
-	}
-
-	if err := t.Start(); err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Failed to start transport: %v", err),
-		})
-	}
-
-	reticulumTransport = t
-	reticulumDest = dest
-	reticulumIdentity = id
-
-	return js.ValueOf(map[string]interface{}{
-		"success":     true,
-		"identity":    id.GetHexHash(),
-		"privateKey":  hex.EncodeToString(id.GetPrivateKey()),
-		"destination": fmt.Sprintf("%x", dest.GetHash()),
-	})
-}
-
-func GetIdentity(this js.Value, args []js.Value) interface{} {
-	if reticulumIdentity == nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": "Reticulum not initialized",
-		})
-	}
-
-	return js.ValueOf(map[string]interface{}{
-		"hash": reticulumIdentity.GetHexHash(),
-	})
-}
-
-func GetDestination(this js.Value, args []js.Value) interface{} {
-	if reticulumDest == nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": "Reticulum not initialized",
-		})
-	}
-
-	return js.ValueOf(map[string]interface{}{
-		"hash": fmt.Sprintf("%x", reticulumDest.GetHash()),
-	})
-}
-
-func SendAnnounce(this js.Value, args []js.Value) interface{} {
-	if reticulumDest == nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": "Reticulum not initialized",
-		})
-	}
-
-	var appData []byte
-	if len(args) >= 1 && args[0].String() != "" {
-		appData = []byte(args[0].String())
-		userName = args[0].String()
-	} else if userName != "" {
-		appData = []byte(userName)
-	}
-
-	if err := reticulumDest.Announce(false, appData, nil); err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Failed to send announce: %v", err),
-		})
-	}
-
-	return js.ValueOf(map[string]interface{}{
-		"success": true,
-	})
-}
-
-func ConnectWebSocket(this js.Value, args []js.Value) interface{} {
-	if reticulumTransport == nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": "Reticulum not initialized",
-		})
-	}
-
-	ifaces := reticulumTransport.GetInterfaces()
-	for name, iface := range ifaces {
-		if iface.IsOnline() {
-			return js.ValueOf(map[string]interface{}{
-				"success": true,
-				"interface": name,
-			})
-		}
-		if err := iface.Start(); err != nil {
-			return js.ValueOf(map[string]interface{}{
-				"error": fmt.Sprintf("Failed to connect: %v", err),
-			})
-		}
-		return js.ValueOf(map[string]interface{}{
-			"success": true,
-			"interface": name,
-		})
-	}
-
-	return js.ValueOf(map[string]interface{}{
-		"error": "WebSocket interface not found",
-	})
-}
-
-func DisconnectWebSocket(this js.Value, args []js.Value) interface{} {
-	if reticulumTransport == nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": "Reticulum not initialized",
-		})
-	}
-
-	ifaces := reticulumTransport.GetInterfaces()
-	for _, iface := range ifaces {
-		if err := iface.Stop(); err != nil {
-			return js.ValueOf(map[string]interface{}{
-				"error": fmt.Sprintf("Failed to stop interface: %v", err),
-			})
-		}
-		return js.ValueOf(map[string]interface{}{
-			"success": true,
-		})
-	}
-
-	return js.ValueOf(map[string]interface{}{
-		"error": "WebSocket interface not found",
-	})
-}
-
-func IsConnected(this js.Value, args []js.Value) interface{} {
-	if reticulumTransport == nil {
-		return js.ValueOf(false)
-	}
-
-	ifaces := reticulumTransport.GetInterfaces()
-	for _, iface := range ifaces {
-		if iface.IsOnline() {
-			return js.ValueOf(true)
-		}
-	}
-
-	return js.ValueOf(false)
-}
-
-type announceHandler struct{}
-
-func (h *announceHandler) AspectFilter() []string {
-	return nil
-}
-
-func (h *announceHandler) ReceivePathResponses() bool {
-	return false
-}
-
-func (h *announceHandler) ReceivedAnnounce(destHash []byte, ident interface{}, appData []byte) error {
-	hashStr := hex.EncodeToString(destHash)
-	peerMap[hashStr] = string(appData)
-	js.Global().Call("onPeerDiscovered", js.ValueOf(map[string]interface{}{
-		"hash":    hashStr,
-		"appData": string(appData),
-	}))
-	return nil
-}
-
-func SendMessage(this js.Value, args []js.Value) interface{} {
-	if len(args) < 2 {
-		return js.ValueOf(map[string]interface{}{
-			"error": "Destination hash and message required",
-		})
-	}
-
-	destHashHex := args[0].String()
-	message := args[1].String()
-
-	destHash, err := hex.DecodeString(destHashHex)
-	if err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Invalid destination hash: %v", err),
-		})
-	}
-
-	remoteIdentity, err := identity.Recall(destHash)
-	if err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Identity not found. Wait for an announce from this peer!"),
-		})
-	}
-
-	targetDest, err := destination.FromHash(destHash, remoteIdentity, destination.SINGLE, reticulumTransport)
-	if err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Failed to create target destination: %v", err),
-		})
-	}
-
-	encrypted, err := targetDest.Encrypt([]byte(message))
-	if err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Encryption failed: %v", err),
-		})
-	}
-
-	pkt := packet.NewPacket(
-		packet.DestinationSingle,
-		encrypted,
-		packet.PacketTypeData,
-		packet.ContextNone,
-		packet.PropagationBroadcast,
-		packet.HeaderType1,
-		nil,
-		true,
-		packet.FlagUnset,
-	)
-	pkt.DestinationHash = destHash
-
-	if err := pkt.Pack(); err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Packet packing failed: %v", err),
-		})
-	}
-
-	if err := reticulumTransport.SendPacket(pkt); err != nil {
-		return js.ValueOf(map[string]interface{}{
-			"error": fmt.Sprintf("Packet sending failed: %v", err),
-		})
-	}
-
-	stats.packetsSent++
-	stats.bytesSent += len(message)
-
-	return js.ValueOf(map[string]interface{}{
-		"success": true,
-	})
-}
-

revive.toml

@@ -5,9 +5,7 @@ errorCode = 1
 warningCode = 0
 
 [rule.add-constant]
-[rule.exported]
 [rule.argument-limit]
-  arguments = [10]
 [rule.atomic]
 [rule.bare-return]
 [rule.blank-imports]
@@ -25,6 +23,7 @@ warningCode = 0
 [rule.error-return]
 [rule.error-strings]
 [rule.errorf]
+[rule.exported]
 [rule.if-return]
 [rule.increment-decrement]
 [rule.indent-error-flow]

tests/scripts/monitor_performance.sh

@@ -0,0 +1,114 @@
+#!/bin/bash
+set -e
+
+echo "Starting Reticulum-Go with memory and CPU monitoring..."
+
+# Start the process in background
+./bin/reticulum-go &
+PID=$!
+
+echo "Process started with PID: $PID"
+
+# Initialize tracking variables
+MAX_RSS=0
+MAX_VSZ=0
+MAX_CPU=0
+SAMPLES=0
+TOTAL_RSS=0
+TOTAL_VSZ=0
+TOTAL_CPU=0
+
+END_TIME=$((SECONDS + 120))
+
+while [ $SECONDS -lt $END_TIME ] && kill -0 $PID 2>/dev/null; do
+    # Get memory and CPU info using ps
+    if PROC_INFO=$(ps -o pid,rss,vsz,pcpu --no-headers -p $PID 2>/dev/null); then
+        RSS=$(echo $PROC_INFO | awk '{print $2}')  # RSS in KB
+        VSZ=$(echo $PROC_INFO | awk '{print $3}')  # VSZ in KB
+        CPU=$(echo $PROC_INFO | awk '{print $4}')  # CPU percentage
+
+        if [ -n "$RSS" ] && [ -n "$VSZ" ] && [ -n "$CPU" ]; then
+            SAMPLES=$((SAMPLES + 1))
+            TOTAL_RSS=$((TOTAL_RSS + RSS))
+            TOTAL_VSZ=$((TOTAL_VSZ + VSZ))
+            CPU_INT=$(echo $CPU | cut -d. -f1)
+            TOTAL_CPU=$((TOTAL_CPU + CPU_INT))
+
+            if [ $RSS -gt $MAX_RSS ]; then
+                MAX_RSS=$RSS
+            fi
+
+            if [ $VSZ -gt $MAX_VSZ ]; then
+                MAX_VSZ=$VSZ
+            fi
+
+            # CPU is already a percentage (0-100), so compare as integers
+            CPU_INT=$(echo $CPU | cut -d. -f1)
+            if [ $CPU_INT -gt $MAX_CPU ]; then
+                MAX_CPU=$CPU_INT
+            fi
+        fi
+    fi
+
+    sleep 0.1  # Sample every 100ms
+done
+
+# Stop the process if still running
+if kill -0 $PID 2>/dev/null; then
+    echo "Stopping process..."
+    kill $PID 2>/dev/null || true
+    sleep 1
+    kill -9 $PID 2>/dev/null || true
+fi
+
+# Calculate averages
+if [ $SAMPLES -gt 0 ]; then
+    AVG_RSS=$((TOTAL_RSS / SAMPLES))
+    AVG_VSZ=$((TOTAL_VSZ / SAMPLES))
+    AVG_CPU=$((TOTAL_CPU / SAMPLES))
+else
+    AVG_RSS=0
+    AVG_VSZ=0
+    AVG_CPU=0
+fi
+
+# Convert to MB and GB
+MAX_RSS_MB=$((MAX_RSS / 1024))
+MAX_RSS_GB=$((MAX_RSS_MB / 1024))
+AVG_RSS_MB=$((AVG_RSS / 1024))
+AVG_RSS_GB=$((AVG_RSS_MB / 1024))
+
+MAX_VSZ_MB=$((MAX_VSZ / 1024))
+MAX_VSZ_GB=$((MAX_VSZ_MB / 1024))
+AVG_VSZ_MB=$((AVG_VSZ / 1024))
+AVG_VSZ_GB=$((AVG_VSZ_MB / 1024))
+
+# Output results
+echo "=== Performance Usage Report ==="
+echo "Monitoring duration: 120 seconds"
+echo "Samples collected: $SAMPLES"
+echo ""
+
+echo "## CPU Usage - Processor Utilization (since process start)"
+echo "- Max CPU: ${MAX_CPU}%"
+echo "- Avg CPU: ${AVG_CPU}%"
+echo "- Note: Low CPU usage is normal for I/O-bound network applications"
+echo ""
+
+echo "## RSS (Resident Set Size) - Actual Memory Used"
+echo "- Max RSS: ${MAX_RSS} KB (${MAX_RSS_MB} MB / ${MAX_RSS_GB} GB)"
+echo "- Avg RSS: ${AVG_RSS} KB (${AVG_RSS_MB} MB / ${AVG_RSS_GB} GB)"
+echo ""
+
+echo "## VSZ (Virtual Memory Size) - Total Virtual Memory"
+echo "- Max VSZ: ${MAX_VSZ} KB (${MAX_VSZ_MB} MB / ${MAX_VSZ_GB} GB)"
+echo "- Avg VSZ: ${AVG_VSZ} KB (${AVG_VSZ_MB} MB / ${AVG_VSZ_GB} GB)"
+echo ""
+
+# Output for potential future use
+echo "MAX_CPU=$MAX_CPU" >> $GITHUB_OUTPUT
+echo "AVG_CPU=$AVG_CPU" >> $GITHUB_OUTPUT
+echo "MAX_RSS_MB=$MAX_RSS_MB" >> $GITHUB_OUTPUT
+echo "AVG_RSS_MB=$AVG_RSS_MB" >> $GITHUB_OUTPUT
+echo "MAX_VSZ_MB=$MAX_VSZ_MB" >> $GITHUB_OUTPUT
+echo "AVG_VSZ_MB=$AVG_VSZ_MB" >> $GITHUB_OUTPUT