Lua: Header Matching and Cleanup (#5055)

- License was intended to be GPLv3 per earlier commit of GPLv3 LICENSE FILE
- This is confirmed by the inclusion of libraries that are incompatible with GPLv2
- This is also confirmed by KLS and the agreement of KLS's predecessors
- Added GPLv3 license headers to the compilable source files
- Removed Folly licensing in strings.h since the string functions do not match the Folly functions and are standard functions - this must have been left over from previous implementations
- Removed individual contributor license headers since the project has been under the "developer" mantle for many years
- Removed comments on files that were previously automatically generated since they've been manually modified multiple times and there are no automatic scripts referencing them (removed in 2023)

.devcontainer/.gitignore

@@ -1,6 +1,5 @@
-!Makefile
+base/
-base/*.sql
+!base/*.json
-base/*.zip
+override/
-base/db/
+repo/
-base/maps/
+cache/
-!base/expansion/Makefile

.devcontainer/Makefile

@@ -1,196 +1,127 @@
+# Build binaries: make cmake, make build
+# One time initial setup (or to reset db): make prep, make inject-mariadb, make maps
+# Update custom db edits: make inject-custom
+# Start up server: make shared, make login, make world, make zone
+# in game, stop combat spam #logs set gmsay 79 0
+# in game, stop loot spam #logs set gmsay 69 0
 NAME := eqemu-server
-.ONESHELL:
-
-DOCKER_ARGS := --rm  --name ${NAME} -v $$PWD:/src -w /src ${NAME}
-DOCKER_ARM64_ARGS := --rm --platform linux/arm64 --name ${NAME}-arm64 -v $$PWD:/src -w /src ${NAME}-arm64
-
-.PHONY: build
-build:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile build --no-print-directory
-	exit
-endif
-	cd build$$BUILD_SUFFIX && cmake --build . --config Release --target all --
-
-.PHONY: cmake
-cmake:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile cmake --no-print-directory
-	exit
-endif
-	@echo "working directory: $$PWD"
-	mkdir -p build$$BUILD_SUFFIX
-	@cd build$$BUILD_SUFFIX && cmake -DEQEMU_BUILD_LOGIN=ON \
-			-DEQEMU_BUILD_TESTS=ON \
-			-DCMAKE_CXX_COMPILER_LAUNCHER=ccache -G Ninja ..
-
-clean:
-ifneq (,$(findstring .devcontainer,$$PWD))
-	@make -C ../ -f .devcontainer/Makefile clean --no-print-directory
-endif
-	rm -rf build
-
-docker-cmake:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile docker-cmake --no-print-directory
-	exit
-endif
-	@echo "working directory: $$PWD"
-	git submodule update --init --recursive
-	docker run ${DOCKER_ARGS} make cmake
-
-docker-build:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile docker-build --no-print-directory
-	exit
-endif
-	docker run ${DOCKER_ARGS} make build
-
-# Build image if it doesn't exist
-docker-image-build:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile docker-image-build --no-print-directory
-	exit
-endif
-ifeq ($(shell docker images -q ${NAME} 2> /dev/null),)
-	@echo "Docker image not found. Building..."
-	docker build -f Dockerfile.debian.dev -t ${NAME} .
-endif
-
-docker-arm-cmake: docker-arm-image-build
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile docker-arm-cmake --no-print-directory
-	exit
-endif
-	git submodule update --init --recursive
-	docker run ${DOCKER_ARM64_ARGS} make cmake BUILD_SUFFIX=arm64
-
-docker-arm-build: docker-arm-image-build
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile docker-arm-build --no-print-directory
-	exit
-endif
-	docker run ${DOCKER_ARM64_ARGS} make build BUILD_SUFFIX=arm64
-
-docker-arm-image-build:
-ifeq ($(shell docker images -q ${NAME}-arm64 2> /dev/null),)
-	@echo "Docker image not found. Building..."
-	docker build -f Dockerfile.debian.arm.dev -t ${NAME}-arm64 .
-endif
-
-docker-clean: clean
 
 .PHONY: prep
-prep:
+prep: is-vscode
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile prep --no-print-directory
-	exit
-endif
 	@echo "Preparing build/bin for usage..."
-	mkdir -p build/bin/assets/patches
+
-	cp -R -u -p .devcontainer/base/eqemu_config.json build/bin/eqemu_config.json
+	@echo "Prepping folders..."
-	cp -R -u -p .devcontainer/base/login.json build/bin/login.json
+	@mkdir -p .devcontainer/override
-	cp -R -u -p loginserver/login_util/* build/bin/assets/patches/
+	@mkdir -p .devcontainer/repo
-	mkdir -p build/bin/assets
+	@mkdir -p .devcontainer/cache
-	cp -R -u -p utils/patches build/bin/assets/
+	@mkdir -p build/bin/logs
-	-unlink build/bin/lua_modules
+	@mkdir -p build/bin/shared
-	cd build/bin && ln -s quests/lua_modules lua_modules
+	@mkdir -p build/bin/assets
-	-unlink build/bin/mods
+
-	cd build/bin && ln -s quests/mods mods
+	@echo "Applying overrides..."
-	-unlink build/bin/maps
+	@if [ ! -f .devcontainer/override/eqemu_config.json ]; then cp .devcontainer/base/eqemu_config.json .devcontainer/override/eqemu_config.json; fi
-	cd build/bin && ln -s ../../base/maps maps
+	@if [ -f build/bin/eqemu_config.json ]; then unlink build/bin/eqemu_config.json; fi
-	mkdir -p build/bin/logs
+	cd build/bin && ln -s ../../.devcontainer/override/eqemu_config.json eqemu_config.json
-	mkdir -p build/bin/shared
+	@if [ ! -f .devcontainer/override/login.json ]; then cp .devcontainer/base/login.json .devcontainer/override/login.json; fi
+	@if [ -f build/bin/login.json ]; then unlink build/bin/login.json; fi
+	cd build/bin && ln -s ../../.devcontainer/override/login.json login.json
+
+	@echo "Cloning repositories..."
+	cd .devcontainer/repo && if [ ! -d "quests" ]; then cd ../../.devcontainer/repo/ && git clone https://github.com/ProjectEQ/projecteqquests.git quests; fi
+	cd .devcontainer/repo && if [ ! -d "eqemu-definitions" ]; then cd ../../.devcontainer/repo/ && git clone https://github.com/xackery/eqemu-definitions.git eqemu-definitions; fi
+	cd .devcontainer/repo && if [ ! -d "maps" ]; then cd ../../ && make maps; fi
+	@if [ -d build/bin/quests ]; then unlink build/bin/quests; fi
+	cd build/bin && ln -s ../../.devcontainer/repo/quests quests
+	@if [ -d build/bin/maps ]; then unlink build/bin/maps; fi
+	cd build/bin && ln -s ../../.devcontainer/repo/maps maps
+	@if [ -d build/bin/eqemu-definitions ]; then unlink build/bin/eqemu-definitions; fi
+	cd build/bin && ln -s ../../.devcontainer/repo/eqemu-definitions eqemu-definitions
+	@mkdir -p build/bin/quests/mods
+
+	@echo "Applying base links..."
+	cp -R -u -p utils/patches .devcontainer/base/
+	@if [ -d build/bin/assets/patches ]; then unlink build/bin/assets/patches; fi
+	cd build/bin/assets && ln -s ../../../.devcontainer/base/patches patches
+	@if [ -d build/bin/lua_modules ]; then unlink build/bin/lua_modules; fi
+	cd build/bin && ln -s ../../.devcontainer/repo/quests/lua_modules lua_modules
+	@if [ -d build/bin/mods ]; then unlink build/bin/mods; fi
+	cd build/bin && ln -s ../../.devcontainer/repo/quests/mods mods
+	@if [ -d build/bin/plugins ]; then unlink build/bin/plugins; fi
+	cd build/bin && ln -s ../../.devcontainer/repo/quests/plugins plugins
+
 	@echo "Eqemu is prepared. Edit build/bin/eqemu_config.json to configure."
 
-maps:
+is-vscode:
-	@echo "Downloading maps..."
+	@if [ -z "$$REMOTE_CONTAINERS" ]; then \
-	@mkdir -p base/maps
+		echo "Not running in VS Code devcontainer"; \
-	@cd base/maps && wget -nc https://github.com/Akkadius/eqemu-maps/archive/refs/heads/master.zip
+		exit 1; \
-	@cd base/maps && unzip -o master.zip
+	fi
-	@cd base/maps && mv eqemu-maps-master/* .
-	@cd base/maps && rm -rf eqemu-maps-master
-	@echo "Maps downloaded."
 
-quests:
+clean: is-vscode
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	rm -rf build
-	@make -C ../ -f .devcontainer/Makefile quests --no-print-directory
+
-	exit
+.PHONY: maps
-endif
+maps: is-vscode
-	@cd build/bin && git clone https://github.com/ProjectEQ/projecteqquests.git quests
+	@echo "Downloading maps..."
+	@mkdir -p .devcontainer/repo/maps
+	@cd .devcontainer/repo/maps && wget -nc https://github.com/EQEmu/maps/archive/refs/heads/master.zip
+	@cd .devcontainer/repo/maps && unzip -o master.zip
+	@cd .devcontainer/repo/maps && mv maps-master/* .
+	@cd .devcontainer/repo/maps && rm -rf maps-master
+	@echo "Maps downloaded."
 
 # Runs tests
 .PHONY: test
-test:
+test: is-vscode
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile test --no-print-directory
-	exit
-endif
 	cd build/bin && ./tests
 
 # Runs login binary
 .PHONY: login
-login:
+login: is-vscode check-mariadb
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile login --no-print-directory
-	exit
-endif
 	cd build/bin && ./loginserver
 
+.PHONY: hotfix
+hotfix: shared
+
 # Runs shared_memory binary
 .PHONY: shared
-shared:
+shared: is-vscode check-mariadb
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile shared --no-print-directory
-	exit
-endif
 	cd build/bin && ./shared_memory
 
 # Runs zone binary
 .PHONY: zone
-zone:
+zone: is-vscode check-mariadb
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@find build/bin/logs/zone/ -type f -name 'zone*.log' -exec rm -f {} +
-	@make -C ../ -f .devcontainer/Makefile zone --no-print-directory
-	exit
-endif
-	@-rm build/bin/logs/zone/zone*.log
 	cd build/bin && ./zone
 
+check-mariadb: is-vscode
+	@if ! sudo service mariadb status | grep -q 'active (running)'; then \
+		sudo service mariadb start; \
+	fi
+
 # Runs world binary
 .PHONY: world
-world:
+world: is-vscode check-mariadb
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@find build/bin/logs/ -type f -name 'world*.log' -exec rm -f {} +
-	@make -C ../ -f .devcontainer/Makefile world --no-print-directory
-	exit
-endif
-	@-rm build/bin/logs/world*.log
 	cd build/bin && ./world
 
 # Runs ucs binary
 .PHONY: ucs
-ucs:
+ucs: is-vscode check-mariadb
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@find build/bin/logs/ -type f -name 'ucs*.log' -exec rm -f {} +
-	@make -C ../ -f .devcontainer/Makefile ucs --no-print-directory
-	exit
-endif
-	@-rm build/bin/logs/ucs*.log
 	cd build/bin && ./ucs
 
 # Runs queryserv binary
 .PHONY: queryserv
-queryserv:
+queryserv: is-vscode check-mariadb
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@find build/bin/logs/ -type f -name 'query_server*.log' -exec rm -f {} +
-	@make -C ../ -f .devcontainer/Makefile queryserv --no-print-directory
-	exit
-endif
-	@-rm build/bin/logs/query_server*.log
 	cd build/bin && ./queryserv
 
-valgrind-%:
+reset-content:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@echo "Resetting content tables in database peq..."
-	@make -C ../ -f .devcontainer/Makefile valgrind --no-print-directory
+	cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_content.sql"
-	exit
+
-endif
+valgrind-%: is-vscode
 	cd build/bin && valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --verbose --log-file=logs/$*.valgrind.log ./$*
 
 # Start mariaDB standalone
@@ -201,30 +132,33 @@ mariadb:
 .PHONY: inject-mariadb
 inject-mariadb:
 	-sudo service mariadb start
-	-mkdir -p base/db/
+	-mkdir -p .devcontainer/cache/db/
 	-sudo mariadb -e 'DROP DATABASE IF EXISTS peq;'
 	-sudo mariadb -e 'CREATE DATABASE peq;'
-	-sudo mariadb -e "CREATE USER 'peq'@'127.0.0.1' IDENTIFIED BY 'peqpass';"
+	-sudo mariadb -e "CREATE USER IF NOT EXISTS 'peq'@'127.0.0.1' IDENTIFIED BY 'peqpass';"
 	-sudo mariadb -e "GRANT ALL PRIVILEGES ON *.* TO 'peq'@'127.0.0.1';"
-ifeq (,$(wildcard base/db/db.sql.zip))
+ifeq (,$(wildcard .devcontainer/cache/db/db.sql.zip))
-	@echo "base/db.sql.zip not found. Downloading latest from https://db.projecteq.net/"
+	@echo ".devcontainer/cache/db.sql.zip not found. Downloading database from https://db.eqemu.dev/latest"
-	wget -nc https://db.projecteq.net/latest -O base/db/db.sql.zip
+	wget -nc https://db.eqemu.dev/latest -O .devcontainer/cache/db/db.sql.zip
-	-cd base/db && unzip db.sql.zip
+	-cd .devcontainer/cache/db && unzip db.sql.zip
 endif
 	@echo "Sourcing db may take a while, please wait..."
-	@cd base/db/peq-dump && sudo mariadb --database peq -e "source create_all_tables.sql"
+
+	@cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_content.sql"
+	@cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_login.sql"
+	@cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_player.sql"
+	@# deprecated cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_queryserv.sql"
+	@cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_state.sql"
+	@cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_system.sql"
+
 	@echo "MariaDB is now injected."
 
 .PHONY: gm-%
-gm-%:
+gm-%: is-vscode
 	sudo mariadb --database peq -e "UPDATE account SET status=255 WHERE name = '$*';"
 	@echo "Account $* is now a GM. /camp to have it go into effect."
 
-depends:
+depends: is-vscode
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile depends --no-print-directory
-	exit
-endif
 	sudo apt install graphviz pip time
 	pip3 install graphviz
 	mkdir -p build/depends
@@ -241,44 +175,54 @@ endif
 	@echo "Common..."
 	time python3 build/depends/dependency_graph.py -f png common build/depends/common.dot
 
-backup:
+backup: is-vscode
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile backup --no-print-directory
-	exit
-endif
 	@mkdir -p build/bin/backup
 	cd build/bin && ./world database:dump --compress --player-tables --state-tables --system-tables --query-serv-tables
 
-cpu-zone:
+restore-%: is-vscode
+	@if [ -z "$*" ]; then \
+		echo "Please provide a backup file to restore from. Example: make restore-backup.sql"; \
+		exit 1; \
+	fi
+	@echo "Restoring from backup $*"
+	@sudo mariadb --database peq -e "$*"
+
+
+cpu-zone: is-vscode
 ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile cpu-zone --no-print-directory
+	@echo "This makefile is not intended to be run from the .devcontainer directory."
 	exit
 endif
 	@cd build/bin && mkdir -p tmp
 	cd build/bin && CPUPROFILE=prof.out ./zone
 
-pprof-zone:
+pprof-zone: is-vscode
 ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile pprof-zone --no-print-directory
+	@echo "This makefile is not intended to be run from the .devcontainer directory."
 	exit
 endif
 	cd build/bin && google-pprof --pdf zone prof.out > prof.pdf
-pprof-web-zone:
+
+pprof-gv-zone: is-vscode
 ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile pprof-web-zone --no-print-directory
+	@echo "This makefile is not intended to be run from the .devcontainer directory."
-	exit
-endif
-	cd build/bin && google-pprof --web zone prof.out
-pprof-gv-zone:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile pprof-gv-zone --no-print-directory
 	exit
 endif
 	cd build/bin && google-pprof --gv zone prof.out > prof.gv
-heap-zone:
+
+heap-zone: is-vscode
 ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile heap-zone --no-print-directory
+	@echo "This makefile is not intended to be run from the .devcontainer directory."
 	exit
 endif
 	@cd build/bin && mkdir -p tmp
 	cd build/bin && HEAPPROFILE=prof.out ./zone
+
+
+.PHONY: pull
+pull:
+	git pull
+	@if [ ! -d "quests" ]; then git clone https://github.com/rebuildeq/quests.git quests; fi
+	cd quests && git pull
+	@if [ ! -d "eqemu-definitions" ]; then git clone https://github.com/xackery/eqemu-definitions.git eqemu-definitions; fi
+	cd eqemu-definitions && git pull

.devcontainer/devcontainer.json

@@ -40,10 +40,41 @@
 				"GitHub.copilot",
 				"xackery.make-magic",
 				"Gruntfuggly.todo-tree",
-				"ms-vscode.cmake-tools"
+				"ms-vscode.cmake-tools",
-			]
+				"sumneko.lua"
+			],
+			"settings": {
+				"Lua.runtime.version": "Lua 5.1",
+			    "Lua.workspace.library": [
+			        "/src/repo/eqemu-definitions"
+			    ],
+			    "Lua.diagnostics.disable": [
+			        "lowercase-global"
+			    ],
+				"cmake.statusbar.advanced": {
+					"kit": {
+						"visibility": "hidden"
+					},
+					"debug": {
+						"visibility": "hidden"
+					},
+					"buildTarget": {
+						"visibility": "compact"
+					},
+					"launch": {
+						"visibility": "hidden"
+					},
+					"ctest": {
+						"visibility": "icon"
+					}
+				}
+			}
 		}
 	},
+	"mounts": [
+    "source=${localWorkspaceFolder}/.devcontainer/Makefile,target=/src/Makefile,type=bind,consistency=cached"
+	],
+
 	"workspaceFolder": "/src",
 	"workspaceMount": "source=${localWorkspaceFolder},target=/src,type=bind,consistency=cached"
 }

.drone.yml

@@ -1,98 +0,0 @@
----
-
-kind: pipeline
-type: docker
-name: Build Linux
-
-# Limits how many of these builds can run on the drone runner at a time, this isn't about cores
-concurrency:
-  limit: 1
-
-volumes:
-  - name: cache
-    host:
-      path: /var/lib/cache-release
-
-steps:
-  - name: Build Linux X64
-    image: akkadius/eqemu-server:v14
-    environment:
-      GITHUB_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-      RCLONE_CONFIG_REMOTE_TYPE: ftp
-      RCLONE_FTP_HOST: drone.akkadius.com
-      RCLONE_FTP_USER: artifacts
-      RCLONE_FTP_PASS:
-        from_secret: RCLONE_FTP_PASS
-    commands:
-      - ./utils/scripts/build/linux-build.sh
-    volumes:
-      - name: cache
-        path: /home/eqemu/.ccache/
-
----
-
-kind: pipeline
-type: exec
-name: Build Windows
-
-# Limits how many of these builds can run on the drone runner at a time, this isn't about cores
-concurrency:
-  limit: 1
-
-platform:
-  os: windows
-  arch: amd64
-
-steps:
-  - name: Build Windows X64
-    environment:
-      RCLONE_CONFIG_REMOTE_TYPE: ftp
-      RCLONE_FTP_HOST: drone.akkadius.com
-      RCLONE_FTP_USER: artifacts
-      RCLONE_FTP_PASS:
-        from_secret: RCLONE_FTP_PASS
-      GITHUB_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-    commands:
-      - .\utils\scripts\build\windows-build.ps1
-
----
-
-kind: pipeline
-type: docker
-name: Publish Artifacts to Github
-
-steps:
-  - name: Upload Artifacts
-    image: akkadius/eqemu-build-releaser:v3
-    environment:
-      RCLONE_CONFIG_REMOTE_TYPE: ftp
-      RCLONE_FTP_HOST: drone.akkadius.com
-      RCLONE_FTP_USER: artifacts
-      RCLONE_FTP_PASS:
-        from_secret: RCLONE_FTP_PASS
-      GH_RELEASE_GITHUB_API_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-      GITHUB_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-    commands:
-      - ./utils/scripts/build/should-release/should-release
-      - rclone config create remote ftp env_auth true > /dev/null
-      - |
-        rclone copy remote: --include "eqemu-server*.zip" .
-      - gh-release --assets=eqemu-server-linux-x64.zip,eqemu-server-windows-x64.zip -y
-      - |
-        rclone delete remote: --include "eqemu-server*.zip"
-
-trigger:
-  branch:
-    - master
-  event:
-    - push
-
-depends_on:
-  - Build Windows
-  - Build Linux
-
-

.editorconfig

@@ -3,9 +3,7 @@
 # top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file
 [*]
-end_of_line = lf
 insert_final_newline = true
 
 # Matches multiple files with brace expansion notation

.gitattributes

@@ -20,7 +20,4 @@
 *.css text
 *.js text
 *.types text
-
+*.pdf binary
-*.vcproj text merge=union
-*.csproj text merge=union
-*.sln text merge=union eol=crlf

.github/workflows/build.yaml

@@ -0,0 +1,81 @@
+name: Build
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  linux:
+    name: Linux
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+
+      - name: Setup ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ runner.os }}-ccache
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential ninja-build ccache uuid-dev
+
+      - name: Configure
+        run: |
+          cmake -S . -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+            -DEQEMU_BUILD_TESTS=ON \
+            -DEQEMU_BUILD_LOGIN=ON \
+            -DEQEMU_BUILD_LUA=ON \
+            -DEQEMU_BUILD_PERL=ON \
+            -DEQEMU_BUILD_CLIENT_FILES=ON
+
+      - name: Build
+        run: cmake --build build --parallel
+
+      - name: Test
+        working-directory: build
+        run: ./bin/tests
+
+  windows:
+    name: Windows
+    runs-on: windows-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+
+      - name: Enable long paths
+        run: git config --global core.longpaths true
+
+      - name: Setup MSVC environment
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x64
+
+      - name: Configure
+        shell: pwsh
+        run: |
+          cmake -S . -B build -G "Visual Studio 17 2022" -A x64 `
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DEQEMU_BUILD_TESTS=ON `
+            -DEQEMU_BUILD_LOGIN=ON `
+            -DEQEMU_BUILD_LUA=ON `
+            -DEQEMU_BUILD_ZLIB=ON `
+            -DEQEMU_BUILD_CLIENT_FILES=ON
+
+      - name: Build
+        shell: pwsh
+        run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m
+
+      - name: Test
+        working-directory: build
+        run: ./bin/RelWithDebInfo/tests.exe

.gitmodules

@@ -1,18 +1,6 @@
-[submodule "submodules/glm"]
-	path = submodules/glm
-	url = https://github.com/g-truc/glm.git
-[submodule "submodules/fmt"]
-	path = submodules/fmt
-	url = https://github.com/fmtlib/fmt.git
-[submodule "submodules/libuv"]
-	path = submodules/libuv
-	url = https://github.com/libuv/libuv.git
-[submodule "submodules/cereal"]
-	path = submodules/cereal
-	url = https://github.com/USCiLab/cereal.git
 [submodule "submodules/websocketpp"]
 	path = submodules/websocketpp
 	url = https://github.com/zaphoyd/websocketpp.git
-[submodule "submodules/recastnavigation"]
+[submodule "submodules/vcpkg"]
-	path = submodules/recastnavigation
+	path = submodules/vcpkg
-	url = https://github.com/EQEmu/recastnavigation.git
+	url = https://github.com/microsoft/vcpkg.git

.vscode/settings.json

@@ -21,14 +21,6 @@
 		"${workspaceFolder}/dependencies/zlibng"
 	],
 	"telemetry.enableTelemetry": false,
-	"cmake.buildDirectory": "${workspaceFolder}/build",
-	"cmake.configureArgs": [
-		"-DEQEMU_BUILD_LOGIN=ON",
-		"-DEQEMU_BUILD_TESTS=ON",
-		"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
-		"-DEQEMU_ADD_PROFILER=ON",
-		"Ninja"
-	],
 	"cmake.skipConfigureIfCachePresent": true,
 	"cmake.configureOnOpen": false,
 	"files.associations": {
@@ -115,22 +107,5 @@
 		"format": "cpp",
 		"ranges": "cpp",
 		"span": "cpp"
-	},
-	"cmake.statusbar.advanced": {
-		"kit": {
-			"visibility": "hidden",
-		},
-		"debug": {
-			"visibility": "hidden",
-		},
-		"buildTarget": {
-			"visibility": "hidden",
-		},
-		"launch": {
-			"visibility": "hidden",
-		},
-		"ctest": {
-			"visibility": "icon",
-		}
 	}
 }

BUILD.md

@@ -4,46 +4,35 @@ This guide is far from exhaustive, you should expect to have some experience wit
 
 ### CMake
 
-EQEmu uses CMake as the build system on all platforms.  You will need CMake 3.2 or higher to build from source.
+EQEmu uses CMake as the build system on all platforms.  You will need CMake 3.20 or higher to build from source.
 
 ### Dependencies
 
 The following libraries are required to build from source:
-- [boost](https://www.boost.org/ "boost")
+- uuid (unix)
-- [zlib](https://www.zlib.net/ "zlib") (If not included the source will build [zlib-ng](https://github.com/zlib-ng/zlib-ng "zlib-ng") instead)
-- [libmysql](https://dev.mysql.com/downloads/connector/c/ "libmysql") or [libmariadb](https://github.com/MariaDB/mariadb-connector-c "libmariadb")
 
 The following libraries are not strictly required but in many cased recommended.
-- [OpenSSL](https://www.openssl.org/ "OpenSSL") or [mbedTLS](https://tls.mbed.org/ "mbedTLS") (Required for the loginserver and headless client)
-- [libsodium](https://github.com/jedisct1/libsodium "libsodium") (Required for strong password hashing on the loginserver)
-- [Lua 5.1](https://www.lua.org/ "Lua 5.1") or [LuaJit](http://luajit.org/ "LuaJit") (Required for Lua Quest Scripting)
 - [Perl](https://www.perl.org/ "Perl") (Required for Perl Quest Scripting)
 
 ##### Windows
-For windows it is suggested you make use of [vcpkg](https://github.com/microsoft/vcpkg "vcpkg") if you wish to build your own dependencies.
-
 If you wish to use Perl then you should use whichever version of Perl you have installed on the target system.
 
-You can also download a vcpkg export from our releases section for Visual Studio [x86](https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x86.zip "x86") or [x64](https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x64.zip "x64") that includes a toolchain file you can pass to CMake.
-
 ##### Linux
 For Linux you simply can install the dependencies from your package manager, below is an example of doing it on Ubuntu using apt-get.
 
-    sudo apt-get install libmysqlclient-dev libperl-dev libboost-dev liblua5.1-0-dev zlib1g-dev uuid-dev libssl-dev
+    sudo apt-get install libperl-dev uuid-dev
 
 ### Running CMake
 
 ##### Windows
 The following is a modified command our automated build server uses to run CMake via the release vcpkg export and its toolchain file. 
 
-Assuming it is starting in c:/projects/eqemu and the x64 dependencies were extracted to c:/projects/eqemu/vcpkg.
-
 	mkdir build
 	cd build
-	cmake -G "Visual Studio 15 2017 Win64" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON -DCMAKE_TOOLCHAIN_FILE="c:/projects/eqemu/vcpkg/vcpkg-export-20180828-145455/scripts/buildsystems/vcpkg.cmake" ..
+	cmake -G "Visual Studio 15 2022 Win64" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON ..
 
 ##### Linux
-Similarly to Windows running CMake on Linux is simple it just omits the toolchain file and uses a different generator.
+Similarly to Windows running CMake on Linux is simple it just uses a different generator.
 
 	mkdir build
 	cd build

CHANGELOG.md

@@ -1,3 +1,568 @@
+## [23.10.3] 9/16/2025
+
+### Hotfix
+
+* Hotfix crashes occurring in #4987. @Akkadius 2025-09-17
+
+## [23.10.2] 9/16/2025
+
+### Hotfix
+
+* Revert #4996 as it was causing critical issues with spells that needs to be further investigated. @Akkadius 2025-09-17
+
+## [23.10.1] 9/16/2025
+
+### Hotfix
+* Fixed Mail Key Bug ([#5015](https://github.com/EQEmu/Server/pull/5015)) @Kinglykrab 2025-09-16
+
+## [23.10.0] 9/15/2025
+
+### Build
+
+* Fix Linking with GCC ([#4969](https://github.com/EQEmu/Server/pull/4969)) @solar984 2025-08-03
+
+### Code
+
+* Add #npcedit npc_tint_id Help Message ([#4982](https://github.com/EQEmu/Server/pull/4982)) @Kinglykrab 2025-08-17
+* Cleanup #show ip_lookup Message ([#5005](https://github.com/EQEmu/Server/pull/5005)) @Kinglykrab 2025-08-30
+* Fix #set race 0 Message ([#5004](https://github.com/EQEmu/Server/pull/5004)) @Kinglykrab 2025-08-30
+* Fix Issues with Strings::Commify and Mob::SendStatsWindow ([#4984](https://github.com/EQEmu/Server/pull/4984)) @Kinglykrab 2025-08-17
+* Remove Attributions ([#4988](https://github.com/EQEmu/Server/pull/4988)) @KimLS 2025-08-16
+* Remove Unused errorname Variable ([#5001](https://github.com/EQEmu/Server/pull/5001)) @Kinglykrab 2025-08-29
+
+### Commands
+
+* Add #find account Subcommand ([#4981](https://github.com/EQEmu/Server/pull/4981)) @Kinglykrab 2025-08-17
+* Add #show keyring Subcommand ([#4973](https://github.com/EQEmu/Server/pull/4973)) @Kinglykrab 2025-08-03
+* Add #task complete Saylink to #task show ([#4985](https://github.com/EQEmu/Server/pull/4985)) @Kinglykrab 2025-08-17
+
+### Constants
+
+* Change Race Changes to Race Namespace ([#5000](https://github.com/EQEmu/Server/pull/5000)) @Kinglykrab 2025-08-30
+* Convert SE Defines to SpellEffect Namespace ([#4999](https://github.com/EQEmu/Server/pull/4999)) @Kinglykrab 2025-08-30
+
+### Database
+
+* Add `heal_amount` to `character_stats_record` ([#4986](https://github.com/EQEmu/Server/pull/4986)) @Kinglykrab 2025-08-17
+
+### Fixes
+
+* Fix #show recipe uint16 Cap ([#4978](https://github.com/EQEmu/Server/pull/4978)) @Kinglykrab 2025-08-11
+* Fix Race 474 for Titanium ([#4979](https://github.com/EQEmu/Server/pull/4979)) @regneq 2025-08-11
+* Fix Recipe Inspect Bug ([#4994](https://github.com/EQEmu/Server/pull/4994)) @Kinglykrab 2025-08-30
+* Fix Several Evolving Item Bugs ([#4992](https://github.com/EQEmu/Server/pull/4992)) @neckkola 2025-09-08
+* Fix Task Reloading ([#5002](https://github.com/EQEmu/Server/pull/5002)) @Kinglykrab 2025-08-29
+
+### Loginserver
+
+* Fix Legacy World When Using Local DB ([#4970](https://github.com/EQEmu/Server/pull/4970)) @solar984 2025-08-03
+
+### Pets
+
+* Add Pet Constants and Methods ([#4987](https://github.com/EQEmu/Server/pull/4987)) @Kinglykrab 2025-08-17
+
+### Quest API
+
+* Add EVENT_CHARM_START and EVENT_CHARM_END ([#5013](https://github.com/EQEmu/Server/pull/5013)) @Kinglykrab 2025-09-15
+* Add GetKeyRing() to Perl/Lua ([#4980](https://github.com/EQEmu/Server/pull/4980)) @Kinglykrab 2025-08-17
+* Add GetNPCTintIndex() to Perl/Lua ([#4983](https://github.com/EQEmu/Server/pull/4983)) @Kinglykrab 2025-08-17
+* Add GetTimers() and GetPausedTimers() to Perl/Lua ([#4965](https://github.com/EQEmu/Server/pull/4965)) @Kinglykrab 2025-08-03
+* Add Identifiers to Get/Modify NPC Stat Methods ([#5012](https://github.com/EQEmu/Server/pull/5012)) @Kinglykrab 2025-09-15
+
+### Repositories
+
+* Convert Character Inspect Messages to Repositories ([#4997](https://github.com/EQEmu/Server/pull/4997)) @Kinglykrab 2025-08-30
+* Convert Damage Shield Types to Repositories ([#4995](https://github.com/EQEmu/Server/pull/4995)) @Kinglykrab 2025-08-30
+* Convert Item Loading to Repositories ([#4998](https://github.com/EQEmu/Server/pull/4998)) @Kinglykrab 2025-08-30
+* Convert Mail Key to Repositories ([#5007](https://github.com/EQEmu/Server/pull/5007)) @Kinglykrab 2025-09-15
+* Convert Shared Bank Platinum to Repositories ([#5006](https://github.com/EQEmu/Server/pull/5006)) @Kinglykrab 2025-09-02
+* Convert Spell Loading to Repositories ([#4996](https://github.com/EQEmu/Server/pull/4996)) @Kinglykrab 2025-08-30
+* Convert Total Time Played to Repositories ([#5008](https://github.com/EQEmu/Server/pull/5008)) @Kinglykrab 2025-09-15
+
+## [23.9.1] 8/2/2025
+
+### Hotfix
+
+* Fix Quest Ownership Edge Case ([#4977](https://github.com/EQEmu/Server/pull/4977)) @Kinglykrab 2025-08-02
+
+## [23.9.0] 8/2/2025
+
+### Bots
+
+* Fix FinishBuffing rule ([#4961](https://github.com/EQEmu/Server/pull/4961)) @nytmyr 2025-07-01
+* Fix ^cast resurrects ([#4958](https://github.com/EQEmu/Server/pull/4958)) @nytmyr 2025-06-29
+
+### Build
+
+* Fix Linking with GCC ([#4969](https://github.com/EQEmu/Server/pull/4969)) @solar984 2025-08-03
+* More Build Speed Improvements ([#4959](https://github.com/EQEmu/Server/pull/4959)) @Akkadius 2025-06-30
+
+### Commands
+
+* Add #show keyring Subcommand ([#4973](https://github.com/EQEmu/Server/pull/4973)) @Kinglykrab 2025-08-03
+
+### Database
+
+* Add Indexes to NPC's Spawns Loot ([#4972](https://github.com/EQEmu/Server/pull/4972)) @Akkadius 2025-07-30
+
+### Feature
+
+* Zone Scripting ([#4908](https://github.com/EQEmu/Server/pull/4908)) @Kinglykrab 2025-07-10
+
+### Fixes
+
+* Add a missing Froglok starting area for Titanium Startzone. ([#4962](https://github.com/EQEmu/Server/pull/4962)) @regneq 2025-07-04
+* Fix Hero's Forge Ingame and Character Select ([#4966](https://github.com/EQEmu/Server/pull/4966)) @Kinglykrab 2025-07-30
+* Show player count on the server list status. ([#4971](https://github.com/EQEmu/Server/pull/4971)) @regneq 2025-07-30
+
+### Loginserver
+
+* Fix Legacy World When Using Local DB ([#4970](https://github.com/EQEmu/Server/pull/4970)) @solar984 2025-08-03
+
+### Performance
+
+* Clear Wearchange Deduplication Cache ([#4960](https://github.com/EQEmu/Server/pull/4960)) @Akkadius 2025-06-30
+
+### Quest API
+
+* Add GetMemberRole() to Perl/Lua ([#4963](https://github.com/EQEmu/Server/pull/4963)) @Barathos 2025-07-10
+* Add GetTimers() and GetPausedTimers() to Perl/Lua ([#4965](https://github.com/EQEmu/Server/pull/4965)) @Kinglykrab 2025-08-03
+
+## [23.8.1] 6/28/2025
+
+### Crash Fix
+
+* Fix Possible Crashes with Raid Methods ([#4955](https://github.com/EQEmu/Server/pull/4955)) @Kinglykrab 2025-06-26
+
+### Databuckets
+
+* Revert Caching Changes of #4917 ([#4957](https://github.com/EQEmu/Server/pull/4957)) @Akkadius 2025-06-28
+
+### Fixes
+
+* Fix FindCharacter Using content_db ([#4956](https://github.com/EQEmu/Server/pull/4956)) @Kinglykrab 2025-06-26
+* Fix Hero Forge on Character Select ([#4954](https://github.com/EQEmu/Server/pull/4954)) @Kinglykrab 2025-06-26
+
+## [23.8.0] 6/25/2025
+
+### API
+
+* Add wwmarquee <type> <message> ([#4919](https://github.com/EQEmu/Server/pull/4919)) @Akkadius 2025-06-23
+
+### Build
+
+* Significantly Improve Build Times Using Unity Builds ([#4948](https://github.com/EQEmu/Server/pull/4948)) @Akkadius 2025-06-22
+
+### Code
+
+* AdventureManager Global to Singleton Cleanup ([#4931](https://github.com/EQEmu/Server/pull/4931)) @Kinglykrab 2025-06-25
+* Cleanup Strings Header ([#4950](https://github.com/EQEmu/Server/pull/4950)) @Akkadius 2025-06-22
+* ClientList Global to Singleton Cleanup ([#4942](https://github.com/EQEmu/Server/pull/4942)) @Kinglykrab 2025-06-25
+* DatabaseUpdate Global to Singleton Cleanup ([#4943](https://github.com/EQEmu/Server/pull/4943)) @Kinglykrab 2025-06-25
+* DiscordManager Global to Singleton Cleanup ([#4926](https://github.com/EQEmu/Server/pull/4926)) @Kinglykrab 2025-06-25
+* EQ::Random Global to Singleton Cleanup ([#4936](https://github.com/EQEmu/Server/pull/4936)) @Kinglykrab 2025-06-22
+* EQEmuLogSys Global to Singleton Cleanup ([#4925](https://github.com/EQEmu/Server/pull/4925)) @Akkadius 2025-06-25
+* EvolvingItemsManager Global to Singleton Cleanup ([#4929](https://github.com/EQEmu/Server/pull/4929)) @Kinglykrab 2025-06-25
+* LFGuildManager Global to Singleton Cleanup ([#4927](https://github.com/EQEmu/Server/pull/4927)) @Kinglykrab 2025-06-25
+* LoginServerList Global to Singleton Cleanup ([#4941](https://github.com/EQEmu/Server/pull/4941)) @Kinglykrab 2025-06-25
+* Optimize PCH Config (Faster Builds) ([#4951](https://github.com/EQEmu/Server/pull/4951)) @Akkadius 2025-06-22
+* PCH Cleanup ([#4952](https://github.com/EQEmu/Server/pull/4952)) @Akkadius 2025-06-25
+* PathManager Global to Singleton Cleanup ([#4924](https://github.com/EQEmu/Server/pull/4924)) @Akkadius 2025-06-22
+* PetitionList Global to Singleton Cleanup ([#4944](https://github.com/EQEmu/Server/pull/4944)) @Kinglykrab 2025-06-25
+* PlayerEventLogs Global to Singleton Cleanup ([#4928](https://github.com/EQEmu/Server/pull/4928)) @Kinglykrab 2025-06-25
+* QueryServConnection Global to Singleton Cleanup ([#4938](https://github.com/EQEmu/Server/pull/4938)) @Kinglykrab 2025-06-25
+* Remove Lua Rule Constants ([#4949](https://github.com/EQEmu/Server/pull/4949)) @Akkadius 2025-06-22
+* Remove Regex Compile Bloat ([#4947](https://github.com/EQEmu/Server/pull/4947)) @Akkadius 2025-06-22
+* Remove Unused MZoneShutdown Mutex ([#4946](https://github.com/EQEmu/Server/pull/4946)) @Kinglykrab 2025-06-22
+* SharedTaskManager Global to Singleton Cleanup ([#4930](https://github.com/EQEmu/Server/pull/4930)) @Kinglykrab 2025-06-25
+* SkillCaps Global to Singleton Cleanup ([#4933](https://github.com/EQEmu/Server/pull/4933)) @Kinglykrab 2025-06-22
+* TaskManager Global to Singleton Cleanup ([#4945](https://github.com/EQEmu/Server/pull/4945)) @Kinglykrab 2025-06-22
+* UCSConnection Global to Singleton Cleanup ([#4937](https://github.com/EQEmu/Server/pull/4937)) @Kinglykrab 2025-06-25
+* WebInterfaceList Global to Singleton Cleanup ([#4935](https://github.com/EQEmu/Server/pull/4935)) @Kinglykrab 2025-06-25
+* WorldContentServer Global to Singleton Cleanup ([#4939](https://github.com/EQEmu/Server/pull/4939)) @Kinglykrab 2025-06-25
+* WorldEventScheduler and ZoneEventScheduler Global to Singleton Cleanup ([#4932](https://github.com/EQEmu/Server/pull/4932)) @Kinglykrab 2025-06-25
+* ZSList Global to Singleton Cleanup ([#4940](https://github.com/EQEmu/Server/pull/4940)) @Kinglykrab 2025-06-25
+* ZoneStore Global to Singleton Cleanup ([#4934](https://github.com/EQEmu/Server/pull/4934)) @Kinglykrab 2025-06-23
+
+### Corpses
+
+* Add corpse entity variables to DB ([#4911](https://github.com/EQEmu/Server/pull/4911)) @fryguy503 2025-06-25
+
+### Databuckets
+
+* Move Databuckets to Common ([#4918](https://github.com/EQEmu/Server/pull/4918)) @Akkadius 2025-06-16
+* Nested Caching ([#4917](https://github.com/EQEmu/Server/pull/4917)) @Akkadius 2025-06-25
+
+### Doors
+
+* Fix door saving for versions ([#4905](https://github.com/EQEmu/Server/pull/4905)) @nytmyr 2025-06-09
+
+### Fixes
+
+* Bulk Send Corpses after Idle State ([#4910](https://github.com/EQEmu/Server/pull/4910)) @Akkadius 2025-06-09
+* Fix ClientList Singleton Shortcomings of #4942  @Akkadius 2025-06-25
+* Fix breaking changes to Titanium, SoF, SoD patches causes by big bags update ([#4922](https://github.com/EQEmu/Server/pull/4922)) @regneq 2025-06-25
+
+### Logs
+
+* Fix output for tasks in logs ([#4907](https://github.com/EQEmu/Server/pull/4907)) @joligario 2025-06-09
+
+### Performance
+
+* Auto Idle / AFK ([#4903](https://github.com/EQEmu/Server/pull/4903)) @Akkadius 2025-05-22
+* Wearchange Packet Send Deduplication ([#4916](https://github.com/EQEmu/Server/pull/4916)) @Akkadius 2025-06-25
+
+### Player Event Logs
+
+* Don't Clear Event Data on ETL Events ([#4913](https://github.com/EQEmu/Server/pull/4913)) @Akkadius 2025-06-25
+
+### Player Events
+
+* Don't Write Empty Data ([#4912](https://github.com/EQEmu/Server/pull/4912)) @Akkadius 2025-06-25
+* Zone Fetch Settings from QS if Enabled ([#4915](https://github.com/EQEmu/Server/pull/4915)) @Akkadius 2025-06-25
+
+### Quest API
+
+* Add CompleteTask and UncompleteTask methods to Perl/Lua ([#4921](https://github.com/EQEmu/Server/pull/4921)) @Barathos 2025-06-25
+* Lua Client Scoped EnableTitleSets ([#4914](https://github.com/EQEmu/Server/pull/4914)) @fryguy503 2025-06-25
+
+### Quests
+
+* Support Multiple Quest, Plugin, and Lua Module Paths ([#4906](https://github.com/EQEmu/Server/pull/4906)) @Akkadius 2025-06-09
+
+### World API
+
+* Input Validation ([#4904](https://github.com/EQEmu/Server/pull/4904)) @Akkadius 2025-05-22
+
+## [23.7.0] 5/19/2025
+
+### CLI
+
+* Add custom database version output ([#4901](https://github.com/EQEmu/Server/pull/4901)) @joligario 2025-05-18
+* Fix MySQL check in database dumper ([#4897](https://github.com/EQEmu/Server/pull/4897)) @joligario 2025-05-16
+
+### Commands
+
+* Add #zonevariable Command ([#4882](https://github.com/EQEmu/Server/pull/4882)) @Kinglykrab 2025-05-15
+
+### Database
+
+* Add Custom Database Migrations for Operators ([#4892](https://github.com/EQEmu/Server/pull/4892)) @Akkadius 2025-05-16
+* Remove Transaction Wrapped Character Save ([#4894](https://github.com/EQEmu/Server/pull/4894)) @Akkadius 2025-05-16
+
+### Fixes
+
+* Deadlock on failed #copycharacter commands ([#4887](https://github.com/EQEmu/Server/pull/4887)) @Akkadius 2025-05-16
+
+### Logging
+
+* Auto Update Log Category Names ([#4890](https://github.com/EQEmu/Server/pull/4890)) @Akkadius 2025-05-16
+
+### Netcode
+
+* Resend Logic Adjustments ([#4900](https://github.com/EQEmu/Server/pull/4900)) @Akkadius 2025-05-18
+
+### Player Events
+
+* Add rule to ignore configured GM commands ([#4888](https://github.com/EQEmu/Server/pull/4888)) @Akkadius 2025-05-16
+
+### Rules
+
+* Auto Update Rule Notes from Source ([#4891](https://github.com/EQEmu/Server/pull/4891)) @Akkadius 2025-05-16
+
+### World
+
+* Fix Rarer Reload Deadlock ([#4893](https://github.com/EQEmu/Server/pull/4893)) @Akkadius 2025-05-16
+
+### Zone State
+
+* Load New Spawn2 Data When Present ([#4889](https://github.com/EQEmu/Server/pull/4889)) @Akkadius 2025-05-16
+
+## [23.6.0] 5/14/2025
+
+### Bots
+
+* Correct ^pull logic and add checks for Enchanter pets ([#4827](https://github.com/EQEmu/Server/pull/4827)) @nytmyr 2025-05-15
+* Fix creation limit, spawn limit, level requirement checks ([#4868](https://github.com/EQEmu/Server/pull/4868)) @nytmyr 2025-05-15
+* Move all spell_id instances to uint16 ([#4876](https://github.com/EQEmu/Server/pull/4876)) @nytmyr 2025-05-15
+* Prevent non-taunters from potentially fleeing mob on TargetReflection ([#4859](https://github.com/EQEmu/Server/pull/4859)) @nytmyr 2025-04-28
+
+### CLI
+
+* ETL Settings Output ([#4873](https://github.com/EQEmu/Server/pull/4873)) @joligario 2025-05-15
+
+### Code
+
+* Fix typo in QueryNameAvailablity ([#4869](https://github.com/EQEmu/Server/pull/4869)) @nytmyr 2025-04-28
+
+### Crash
+
+* Fix crash bug with pbae and quest scripts spawning mobs ([#4884](https://github.com/EQEmu/Server/pull/4884)) @carolus21rex 2025-05-15
+
+### Feature
+
+* Add Character:TradeskillUpMinChance rule ([#4867](https://github.com/EQEmu/Server/pull/4867)) @zrix-eq 2025-05-15
+* Enable spawn attribute for NPCTintID ([#4871](https://github.com/EQEmu/Server/pull/4871)) @neckkola 2025-05-15
+
+### Fixes
+
+* Add trader/buyer cleanup actions ([#4843](https://github.com/EQEmu/Server/pull/4843)) @neckkola 2025-05-15
+* Fix #copycharacter command ([#4860](https://github.com/EQEmu/Server/pull/4860)) @nytmyr 2025-04-28
+* Fix Crash with #task ([#4874](https://github.com/EQEmu/Server/pull/4874)) @Kinglykrab 2025-04-30
+* Fix Object Name Init, User Refs, and Client Sync on Close ([#4861](https://github.com/EQEmu/Server/pull/4861)) @zimp-wow 2025-05-15
+* Fix breaking change to UF patches caused by Big Bags update ([#4883](https://github.com/EQEmu/Server/pull/4883)) @hbingram 2025-05-15
+* Prevent Ranged Attack from being triggered at arbitrary rate ([#4879](https://github.com/EQEmu/Server/pull/4879)) @catapultam-habeo 2025-05-15
+
+### Performance
+
+* Store Player Title Sets in Client Memory ([#4836](https://github.com/EQEmu/Server/pull/4836)) @Kinglykrab 2025-05-15
+
+### Quest API
+
+* Add Last Login and First Login Flags to EVENT_CONNECT ([#4866](https://github.com/EQEmu/Server/pull/4866)) @Kinglykrab 2025-05-15
+
+## [23.5.0] 4/10/2025
+
+### API
+
+* World API Optimizations ([#4850](https://github.com/EQEmu/Server/pull/4850)) @Akkadius 2025-04-10
+
+### Bots
+
+* Add valid state checks to ^clickitem ([#4830](https://github.com/EQEmu/Server/pull/4830)) @nytmyr 2025-04-10
+* Flag all buffs with SE_DamageShield as Damage Shield ([#4833](https://github.com/EQEmu/Server/pull/4833)) @nytmyr 2025-04-10
+* Positioning rewrite ([#4856](https://github.com/EQEmu/Server/pull/4856)) @nytmyr 2025-04-10
+* Restore old buff overwrite blocking ([#4832](https://github.com/EQEmu/Server/pull/4832)) @nytmyr 2025-04-10
+
+### Bugfix
+
+* Load zone variables before encounter_load. ([#4846](https://github.com/EQEmu/Server/pull/4846)) @zimp-wow 2025-04-10
+* Prevent depops from blocking new spawns. ([#4841](https://github.com/EQEmu/Server/pull/4841)) @zimp-wow 2025-04-10
+* Prevent final shutdown from persisting incomplete state. ([#4849](https://github.com/EQEmu/Server/pull/4849)) @zimp-wow 2025-04-10
+
+### Code
+
+* Remove queryserv dump flag ([#4842](https://github.com/EQEmu/Server/pull/4842)) @joligario 2025-04-10
+* Update link for legacy EQEmu loginserver account setup ([#4826](https://github.com/EQEmu/Server/pull/4826)) @joligario 2025-04-10
+
+### Crash
+
+* Fix rarer exception crash issue in PlayerEventLogs::ProcessBatchQueue ([#4835](https://github.com/EQEmu/Server/pull/4835)) @Akkadius 2025-04-03
+
+### Database
+
+* Fix manifest for `helmtexture` in `horses` table ([#4852](https://github.com/EQEmu/Server/pull/4852)) @joligario 2025-04-10
+
+### Feature
+
+* Add rule to consume command text from any channel ([#4839](https://github.com/EQEmu/Server/pull/4839)) @catapultam-habeo 2025-04-10
+
+### Fixes
+
+* Add the bazaar search limit to query ([#4829](https://github.com/EQEmu/Server/pull/4829)) @neckkola 2025-04-10
+* Backfill expire_at (not sure why this didn't make it in there to begin with)  @Akkadius 2025-03-31
+* Bazaar Search window not working in a DZ ([#4828](https://github.com/EQEmu/Server/pull/4828)) @neckkola 2025-04-10
+* Databuckets Account Cache Loading ([#4855](https://github.com/EQEmu/Server/pull/4855)) @Akkadius 2025-04-10
+* Fix missing timer_name check on Mob::StopTimer ([#4840](https://github.com/EQEmu/Server/pull/4840)) @zimp-wow 2025-04-04
+* FixHeading Infinite Loop Fix ([#4854](https://github.com/EQEmu/Server/pull/4854)) @KimLS 2025-04-10
+* Make sure we don't expire default value instances  @Akkadius 2025-03-31
+* Regression in World SendEmoteMessageRaw ([#4837](https://github.com/EQEmu/Server/pull/4837)) @Akkadius 2025-04-03
+* Remove QS Tables From Export  @Akkadius 2025-04-10
+* Zone State Spawn2 Location Restore ([#4844](https://github.com/EQEmu/Server/pull/4844)) @Akkadius 2025-04-10
+
+### Netcode
+
+* Fix Stale Client Edge Case ([#4853](https://github.com/EQEmu/Server/pull/4853)) @Akkadius 2025-04-10
+
+### Performance
+
+* Character Save Optimizations ([#4851](https://github.com/EQEmu/Server/pull/4851)) @Akkadius 2025-04-10
+* Network Ring Buffers ([#4857](https://github.com/EQEmu/Server/pull/4857)) @Akkadius 2025-04-10
+* Pre-Compute CLE Server Lists ([#4838](https://github.com/EQEmu/Server/pull/4838)) @Akkadius 2025-04-10
+
+### Spells
+
+* Fear resistance effects edge case fixes and support for SPA 102 as an AA ([#4848](https://github.com/EQEmu/Server/pull/4848)) @KayenEQ 2025-04-10
+* Update to SPA 180 SE_ResistSpellChance to not block unresistable spells. ([#4847](https://github.com/EQEmu/Server/pull/4847)) @KayenEQ 2025-04-10
+* Update to SPA 378 SE_SpellEffectResistChance ([#4845](https://github.com/EQEmu/Server/pull/4845)) @KayenEQ 2025-04-10
+
+## [23.4.0] 3/30/2025
+
+### API
+
+* Expose Zoneserver Compile Metadata ([#4815](https://github.com/EQEmu/Server/pull/4815)) @Akkadius 2025-03-29
+
+### Bots
+
+* Charmed Pets were breaking Mob respawns ([#4780](https://github.com/EQEmu/Server/pull/4780)) @nytmyr 2025-03-16
+* Enraged positioning ([#4789](https://github.com/EQEmu/Server/pull/4789)) @nytmyr 2025-03-29
+* Fix IsValidSpellTypeBySpellID to account for all types ([#4764](https://github.com/EQEmu/Server/pull/4764)) @nytmyr 2025-03-19
+* Fix Rule ZonesWithSpawnLimits/ZonesWithForcedSpawnLimits errors ([#4791](https://github.com/EQEmu/Server/pull/4791)) @nytmyr 2025-03-29
+* Fix rule Bots:FinishBuffing ([#4788](https://github.com/EQEmu/Server/pull/4788)) @nytmyr 2025-03-29
+* Line of Sight and Mez optimizations and cleanup ([#4746](https://github.com/EQEmu/Server/pull/4746)) @nytmyr 2025-03-29
+* Prevent bot pets from despawning on #repop ([#4790](https://github.com/EQEmu/Server/pull/4790)) @nytmyr 2025-03-29
+
+### Code
+
+* Control flow defaults missed in recent bot updates ([#4817](https://github.com/EQEmu/Server/pull/4817)) @joligario 2025-03-30
+* Remove Extraneous Time Type in ShowZoneData ([#4806](https://github.com/EQEmu/Server/pull/4806)) @Kinglykrab 2025-03-29
+* Remove Unused Command Methods ([#4805](https://github.com/EQEmu/Server/pull/4805)) @Kinglykrab 2025-03-29
+* UCS Member Count ([#4819](https://github.com/EQEmu/Server/pull/4819)) @joligario 2025-03-30
+
+### Commands
+
+* Add #show zone_variables ([#4812](https://github.com/EQEmu/Server/pull/4812)) @Akkadius 2025-03-29
+* Add Instance Support to #zoneshutdown ([#4807](https://github.com/EQEmu/Server/pull/4807)) @Kinglykrab 2025-03-29
+
+### Crash
+
+* Fix Rarer World Crash with Player Event Thread Processor ([#4800](https://github.com/EQEmu/Server/pull/4800)) @Akkadius 2025-03-29
+* Fix Repop Race Condition Crash ([#4814](https://github.com/EQEmu/Server/pull/4814)) @Akkadius 2025-03-29
+
+### Database
+
+* Fix Respawn Times Table ([#4802](https://github.com/EQEmu/Server/pull/4802)) @Akkadius 2025-03-29
+* Wrap PurgeExpiredInstances in a Transaction ([#4824](https://github.com/EQEmu/Server/pull/4824)) @Akkadius 2025-03-30
+
+### Feature
+
+* Implement /changename & related script bindings. Clean up #set name ([#4770](https://github.com/EQEmu/Server/pull/4770)) @catapultam-habeo 2025-03-20
+
+### Fixes
+
+* AllowFVNoDrop Flag trades ([#4809](https://github.com/EQEmu/Server/pull/4809)) @neckkola 2025-03-27
+* Fix Instance Creation Race Condition ([#4803](https://github.com/EQEmu/Server/pull/4803)) @Akkadius 2025-03-29
+* Fix zone crash when attempting to add a disappearing client to hate list. ([#4782](https://github.com/EQEmu/Server/pull/4782)) @zimp-wow 2025-03-19
+* Globally Reloading Quests when not loaded ([#4813](https://github.com/EQEmu/Server/pull/4813)) @Akkadius 2025-03-29
+* Instance DZ Creation ([#4823](https://github.com/EQEmu/Server/pull/4823)) @Akkadius 2025-03-30
+* Zone State Entity Variable Load Pre-Spawn ([#4785](https://github.com/EQEmu/Server/pull/4785)) @Akkadius 2025-03-19
+* Zone State Position Fix ([#4784](https://github.com/EQEmu/Server/pull/4784)) @Akkadius 2025-03-19
+* Zone State Variables Load First ([#4798](https://github.com/EQEmu/Server/pull/4798)) @Akkadius 2025-03-29
+* Zone state edge case with 0 hp ([#4787](https://github.com/EQEmu/Server/pull/4787)) @Akkadius 2025-03-29
+
+### Instance
+
+* Clear Respawn Timers on Creation ([#4801](https://github.com/EQEmu/Server/pull/4801)) @Akkadius 2025-03-29
+
+### Instances
+
+* Add `expire_at` Column ([#4820](https://github.com/EQEmu/Server/pull/4820)) @Akkadius 2025-03-30
+
+### Performance
+
+* Add several database indexes ([#4811](https://github.com/EQEmu/Server/pull/4811)) @Akkadius 2025-03-29
+* Have World Send Smarter Guild Updates ([#4796](https://github.com/EQEmu/Server/pull/4796)) @Akkadius 2025-03-29
+* Improve Character Select DB Performance ([#4799](https://github.com/EQEmu/Server/pull/4799)) @Akkadius 2025-03-29
+* Reduce Adventure S2S chatter ([#4793](https://github.com/EQEmu/Server/pull/4793)) @Akkadius 2025-03-29
+* Reduce CorpseOwnerOnline S2S Chatter to World ([#4795](https://github.com/EQEmu/Server/pull/4795)) @Akkadius 2025-03-29
+* Reduce LFGuild Chatter ([#4794](https://github.com/EQEmu/Server/pull/4794)) @Akkadius 2025-03-29
+* Reduce UpdateWho S2S Chatter to World ([#4792](https://github.com/EQEmu/Server/pull/4792)) @Akkadius 2025-03-29
+* Send Smarter Emote Packets ([#4818](https://github.com/EQEmu/Server/pull/4818)) @Akkadius 2025-03-30
+
+### Quest API
+
+* Add Support for NPC ID and NPC Name Specificity ([#4781](https://github.com/EQEmu/Server/pull/4781)) @Kinglykrab 2025-03-19
+
+### Reload
+
+* Add Reload for Maps / Navs ([#4816](https://github.com/EQEmu/Server/pull/4816)) @Akkadius 2025-03-29
+
+### Zone
+
+* Zone State Automated Testing and Improvements ([#4808](https://github.com/EQEmu/Server/pull/4808)) @Akkadius 2025-03-30
+* Zone State Improvements Part 3 ([#4773](https://github.com/EQEmu/Server/pull/4773)) @Akkadius 2025-03-13
+
+## [23.3.4] 3/14/2025
+
+### Fixes
+
+* Add check for simultaneous direct vendor and parcel Trader/Buyer Purchase ([#4778](https://github.com/EQEmu/Server/pull/4778)) @neckkola 2025-03-14
+* Fix for rare circumstance where NPC's would have 0 health on restore @Akkadius
+
+## [23.3.3] 3/13/2025
+
+### Database
+
+* Add indexes for data_buckets and zone_state_spawns ([#4771](https://github.com/EQEmu/Server/pull/4771)) @Akkadius 2025-03-11
+
+### Fixes
+
+* Update GuildBank to correctly handle items with charges equal to zero ([#4774](https://github.com/EQEmu/Server/pull/4774)) @neckkola 2025-03-13
+
+### Networking
+
+* Fix "port in use" error ([#4772](https://github.com/EQEmu/Server/pull/4772)) @Akkadius 2025-03-12
+
+### Zone
+
+* Zone State Improvements Part 3 ([#4773](https://github.com/EQEmu/Server/pull/4773)) @Akkadius 2025-03-13
+
+## [23.3.2] 3/11/2025
+
+### DynamicZones
+
+* Bulk request dz member statuses on zone boot ([#4769](https://github.com/EQEmu/Server/pull/4769)) @hgtw 2025-03-11
+
+### Zone
+
+* Zone State Improvements (Continued) ([#4768](https://github.com/EQEmu/Server/pull/4768)) @Akkadius 2025-03-11
+
+## [23.3.0] 3/8/2025
+
+### Bots
+
+* Fix buffs not overwriting lesser buffs ([#4756](https://github.com/EQEmu/Server/pull/4756)) @nytmyr 2025-03-06
+* Fix taunting bots positioning ([#4754](https://github.com/EQEmu/Server/pull/4754)) @nytmyr 2025-03-06
+* Move commanded spell map to zone ([#4755](https://github.com/EQEmu/Server/pull/4755)) @nytmyr 2025-03-06
+
+### Code
+
+* Fix typo in GM tradeskill combine message ([#4762](https://github.com/EQEmu/Server/pull/4762)) @nytmyr 2025-03-08
+
+### Crash
+
+* Bot aura crash fix ([#4752](https://github.com/EQEmu/Server/pull/4752)) @nytmyr 2025-03-06
+
+### Databuckets
+
+* Nested Databuckets Protections and Improvements ([#4748](https://github.com/EQEmu/Server/pull/4748)) @Akkadius 2025-03-04
+
+### Feature
+
+* Add Rule for dealing with augments when an item evolves ([#4758](https://github.com/EQEmu/Server/pull/4758)) @neckkola 2025-03-08
+* Allow assigning Helm Texture independently of Body Texture for Horses ([#4759](https://github.com/EQEmu/Server/pull/4759)) @catapultam-habeo 2025-03-08
+
+### Fixes
+
+* Add crash checks for certain PlayerEventLogs ([#4761](https://github.com/EQEmu/Server/pull/4761)) @neckkola 2025-03-07
+* Correct incorrectly calculated stat caps with Heroic Stats ([#4760](https://github.com/EQEmu/Server/pull/4760)) @catapultam-habeo 2025-03-08
+* Fix sigabort crash from invalid JSON  @Akkadius 2025-03-03
+* Forgot to push up some changes for test output  @Akkadius 2025-03-04
+* Parcel Delivery Updates for two edge cases ([#4753](https://github.com/EQEmu/Server/pull/4753)) @neckkola 2025-03-06
+* Remove one port check in world  @Akkadius 2025-03-03
+* Zero out currentnpcid whenever spawn is reset. ([#4763](https://github.com/EQEmu/Server/pull/4763)) @zimp-wow 2025-03-08
+
+### Logging
+
+* Convert JSON Error to Data Buckets Logging Category ([#4747](https://github.com/EQEmu/Server/pull/4747)) @Kinglykrab 2025-03-04
+
+### Pets
+
+* Fix renamed pets loading as blank names ([#4751](https://github.com/EQEmu/Server/pull/4751)) @nytmyr 2025-03-05
+
+### Rules
+
+* Fix EvolvingItems:PercentOfRaidExperience Description ([#4757](https://github.com/EQEmu/Server/pull/4757)) @Kinglykrab 2025-03-07
+
+### Tests
+
+* Cleanup Hand-in Tests ([#4749](https://github.com/EQEmu/Server/pull/4749)) @Akkadius 2025-03-04
+
+### Zone
+
+* Make zone controller less likely to be visible, immune to all forms of combat ([#4750](https://github.com/EQEmu/Server/pull/4750)) @Akkadius 2025-03-06
+* State Save Improvements ([#4765](https://github.com/EQEmu/Server/pull/4765)) @Akkadius 2025-03-08
+
 ## [23.2.0] 3/3/2025
 
 ### Crash

CMakeLists.txt

@@ -1,487 +1,187 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+cmake_minimum_required(VERSION 3.20.0)
 
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/" ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/" ${CMAKE_MODULE_PATH})
 
-IF(POLICY CMP0074)
+if(NOT CMAKE_TOOLCHAIN_FILE)
-	CMAKE_POLICY(SET CMP0074 NEW)
+	if(DEFINED ENV{VCPKG_ROOT})
-ENDIF()
+		message(STATUS "Using vcpkg from VCPKG_ROOT")
+		set(CMAKE_TOOLCHAIN_FILE
+			"$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+			CACHE FILEPATH "Vcpkg toolchain file"
+		)
+	else()
+		message(STATUS "Using vcpkg submodule")
+		set(CMAKE_TOOLCHAIN_FILE
+			"${CMAKE_CURRENT_SOURCE_DIR}/submodules/vcpkg/scripts/buildsystems/vcpkg.cmake"
+			CACHE FILEPATH "Vcpkg toolchain file"
+		)
+	endif()
+endif()
 
-PROJECT(EQEmu)
+project(EQEmu
+	VERSION 24.10.3
+	LANGUAGES CXX
+)
 
-IF(NOT CMAKE_BUILD_TYPE)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-	SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
-ENDIF(NOT CMAKE_BUILD_TYPE)
 
-SET(CMAKE_CXX_STANDARD 20)
+#explicitly set CMP0167 for Find Boost
-SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+if(POLICY CMP0167)
-SET(CMAKE_CXX_EXTENSIONS OFF)
+  cmake_policy(SET CMP0167 NEW)
+endif()
 
-OPTION(EQEMU_BUILD_STATIC "Build with static linking" OFF)
+if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-OPTION(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)
+	set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type")
+endif()
 
-IF (EQEMU_BUILD_STATIC)
+set(CMAKE_CXX_STANDARD 20)
-	SET(BUILD_SHARED_LIBS OFF)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+set(CMAKE_CXX_EXTENSIONS OFF)
-	MESSAGE(STATUS "Building with static linking")
-	SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
-	IF (UNIX)
-		SET(PERL_LIBRARY "/opt/eqemu-perl/lib/5.32.1/x86_64-linux-thread-multi/CORE/libperl.so")
-		SET(PERL_INCLUDE_PATH "/opt/eqemu-perl/lib/5.32.1/x86_64-linux-thread-multi/CORE/")
-		SET(PERL_EXECUTABLE "/opt/eqemu-perl/bin/perl")
-	ENDIF ()
-ENDIF (EQEMU_BUILD_STATIC)
 
+option(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)
 
-# Requires libgoogle-perftools-dev google-perftools packages for linux (debian)
+if(MSVC)
-IF(EQEMU_ADD_PROFILER)
+	add_compile_options(/bigobj)
-	SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed,-lprofiler,--as-needed")
+	add_compile_definitions(_CRT_SECURE_NO_WARNINGS NOMINMAX WIN32_LEAN_AND_MEAN CRASH_LOGGING _HAS_AUTO_PTR_ETC)
-ENDIF(EQEMU_ADD_PROFILER)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 
-IF(USE_MAP_MMFS)
+	option(EQEMU_DISABLE_MSVC_WARNINGS "Disable MSVC compile warnings." OFF)
-	ADD_DEFINITIONS(-DUSE_MAP_MMFS)
+	if(EQEMU_DISABLE_MSVC_WARNINGS)
-ENDIF (USE_MAP_MMFS)
+		add_compile_options(/W0 /wd4005 /wd4996 /nologo /Os)
+	endif()
 
-IF(MSVC)
+	option(EQEMU_MSVC_DEBUG_CRT "Use the debug CRT on MSVC debug builds" OFF)
-	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+	if(EQEMU_MSVC_DEBUG_CRT)
-	ADD_DEFINITIONS(-DNOMINMAX)
+		add_compile_definitions(_CRT_DBG_MAP_ALLOC)
-	ADD_DEFINITIONS(-DCRASH_LOGGING)
+	endif()
-	ADD_DEFINITIONS(-D_HAS_AUTO_PTR_ETC) # for Luabind on C++17
+else()
-
+	add_compile_definitions(HAS_UNION_SEMUN)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+endif()
-
-	OPTION(EQEMU_DISABLE_MSVC_WARNINGS "Disable MSVC compile warnings." ON)
-	IF(EQEMU_DISABLE_MSVC_WARNINGS)
-		ADD_DEFINITIONS( "/W0 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo /Os")
-	ENDIF(EQEMU_DISABLE_MSVC_WARNINGS)
-ELSE(MSVC)
-	ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
-ENDIF(MSVC)
 
 #FreeBSD support
-IF(UNIX)
+if(UNIX)
-	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+	if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-		ADD_DEFINITIONS(-DFREEBSD)
+		add_compile_definitions(FREEBSD)
-		ADD_DEFINITIONS(-D_GLIBCXX_USE_C99)
+		add_compile_definitions(_GLIBCXX_USE_C99)
-		SET(FREEBSD TRUE)
+		set(FREEBSD TRUE)
-	ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+	endif()
-	IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+	if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-		ADD_DEFINITIONS(-DDARWIN)
+		add_compile_definitions(DARWIN)
-		SET(DARWIN TRUE)
+		set(DARWIN TRUE)
-	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+	endif()
-ENDIF(UNIX)
+endif()
 
-ADD_DEFINITIONS(-DGLM_FORCE_RADIANS)
+find_package(Boost REQUIRED COMPONENTS dynamic_bitset foreach tuple)
-ADD_DEFINITIONS(-DGLM_FORCE_CTOR_INIT)
+find_package(cereal CONFIG REQUIRED)
-ADD_DEFINITIONS(-DGLM_ENABLE_EXPERIMENTAL)
+find_package(fmt CONFIG REQUIRED)
+find_package(glm CONFIG REQUIRED)
+find_package(unofficial-libmariadb CONFIG REQUIRED)
+find_package(libuv CONFIG REQUIRED)
+find_package(OpenSSL REQUIRED)
+find_package(recastnavigation CONFIG REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(LuaJit REQUIRED)
+find_package(unofficial-sodium CONFIG REQUIRED)
+find_package(PerlLibs)
 
-#MSVC can fetch dependencies automatically.
+message(STATUS "**************************************************")
-IF(MSVC)
+message(STATUS "* Library Detection                              *")
-	INCLUDE("${CMAKE_SOURCE_DIR}/cmake/DependencyHelperMSVC.cmake")
+message(STATUS "**************************************************")
-ENDIF()
 
-#Find everything we need
+if(MARIADB_FOUND)
-FIND_PACKAGE(Boost REQUIRED)
+	message(STATUS "* MariaDB:                                 FOUND *")
-FIND_PACKAGE(MySQL)
+else()
-FIND_PACKAGE(MariaDB)
+	message(STATUS "* MariaDB:                               MISSING *")
-FIND_PACKAGE(ZLIB)
+endif()
-FIND_PACKAGE(OpenSSL)
-FIND_PACKAGE(Lua51)
-FIND_PACKAGE(LuaJit)
-FIND_PACKAGE(PerlLibs)
-FIND_PACKAGE(Sodium)
-FIND_PACKAGE(mbedTLS)
 
-MESSAGE(STATUS "**************************************************")
+if(ZLIB_FOUND)
-MESSAGE(STATUS "* Library Detection                              *")
+	message(STATUS "* ZLIB:                                    FOUND *")
-MESSAGE(STATUS "**************************************************")
+else()
+	message(STATUS "* ZLIB:                                  MISSING *")
+endif()
 
-IF(MYSQL_FOUND)
+if(LuaJit_FOUND)
-	MESSAGE(STATUS "* MySQL:                                   FOUND *")
+	message(STATUS "* LuaJIT:                                  FOUND *")
-ELSE()
+else()
-	MESSAGE(STATUS "* MySQL:                                 MISSING *")
+	message(STATUS "* LuaJIT:                                MISSING *")
-ENDIF()
+endif()
 
-IF(MARIADB_FOUND)
+if(PerlLibs_FOUND)
-	MESSAGE(STATUS "* MariaDB:                                 FOUND *")
+	message(STATUS "* Perl:                                    FOUND *")
-ELSE()
+else()
-	MESSAGE(STATUS "* MariaDB:                               MISSING *")
+	message(STATUS "* Perl:                                  MISSING *")
-ENDIF()
+endif()
 
-IF(ZLIB_FOUND)
+if(OpenSSL_FOUND)
-	MESSAGE(STATUS "* ZLIB:                                    FOUND *")
+	message(STATUS "* OpenSSL:                                 FOUND *")
-ELSE()
+else()
-	MESSAGE(STATUS "* ZLIB:                                  MISSING *")
+	message(STATUS "* OpenSSL:                               MISSING *")
-ENDIF()
+endif()
 
-IF(Lua51_FOUND)
+message(STATUS "PERL_INCLUDE_PATH: ${PERL_INCLUDE_PATH}")
-	MESSAGE(STATUS "* Lua:                                     FOUND *")
+message(STATUS "PERL_LIBRARY: ${PERL_LIBRARY}")
-ELSE()
+message(STATUS "PERL_INCLUDE_DIR: ${PERL_INCLUDE_DIR}")
-	MESSAGE(STATUS "* Lua:                                   MISSING *")
+message(STATUS "PERL_INCLUDE_DIRS: ${PERL_INCLUDE_DIRS}")
-ENDIF()
+message(STATUS "PERL_LIBRARIES: ${PERL_LIBRARIES}")
-
+message(STATUS "PERL_VERSION: ${PERL_VERSION}")
-IF(LuaJit_FOUND)
+message(STATUS "**************************************************")
-	MESSAGE(STATUS "* LuaJIT:                                  FOUND *")
-ELSE()
-	MESSAGE(STATUS "* LuaJIT:                                MISSING *")
-ENDIF()
-
-IF(PerlLibs_FOUND)
-	MESSAGE(STATUS "* Perl:                                    FOUND *")
-ELSE()
-	MESSAGE(STATUS "* Perl:                                  MISSING *")
-ENDIF()
-
-IF(SODIUM_FOUND)
-	MESSAGE(STATUS "* libsodium:                               FOUND *")
-ELSE()
-	MESSAGE(STATUS "* libsodium:                             MISSING *")
-ENDIF()
-
-IF(OpenSSL_FOUND)
-	MESSAGE(STATUS "* OpenSSL:                                 FOUND *")
-ELSE()
-	MESSAGE(STATUS "* OpenSSL:                               MISSING *")
-ENDIF()
-
-IF(MBEDTLS_FOUND)
-	MESSAGE(STATUS "* mbedTLS:                                 FOUND *")
-ELSE()
-	MESSAGE(STATUS "* mbedTLS:                               MISSING *")
-ENDIF()
-
-MESSAGE(STATUS "PERL_INCLUDE_PATH: ${PERL_INCLUDE_PATH}")
-MESSAGE(STATUS "PERL_LIBRARY: ${PERL_LIBRARY}")
-MESSAGE(STATUS "PERL_INCLUDE_DIR: ${PERL_INCLUDE_DIR}")
-MESSAGE(STATUS "PERL_INCLUDE_DIRS: ${PERL_INCLUDE_DIRS}")
-MESSAGE(STATUS "PERL_LIBRARIES: ${PERL_LIBRARIES}")
-MESSAGE(STATUS "PERL_VERSION: ${PERL_VERSION}")
-
-MESSAGE(STATUS "**************************************************")
 
 #options
-OPTION(EQEMU_COMMANDS_LOGGING "Enable GM Command logs" ON)
+option(EQEMU_BUILD_SERVER "Build the game server." ON)
-OPTION(EQEMU_BUILD_SERVER "Build the game server." ON)
+option(EQEMU_BUILD_LOGIN "Build the login server." ON)
-OPTION(EQEMU_BUILD_LOGIN "Build the login server." ON)
+option(EQEMU_BUILD_TESTS "Build utility tests." OFF)
-OPTION(EQEMU_BUILD_HC "Build the headless client." OFF)
+option(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
-OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF)
-OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
-OPTION(EQEMU_PREFER_LUA "Build with normal Lua even if LuaJIT is found." OFF)
 
-#PRNG options
+if(PerlLibs_FOUND)
-OPTION(EQEMU_ADDITIVE_LFIB_PRNG "Use Additive LFib for PRNG." OFF)
+	option(EQEMU_BUILD_PERL "Build Perl parser." ON)
-MARK_AS_ADVANCED(EQEMU_ADDITIVE_LFIB_PRNG)
-OPTION(EQEMU_BIASED_INT_DIST "Use biased int dist instead of uniform." OFF)
-MARK_AS_ADVANCED(EQEMU_BIASED_INT_DIST)
-SET(EQEMU_CUSTOM_PRNG_ENGINE "" CACHE STRING "Custom random engine. (ex. std::default_random_engine)")
-MARK_AS_ADVANCED(EQEMU_CUSTOM_PRNG_ENGINE)
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
+	if(EQEMU_BUILD_PERL)
-	OPTION(EQEMU_SFMT19937 "Use GCC's extention for SIMD Fast MT19937." OFF)
+		set(PERL_LIBRARY_TYPE "    Perl")
-	MARK_AS_ADVANCED(EQEMU_SFMT19937)
+	else()
-ENDIF()
+		set(PERL_LIBRARY_TYPE " Missing")
+	endif()
+else()
+	set(PERL_LIBRARY_TYPE "Disabled")
+endif()
 
-IF(EQEMU_ADDITIVE_LFIB_PRNG)
+message(STATUS "")
-	ADD_DEFINITIONS(-DUSE_ADDITIVE_LFIB_PRNG)
+message(STATUS "**************************************************")
-	IF(EQEMU_SFMT19937)
+message(STATUS "* Library Usage                                  *")
-		MESSAGE(STATUS "SFMT19937 and ADDITITVE_LFIB_PRNG both set, SFMT19937 ignored.")
+message(STATUS "**************************************************")
-		SET(EQEMU_SFMT19937 OFF)
+message(STATUS "* Database:                              MariaDB *")
-	ENDIF()
+message(STATUS "* TLS:                                   OpenSSL *")
-	IF(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
+message(STATUS "* Lua:                                    LuaJIT *")
-		MESSAGE(STATUS "CUSTOM_PRNG_ENGINE and ADDITITVE_LFIB_PRNG both set, CUSTOM_PRNG_ENGINE ignored.")
+message(STATUS "* Perl:                                 ${PERL_LIBRARY_TYPE} *")
-		SET(EQEMU_CUSTOM_PRNG_ENGINE "")
+message(STATUS "* zlib:                                     ZLIB *")
-	ENDIF()
+message(STATUS "**************************************************")
-ENDIF()
 
-IF(EQEMU_SFMT19937)
-	ADD_DEFINITIONS(-DUSE_SFMT19937)
-	IF(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
-		MESSAGE(STATUS "CUSTOM_PRNG_ENGINE and SFMT19937 both set, CUSTOM_PRNG_ENGINE ignored.")
-		SET(EQEMU_CUSTOM_PRNG_ENGINE "")
-	ENDIF()
-ENDIF()
 
-IF(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
+option(EQEMU_BUILD_LUA "Build Lua parser." ON)
-	ADD_DEFINITIONS(-DUSE_CUSTOM_PRNG_ENGINE=${EQEMU_CUSTOM_PRNG_ENGINE})
-ENDIF()
 
-IF(EQEMU_BIASED_INT_DIST)
+if(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_CLIENT_FILES)
-	ADD_DEFINITIONS(-DBIASED_INT_DIST)
+	add_subdirectory(common)
-ENDIF()
+	add_subdirectory(libs)
+else()
+	message(FATAL_ERROR "No targets were selected to build, we must build at least one target.")
+endif()
 
-IF(EQEMU_COMMANDS_LOGGING)
+if(EQEMU_BUILD_SERVER)
-	ADD_DEFINITIONS(-DCOMMANDS_LOGGING)
+	add_subdirectory(shared_memory)
-ENDIF(EQEMU_COMMANDS_LOGGING)
+	add_subdirectory(world)
+	add_subdirectory(zone)
+	add_subdirectory(ucs)
+	add_subdirectory(queryserv)
+	add_subdirectory(eqlaunch)
+endif()
 
-#database
+if(EQEMU_BUILD_LOGIN)
-IF(MySQL_FOUND AND MariaDB_FOUND)
+	add_subdirectory(loginserver)
-	SET(DATABASE_LIBRARY_SELECTION MariaDB CACHE STRING "Database library to use:
+endif()
-			MySQL
-			MariaDB"
-	)
 
-	IF(DATABASE_LIBRARY_SELECTION STREQUAL "MySQL")
+if(EQEMU_BUILD_TESTS)
-		SET(DATABASE_LIBRARY_TYPE "  MySQL")
+	add_subdirectory(tests)
-		SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
+endif()
-		SET(DATABASE_LIBRARY_INCLUDE ${MySQL_INCLUDE_DIR})
-	ELSEIF(DATABASE_LIBRARY_SELECTION STREQUAL "MariaDB")
-		SET(DATABASE_LIBRARY_TYPE "MariaDB")
-		SET(DATABASE_LIBRARY_LIBS ${MariaDB_LIBRARIES})
-		SET(DATABASE_LIBRARY_INCLUDE ${MariaDB_INCLUDE_DIR})
-	ELSE()
-		MESSAGE(FATAL_ERROR "Unknown database library set, should be one of: MySQL, MariaDB")
-	ENDIF()
-ELSEIF(MariaDB_FOUND)
-	SET(DATABASE_LIBRARY_TYPE "MariaDB")
-	SET(DATABASE_LIBRARY_LIBS ${MariaDB_LIBRARIES})
-	SET(DATABASE_LIBRARY_INCLUDE ${MariaDB_INCLUDE_DIR})
-ELSEIF(MySQL_FOUND)
-	SET(DATABASE_LIBRARY_TYPE "  MySQL")
-	SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
-	SET(DATABASE_LIBRARY_INCLUDE ${MySQL_INCLUDE_DIR})
-ELSE()
-	MESSAGE(FATAL_ERROR "One of MySQL or MariaDB is a required dependency.")
-ENDIF()
 
-#security
+if(EQEMU_BUILD_CLIENT_FILES)
-#prefer openssl to mbedtls (arbitrary)
+	add_subdirectory(client_files)
-IF(OpenSSL_FOUND AND MBEDTLS_FOUND)
+endif()
-	SET(TLS_LIBRARY_SELECTION OpenSSL CACHE STRING "TLS library to use:
-			OpenSSL
-			mbedTLS"
-	)
-
-	IF(TLS_LIBRARY_SELECTION STREQUAL "OpenSSL")
-		SET(TLS_LIBRARY_TYPE " OpenSSL")
-		SET(TLS_LIBRARY_ENABLED ON)
-		SET(TLS_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
-		SET(TLS_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
-		ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
-		IF(${OPENSSL_VERSION} VERSION_GREATER_EQUAL "1.1.1")
-			ADD_DEFINITIONS(-DCPPHTTPLIB_OPENSSL_SUPPORT)
-		ENDIF()
-	ELSEIF(TLS_LIBRARY_SELECTION STREQUAL "mbedTLS")
-		SET(TLS_LIBRARY_TYPE " mbedTLS")
-		SET(TLS_LIBRARY_ENABLED ON)
-		SET(TLS_LIBRARY_LIBS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
-		SET(TLS_LIBRARY_INCLUDE ${MBEDTLS_INCLUDE_DIR})
-		ADD_DEFINITIONS(-DEQEMU_USE_MBEDTLS)
-	ELSE()
-		MESSAGE(FATAL_ERROR "Unknown TLS library set, should be one of: OpenSSL, mbedTLS")
-	ENDIF()
-ELSEIF(OpenSSL_FOUND)
-	SET(TLS_LIBRARY_TYPE " OpenSSL")
-	SET(TLS_LIBRARY_ENABLED ON)
-	SET(TLS_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
-	SET(TLS_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
-	ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
-	IF(${OPENSSL_VERSION} VERSION_GREATER_EQUAL "1.1.1")
-		ADD_DEFINITIONS(-DCPPHTTPLIB_OPENSSL_SUPPORT)
-	ENDIF()
-ELSEIF(MBEDTLS_FOUND)
-	SET(TLS_LIBRARY_TYPE " mbedTLS")
-	SET(TLS_LIBRARY_ENABLED ON)
-	SET(TLS_LIBRARY_LIBS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
-	SET(TLS_LIBRARY_INCLUDE ${MBEDTLS_INCLUDE_DIR})
-	ADD_DEFINITIONS(-DEQEMU_USE_MBEDTLS)
-ELSE()
-	SET(TLS_LIBRARY_TYPE "Disabled")
-	SET(TLS_LIBRARY_ENABLED OFF)
-ENDIF()
-
-IF(SODIUM_FOUND)
-	SET(SODIUM_LIBRARY_TYPE "Libsodium")
-	SET(SODIUM_LIBRARY_ENABLED ON)
-	SET(SODIUM_LIBRARY_LIBS ${SODIUM_LIBRARIES})
-	SET(SODIUM_LIBRARY_INCLUDE ${SODIUM_INCLUDE_DIRS})
-	ADD_DEFINITIONS(-DENABLE_SECURITY)
-ELSE()
-	SET(SODIUM_LIBRARY_TYPE " Disabled")
-	SET(SODIUM_LIBRARY_ENABLED OFF)
-ENDIF()
-
-IF(LUAJIT_FOUND AND NOT (EQEMU_PREFER_LUA AND Lua51_FOUND))
-	SET(LUA_LIBRARY_TYPE "  LuaJIT")
-	SET(LUA_LIBRARY_ENABLED ON)
-	SET(LUA_LIBRARY_LIBS ${LUAJIT_LIBRARY} luabind)
-	SET(LUA_LIBRARY_INCLUDE ${LUAJIT_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
-ELSEIF(Lua51_FOUND )
-	SET(LUA_LIBRARY_TYPE " Lua 5.1")
-	SET(LUA_LIBRARY_ENABLED ON)
-	SET(LUA_LIBRARY_LIBS ${LUA_LIBRARY} luabind)
-	SET(LUA_LIBRARY_INCLUDE ${LUA_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
-ELSE()
-	SET(LUA_LIBRARY_TYPE "Disabled")
-	SET(LUA_LIBRARY_ENABLED OFF)
-ENDIF()
-
-IF(PerlLibs_FOUND)
-	SET(PERL_LIBRARY_TYPE "    Perl")
-	SET(PERL_LIBRARY_ENABLED ON)
-	SET(PERL_LIBRARY_LIBS ${PERL_LIBRARY})
-	SET(PERL_LIBRARY_INCLUDE ${PERL_INCLUDE_PATH})
-ELSE()
-	SET(PERL_LIBRARY_TYPE "Disabled")
-	SET(PERL_LIBRARY_ENABLED OFF)
-ENDIF()
-
-#use zlib if exists
-IF(ZLIB_FOUND)
-	OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." ON)
-	IF(EQEMU_BUILD_ZLIB)
-		SET(ZLIB_LIBRARY_TYPE "zlib-ng")
-		SET(ZLIB_LIBRARY_LIBS "zlibstatic")
-		SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
-		INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_BINARY_DIR}/libs/zlibng")
-	ELSE()
-		SET(ZLIB_LIBRARY_TYPE "   zlib")
-		SET(ZLIB_LIBRARY_LIBS ${ZLIB_LIBRARY})
-		SET(ZLIB_LIBRARY_INCLUDE ${ZLIB_INCLUDE_DIRS})
-	ENDIF()
-ELSE()
-	SET(ZLIB_LIBRARY_TYPE "zlib-ng")
-	SET(ZLIB_LIBRARY_LIBS "zlibstatic")
-	SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
-ENDIF()
-
-IF (EQEMU_BUILD_STATIC)
-	SET(ZLIB_LIBRARY_LIBS libz.a)
-ENDIF(EQEMU_BUILD_STATIC)
-
-MESSAGE(STATUS "")
-MESSAGE(STATUS "**************************************************")
-MESSAGE(STATUS "* Library Usage                                  *")
-MESSAGE(STATUS "**************************************************")
-MESSAGE(STATUS "* Database:                              ${DATABASE_LIBRARY_TYPE} *")
-MESSAGE(STATUS "* TLS:                                  ${TLS_LIBRARY_TYPE} *")
-MESSAGE(STATUS "* Sodium:                              ${SODIUM_LIBRARY_TYPE} *")
-MESSAGE(STATUS "* Lua:                                  ${LUA_LIBRARY_TYPE} *")
-MESSAGE(STATUS "* Perl:                                 ${PERL_LIBRARY_TYPE} *")
-MESSAGE(STATUS "* zlib:                                  ${ZLIB_LIBRARY_TYPE} *")
-MESSAGE(STATUS "**************************************************")
-
-#setup server libs and headers
-SET(SERVER_LIBS common ${DATABASE_LIBRARY_LIBS} ${ZLIB_LIBRARY_LIBS} ${Boost_LIBRARIES} uv_a fmt RecastNavigation::Detour)
-
-INCLUDE_DIRECTORIES(SYSTEM "${DATABASE_LIBRARY_INCLUDE}")
-INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_LIBRARY_INCLUDE}")
-INCLUDE_DIRECTORIES(SYSTEM "${Boost_INCLUDE_DIRS}")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/glm")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/cereal/include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/fmt/include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/libuv/include" )
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DebugUtils/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Detour/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourCrowd/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourTileCache/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Recast/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp")
-
-# silence obnoxious deprecation message
-ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
-
-IF(TLS_LIBRARY_ENABLED)
-	SET(SERVER_LIBS ${SERVER_LIBS} ${TLS_LIBRARY_LIBS})
-	INCLUDE_DIRECTORIES(SYSTEM "${TLS_LIBRARY_INCLUDE}")
-ENDIF()
-
-IF(SODIUM_LIBRARY_ENABLED)
-	SET(SERVER_LIBS ${SERVER_LIBS} ${SODIUM_LIBRARY_LIBS})
-	INCLUDE_DIRECTORIES(SYSTEM "${SODIUM_LIBRARY_INCLUDE}")
-ENDIF()
-
-IF(LUA_LIBRARY_ENABLED)
-	OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
-
-	IF(EQEMU_BUILD_LUA)
-		ADD_DEFINITIONS(-DLUA_EQEMU)
-		SET(ZONE_LIBS ${LUA_LIBRARY_LIBS})
-		INCLUDE_DIRECTORIES(SYSTEM "${LUA_LIBRARY_INCLUDE}")
-
-		OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
-		IF(EQEMU_SANITIZE_LUA_LIBS)
-			ADD_DEFINITIONS(-DSANITIZE_LUA_LIBS)
-		ENDIF()
-	ENDIF()
-ENDIF()
-
-IF(PERL_LIBRARY_ENABLED)
-	OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON)
-	IF(EQEMU_BUILD_PERL)
-		SET(SERVER_LIBS ${SERVER_LIBS} ${PERL_LIBRARY_LIBS} perlbind)
-		INCLUDE_DIRECTORIES(SYSTEM "${PERL_LIBRARY_INCLUDE}")
-		ADD_DEFINITIONS(-DEMBPERL)
-		ADD_DEFINITIONS(-DEMBPERL_PLUGIN)
-		ADD_DEFINITIONS(-DPERLBIND_NO_STRICT_SCALAR_TYPES)
-		IF (UNIX AND EQEMU_BUILD_STATIC)
-			SET(SERVER_LIBS ${SERVER_LIBS} libcrypt.a)
-		ENDIF ()
-	ENDIF()
-ENDIF()
-
-IF(WIN32)
-	SET(SERVER_LIBS ${SERVER_LIBS} "ws2_32" "psapi" "iphlpapi" "userenv")
-ENDIF()
-
-IF(UNIX)
-	SET(SERVER_LIBS ${SERVER_LIBS} ${CMAKE_DL_LIBS} "z" "m" "pthread")
-	IF(NOT DARWIN)
-		SET(SERVER_LIBS ${SERVER_LIBS} "rt")
-	ENDIF()
-	# Freebsd provides uuids in the C library
-	IF(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-		SET(SERVER_LIBS ${SERVER_LIBS} "uuid")
-	ENDIF()
-ENDIF()
-
-SET(ZONE_LIBS ${ZONE_LIBS} ${SERVER_LIBS})
-
-IF(EQEMU_BUILD_LOGIN AND NOT TLS_LIBRARY_ENABLED)
-	MESSAGE(FATAL_ERROR "Login server requires a TLS Library to build.")
-ENDIF()
-
-IF(EQEMU_BUILD_HC AND NOT TLS_LIBRARY_ENABLED)
-	MESSAGE(FATAL_ERROR "Headless client requires a TLS Library to build.")
-ENDIF()
-
-IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
-	ADD_SUBDIRECTORY(common)
-	ADD_SUBDIRECTORY(libs)
-	ADD_SUBDIRECTORY(submodules/fmt)
-	ADD_SUBDIRECTORY(submodules/libuv)
-
-	IF(EQEMU_BUILD_ZLIB)
-		SET(ZLIB_COMPAT ON CACHE BOOL "Compile with zlib compatible API")
-		SET(ZLIB_ENABLE_TESTS OFF CACHE BOOL "Build test binaries")
-		ADD_SUBDIRECTORY(libs/zlibng)
-	ENDIF()
-
-	SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")
-	SET(RECASTNAVIGATION_TESTS OFF CACHE BOOL "Build tests")
-	SET(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "Build examples")
-	ADD_SUBDIRECTORY(submodules/recastnavigation)
-ENDIF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
-
-IF(EQEMU_BUILD_SERVER)
-	ADD_SUBDIRECTORY(shared_memory)
-	ADD_SUBDIRECTORY(world)
-	ADD_SUBDIRECTORY(zone)
-	ADD_SUBDIRECTORY(ucs)
-	ADD_SUBDIRECTORY(queryserv)
-	ADD_SUBDIRECTORY(eqlaunch)
-ENDIF(EQEMU_BUILD_SERVER)
-
-IF(EQEMU_BUILD_LOGIN)
-	ADD_SUBDIRECTORY(loginserver)
-ENDIF(EQEMU_BUILD_LOGIN)
-
-IF(EQEMU_BUILD_HC)
-	ADD_SUBDIRECTORY(hc)
-ENDIF(EQEMU_BUILD_HC)
-
-IF(EQEMU_BUILD_TESTS)
-	ADD_SUBDIRECTORY(tests)
-ENDIF(EQEMU_BUILD_TESTS)
-
-IF(EQEMU_BUILD_CLIENT_FILES)
-	ADD_SUBDIRECTORY(client_files)
-ENDIF(EQEMU_BUILD_CLIENT_FILES)

CMakePresets.json

@@ -0,0 +1,49 @@
+{
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 19,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "linux-debug",
+      "displayName": "Linux Debug",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+        "CMAKE_C_COMPILER_LAUNCHER": "ccache",
+        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+        "EQEMU_BUILD_LOGIN": "ON",
+        "EQEMU_BUILD_TESTS": "ON",
+        "EQEMU_ADD_PROFILER": "ON"
+      }
+    },
+    {
+      "name": "linux-release",
+      "displayName": "Linux Release",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/release",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_C_COMPILER_LAUNCHER": "ccache",
+        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+        "EQEMU_BUILD_LOGIN": "ON"
+      }
+    },
+  {
+      "name": "win-msvc",
+      "displayName": "Windows MSVC (VS 2022)",
+      "generator": "Visual Studio 17 2022",
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "architecture": { "value": "x64" },
+      "cacheVariables": {
+        "CMAKE_CONFIGURATION_TYPES": "Debug;Release",
+        "EQEMU_BUILD_LOGIN": "ON",
+        "EQEMU_BUILD_TESTS": "ON"
+      }
+    }
+  ]
+}

LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

LICENSE.md

@@ -0,0 +1,675 @@
+# GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+## Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+## TERMS AND CONDITIONS
+
+### 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+### 13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+## How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 3 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+        <program>  Copyright (C) <year>  <name of author>
+        This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+        This is free software, and you are welcome to redistribute it
+        under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see <https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read <https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,83 +1,150 @@
-# EQEmulator Core Server
+<h1 align="center">EQEmulator Server Platform</h1>
-| Drone (Linux x64) | Drone (Windows x64)   |
+
-|:---:|:---:|
+<p align="center">
-|[![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)   |[![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)   |
+ <img src="https://github.com/user-attachments/assets/11942e15-b512-402d-a619-0543c7f1151e" style="border-radius: 10px;">
+</p>
+
+<p align="center">
+<b>EQEmulator - A Fan-Made Project Honoring a Legendary MMORPG</b>
+</p>
+
+<p align="center">
+<a href="https://github.com/EQEmu/EQEmu/actions/workflows/build.yaml"><img src="https://github.com/EQEmu/EQEmu/actions/workflows/build.yaml/badge.svg"></a>
+<a href="https://github.com/EQEmu/EQEmu/graphs/contributors"><img src="https://img.shields.io/github/contributors/EQEmu/EQEmu" alt="Contributors"></a>
+<a href="https://discord.gg/QHsm7CD"><img src="https://img.shields.io/discord/212663220849213441?label=Discord&amp;logo=discord&amp;color=7289DA" alt="Discord"></a>
+<a href="https://docs.eqemu.dev"><img src="https://img.shields.io/badge/docs-MkDocs%20Powered-blueviolet" alt="Docs"></a>
+<a href="./LICENSE.md"><img src="https://img.shields.io/github/license/EQEmu/EQEmu" alt="License"></a>
+<a href="https://github.com/EQEmu/EQEmu/releases"><img src="https://img.shields.io/github/v/release/EQEmu/EQEmu" alt="Latest Release"></a>
+<a href="https://github.com/EQEmu/EQEmu/releases"><img src="https://img.shields.io/github/release-date/EQEmu/EQEmu" alt="Release Date"></a>
+<img src="https://img.shields.io/github/downloads/EQEmu/EQEmu/total.svg" alt="Github All Releases"></a>
+<img src="https://img.shields.io/github/issues-pr-closed/eqemu/server" alt="GitHub Issues or Pull Requests">
+<img src="https://img.shields.io/docker/pulls/akkadius/eqemu-server" alt="Docker Pulls">
+<img src="https://jb.gg/badges/official-plastic.svg" alt="Official">
+
+</p>
 
 ***
 
-**EQEmulator is a custom completely from-scratch open source server implementation for EverQuest built mostly on C++**
+<p align="center">
- * MySQL/MariaDB is used as the database engine (over 200+ tables)
+EQEmulator is a <b>passion-driven</b>, <b>open source server emulator</b> project dedicated to preserving and celebrating the legacy of a groundbreaking classic MMORPG.
- * Perl and LUA are both supported scripting languages for NPC/Player/Quest oriented events
+</p>
- * Open source database (Project EQ) has content up to expansion OoW (included in server installs)
-  * Game server environments and databases can be heavily customized to create all new experiences
- * Hundreds of Quests/events created and maintained by Project EQ
 
-## Server Installs
+<p align="center">
-| |Windows|Linux|
+For over two decades and continuing, EQEmulator has served as a <strong>fan tribute</strong>, providing tools and technology that allow players to explore, customize, and experience the legendary game's iconic gameplay in new ways. This project exists solely out of <strong>deep admiration</strong> for the original developers, artists, designers, and visionaries who created one of the most influential online worlds of all time.
-|:---:|:---:|:---:|
+</p>
-|**Install Count**|![Windows Install Count](http://analytics.akkadius.com/?install_count&windows_count)|![Linux Install Count](http://analytics.akkadius.com/?install_count&linux_count)| 
-### > Windows 
 
-* [Install Guide](https://docs.eqemu.io/server/installation/server-installation-windows/)
+<p align="center">
+We do not claim ownership of the original game or its assets. <strong>All credit and respect belong to the original creators and Daybreak Game Company</strong>, whose work continues to inspire generations of players and developers alike.
+</p>
 
-### > Debian/Ubuntu/CentOS/Fedora
+<p align="center">
+EQEmulator has for over 20 years and always will be a <strong>fan-based, non-commercial open-source effort</strong> made by players, for players—preserving the legacy of the game while empowering community-driven creativity, learning and joy that the game and its creators has so strongly inspired in us all.
+</p>
 
-* [Install Guide](https://docs.eqemu.io/server/installation/server-installation-linux/)
+***
 
-* You can use curl or wget to kick off the installer (whichever your OS has)
+<h3 align="center">
-> curl -O https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh install.sh && chmod 755 install.sh && ./install.sh
+ Technical Overview & Reverse Engineering Effort
+</h1>
 
-> wget --no-check-certificate https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh -O install.sh && chmod 755 install.sh && ./install.sh 
+<p align="center">EQEmulator represents <strong>over two decades of collaborative reverse engineering</strong>, building the server from the ground up without access to the original source code. This effort was achieved entirely through <strong>community-driven analysis, network protocol decoding, and in-game behavioral research</strong>.</p>
 
-## Supported Clients
+<h1 align="center">
+ 💡 How We Did It
+</h1>
+
+<p align="center">
+ <img src="https://github.com/user-attachments/assets/b6b48cf7-f64a-4497-9750-71f442a3d132" height="300px">
+ </p>
+
+
+<p align="center">
+ <strong>Reverse Engineering</strong> 
+Every system, packet, opcode, and game mechanic has been reconstructed through countless hours of live packet sniffing, client disassembly, and in-game experimentation by dedicated contributors over the years.
+</p>
+
+<p align="center">
+ No proprietary code or server sources were ever used.
+</p>
+
+<p align="center">
+ All implementations are the result of clean-room engineering.
+</p>
+
+
+<h1 align="center">
+ 🛠️ Technology Stack
+</h1>
+
+<p align="center">
+ <img src="https://github.com/user-attachments/assets/df5ea809-86c5-439d-a8fa-651fb04ba477" style="border-radius: 10px">
+</p>
+
+**C++ Core Engine**
+
+* High-performance networking and gameplay logic built in C++
+* Cross-platform support for Linux and Windows
+
+**MySQL / MariaDB Backend**
+
+* Fully structured schema with over 200+ tables
+* Supports content customization, expansions, and custom worlds
+
+**Scripting Engine**
+
+* Native support for **Perl** and **Lua** scripting
+* Powerfully extendable for quests, NPC behaviors, and custom events
+
+**Open Source Content Database**
+
+* Includes ProjectEQ’s world data up through *Dragons of Norrath*
+* 100% customizable to create entirely new game worlds
+
+<h1 align="center">
+ 🚀 Why It Matters
+</h1>
+
+<p align="center">🧬 EQEmulator stands as a <strong>technical preservation project</strong>, ensuring that the magic of classic and custom servers lives on for future generations of players, tinkerers, and game designers.
+</p>
+
+> We humbly acknowledge and thank the original developers for creating one of the most influential online experiences in gaming history.
+
+<h1 align="center">
+ 🧑‍💻🖥️ Supported Clients
+</h1>
 
 |Titanium Edition|Secrets of Faydwer|Seeds of Destruction|Underfoot|Rain of Fear|
 |:---:|:---:|:---:|:---:|:---:|
 |<img src="http://i.imgur.com/hrwDxoM.jpg" height="150">|<img src="http://i.imgur.com/cRDW5tn.png" height="150">|<img src="http://i.imgur.com/V48kuVn.jpg" height="150">|<img src="http://i.imgur.com/IJQ0XMa.jpg" height="150">|<img src="http://i.imgur.com/OMpHkKa.png" height="100">|
 
-## Bug Reports <img src="http://i.imgur.com/daf1Vjw.png" height="20">
+## 📚 Resources
-* Please use the [issue tracker](https://github.com/EQEmu/Server/issues) provided by GitHub to send us bug
-reports or feature requests.
-* The [EQEmu Forums](http://www.eqemulator.org/forums/) are also a place to submit and get help with bugs.
 
-## Contributions <img src="http://image.flaticon.com/icons/png/512/25/25231.png" width="20">
+| Resource             | Badges                                                                                                                                                    | Link                                                                                              |
+|---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
+| **EQEmulator Docs**  | [![Docs](https://img.shields.io/badge/docs-MkDocs%20Powered-blueviolet)](https://docs.eqemu.dev)                                                             | [docs.eqemu.dev](https://docs.eqemu.dev/)                                                           |
+| **Discord Community**| [![Discord](https://img.shields.io/discord/212663220849213441?label=Discord&logo=discord&color=7289DA)](https://discord.gg/QHsm7CD)                         | [Join Discord](https://discord.gg/QHsm7CD)                                                        |
+| **Latest Release**   | [![Latest Release](https://img.shields.io/github/v/release/EQEmu/EQEmu)](https://github.com/EQEmu/EQEmu/releases) <br> [![Release Date](https://img.shields.io/github/release-date/EQEmu/EQEmu)](https://github.com/EQEmu/EQEmu/releases) <br> [![All Releases](https://img.shields.io/github/downloads/EQEmu/EQEmu/total.svg)](https://github.com/EQEmu/EQEmu/releases) | [View Releases](https://github.com/EQEmu/EQEmu/releases)                                         |
+| **License**          | [![License](https://img.shields.io/github/license/EQEmu/EQEmu)](./LICENSE.md)                                                                                | [View License](./LICENSE.md)                                                                        |
+| **Build Status**     | [![Build](https://github.com/EQEmu/EQEmu/actions/workflows/build.yaml/badge.svg)](https://github.com/EQEmu/EQEmu/actions/workflows/build.yaml)              | [View Build Status](https://github.com/EQEmu/EQEmu/actions/workflows/build.yaml)                                       |
+| **Docker Pulls**     | [![Docker Pulls](https://img.shields.io/docker/pulls/akkadius/eqemu-server)](https://hub.docker.com/r/akkadius/eqemu-server)                                | [Docker Hub](https://hub.docker.com/r/akkadius/eqemu-server)                                      |
+| **Contributions**    | [![GitHub PRs](https://img.shields.io/github/issues-pr-closed/EQEmu/EQEmu)](https://github.com/EQEmu/EQEmu/pulls?q=is%3Apr+is%3Aclosed)                   | [Closed PRs & Issues](https://github.com/EQEmu/EQEmu/pulls?q=is%3Apr+is%3Aclosed)                |
 
-* The preferred way to contribute is to fork the repo and submit a pull request on
+## 🛠️ Getting Started
-GitHub. If you need help with your changes, you can always post on the forums or
-try Discord. You can also post unified diffs (`git diff` should do the trick) on the
-[Server Code Submissions](http://www.eqemulator.org/forums/forumdisplay.php?f=669)
-forum, although pull requests will be much quicker and easier on all parties.
 
-## Contact <img src="http://gamerescape.com/wp-content/uploads/2015/06/discord.png" height="20">
+If you want to set up your own EQEmulator server, please refer to the current [server installation guides](https://docs.eqemu.dev/#server-installation). We've had 100,000s of players and developers use our guides to set up their own servers, and we hope you will too!
 
- - Discord Channel: https://discord.gg/QHsm7CD
+## 🗂️ Related Repositories
- - **User Discord Channel**: `#general`
- - **Developer Discord Channel**: `#eqemucoders`
 
-## Resources
+| Repository         | Description                                                                      |
-- [EQEmulator Forums](http://www.eqemulator.org/forums)
+|--------------------|----------------------------------------------------------------------------------|
-- [EQEmulator Wiki](https://docs.eqemu.io/)
+| [ProjectEQ Quests](https://github.com/ProjectEQ/projecteqquests)  | Official quests and event scripts for ProjectEQ                       |
+| [Maps](https://github.com/EQEmu/maps)                             | EQEmu-compatible zone maps                                            |
+| [Installer Resources](https://github.com/Akkadius/EQEmuInstall)   | Scripts and assets for setting up EQEmu servers                       |
+| [Zone Utilities](https://github.com/EQEmu/zone-utilities)         | Utilities for parsing, rendering, and manipulating EQ zone files      |
 
-## Related Repositories
-* [ProjectEQ Quests](https://github.com/ProjectEQ/projecteqquests)
-* [Maps](https://github.com/Akkadius/EQEmuMaps)
-* [Installer Resources](https://github.com/Akkadius/EQEmuInstall)
-* [Zone Utilities](https://github.com/EQEmu/zone-utilities) - Various utilities and libraries for parsing, rendering and manipulating EQ Zone files.
-
-## Other License Info
-
-* The server code and utilities are released under **GPLv3**
-* We also include some small libraries for convienence that may be under different licensing
-  * SocketLib - GPL LibXML
-  * zlib - zlib license
-  * MariaDB/MySQL - GPL
-  * GPL Perl - GPL / ActiveState (under the assumption that this is a free project)
-  * CPPUnit - GLP StringUtilities - Apache
-  * LUA - MIT
 
 ## Contributors
 
-<a href="https://github.com/EQEmu/server/graphs/contributors">
+<a href="https://github.com/EQEmu/EQEmu/graphs/contributors">
-  <img src="https://contributors-img.firebaseapp.com/image?repo=EQEmu/server" />
+  <img src="https://contributors-img.firebaseapp.com/image?repo=EQEmu/EQEmu" />
 </a>
-

client_files/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
+cmake_minimum_required(VERSION 3.20)
 
 add_subdirectory(import)
 add_subdirectory(export)

client_files/export/CMakeLists.txt

@@ -1,16 +1,18 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+cmake_minimum_required(VERSION 3.20.0)
 
-SET(export_sources
+set(export_sources
 	main.cpp
 )
 
-SET(export_headers
+set(export_headers
 )
 
-ADD_EXECUTABLE(export_client_files ${export_sources} ${export_headers})
+add_executable(export_client_files ${export_sources} ${export_headers})
 
-INSTALL(TARGETS export_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+install(TARGETS export_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-TARGET_LINK_LIBRARIES(export_client_files ${SERVER_LIBS})
+target_link_libraries(export_client_files common)
+target_include_directories(export_client_files PRIVATE ../..)
 
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET export_client_files PROPERTY FOLDER executables/tools)

client_files/export/main.cpp

@@ -1,49 +1,40 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-	Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
+#include "common/content/world_content_service.h"
+#include "common/crash.h"
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/events/player_event_logs.h"
+#include "common/evolving_items.h"
+#include "common/file.h"
+#include "common/path_manager.h"
+#include "common/platform.h"
+#include "common/repositories/base_data_repository.h"
+#include "common/repositories/db_str_repository.h"
+#include "common/repositories/skill_caps_repository.h"
+#include "common/repositories/spells_new_repository.h"
+#include "common/rulesys.h"
+#include "common/shareddb.h"
+#include "common/skill_caps.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
 
-#include <stdio.h>
+#include <cstdio>
-
-#include "../../common/eqemu_logsys.h"
-#include "../../common/global_define.h"
-#include "../../common/shareddb.h"
-#include "../../common/eqemu_config.h"
-#include "../../common/platform.h"
-#include "../../common/crash.h"
-#include "../../common/rulesys.h"
-#include "../../common/strings.h"
-#include "../../common/content/world_content_service.h"
-#include "../../common/zone_store.h"
-#include "../../common/path_manager.h"
-#include "../../common/repositories/base_data_repository.h"
-#include "../../common/repositories/db_str_repository.h"
-#include "../../common/repositories/skill_caps_repository.h"
-#include "../../common/repositories/spells_new_repository.h"
-#include "../../common/file.h"
-#include "../../common/events/player_event_logs.h"
-#include "../../common/skill_caps.h"
-#include "../../common/evolving_items.h"
-
-EQEmuLogSys          LogSys;
-WorldContentService  content_service;
-ZoneStore            zone_store;
-PathManager          path;
-PlayerEventLogs      player_event_logs;
-EvolvingItemsManager evolving_items_manager;
 
 void ExportSpells(SharedDatabase *db);
 void ExportSkillCaps(SharedDatabase *db);
@@ -53,10 +44,10 @@ void ExportDBStrings(SharedDatabase *db);
 int main(int argc, char **argv)
 {
 	RegisterExecutablePlatform(ExePlatformClientExport);
-	LogSys.LoadLogSettingsDefaults();
+	EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	path.LoadPaths();
+	PathManager::Instance()->Init();
 
 	LogInfo("Client Files Export Utility");
 	if (!EQEmuConfig::LoadConfig()) {
@@ -99,8 +90,8 @@ int main(int argc, char **argv)
 		content_db.SetMySQL(database);
 	}
 
-	LogSys.SetDatabase(&database)
+	EQEmuLogSys::Instance()->SetDatabase(&database)
-		->SetLogPath(path.GetLogPath())
+		->SetLogPath(PathManager::Instance()->GetLogPath())
 		->LoadLogDatabaseSettings()
 		->StartFileLogs();
 
@@ -129,14 +120,14 @@ int main(int argc, char **argv)
 	ExportBaseData(&content_db);
 	ExportDBStrings(&database);
 
-	LogSys.CloseFileLogs();
+	EQEmuLogSys::Instance()->CloseFileLogs();
 
 	return 0;
 }
 
 void ExportSpells(SharedDatabase* db)
 {
-	std::ofstream file(fmt::format("{}/export/spells_us.txt", path.GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/spells_us.txt", PathManager::Instance()->GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/spells_us.txt to write, skipping.");
 		return;
@@ -155,7 +146,7 @@ void ExportSpells(SharedDatabase* db)
 
 void ExportSkillCaps(SharedDatabase* db)
 {
-	std::ofstream file(fmt::format("{}/export/SkillCaps.txt", path.GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/SkillCaps.txt", PathManager::Instance()->GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/SkillCaps.txt to write, skipping.");
 		return;
@@ -174,7 +165,7 @@ void ExportSkillCaps(SharedDatabase* db)
 
 void ExportBaseData(SharedDatabase *db)
 {
-	std::ofstream file(fmt::format("{}/export/BaseData.txt", path.GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/BaseData.txt", PathManager::Instance()->GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/BaseData.txt to write, skipping.");
 		return;
@@ -193,7 +184,7 @@ void ExportBaseData(SharedDatabase *db)
 
 void ExportDBStrings(SharedDatabase *db)
 {
-	std::ofstream file(fmt::format("{}/export/dbstr_us.txt", path.GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/dbstr_us.txt", PathManager::Instance()->GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/dbstr_us.txt to write, skipping.");
 		return;

client_files/import/CMakeLists.txt

@@ -1,16 +1,18 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+cmake_minimum_required(VERSION 3.20.0)
 
-SET(import_sources
+set(import_sources
 	main.cpp
 )
 
-SET(import_headers
+set(import_headers
 )
 
-ADD_EXECUTABLE(import_client_files ${import_sources} ${import_headers})
+add_executable(import_client_files ${import_sources} ${import_headers})
 
-INSTALL(TARGETS import_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+install(TARGETS import_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-TARGET_LINK_LIBRARIES(import_client_files ${SERVER_LIBS})
+target_link_libraries(import_client_files common)
+target_include_directories(import_client_files PRIVATE ../..)
 
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+set_property(TARGET import_client_files PROPERTY FOLDER executables/tools)

client_files/import/main.cpp

@@ -1,43 +1,34 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-	Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-
+#include "common/content/world_content_service.h"
-#include "../../common/eqemu_logsys.h"
+#include "common/crash.h"
-#include "../../common/global_define.h"
+#include "common/eqemu_config.h"
-#include "../../common/shareddb.h"
+#include "common/eqemu_logsys.h"
-#include "../../common/eqemu_config.h"
+#include "common/events/player_event_logs.h"
-#include "../../common/platform.h"
+#include "common/evolving_items.h"
-#include "../../common/crash.h"
+#include "common/file.h"
-#include "../../common/rulesys.h"
+#include "common/path_manager.h"
-#include "../../common/strings.h"
+#include "common/platform.h"
-#include "../../common/content/world_content_service.h"
+#include "common/repositories/base_data_repository.h"
-#include "../../common/zone_store.h"
+#include "common/rulesys.h"
-#include "../../common/path_manager.h"
+#include "common/shareddb.h"
-#include "../../common/repositories/base_data_repository.h"
+#include "common/strings.h"
-#include "../../common/file.h"
+#include "common/zone_store.h"
-#include "../../common/events/player_event_logs.h"
-#include "../../common/evolving_items.h"
-
-EQEmuLogSys          LogSys;
-WorldContentService  content_service;
-ZoneStore            zone_store;
-PathManager          path;
-PlayerEventLogs      player_event_logs;
-EvolvingItemsManager evolving_items_manager;
 
 void ImportSpells(SharedDatabase *db);
 void ImportSkillCaps(SharedDatabase *db);
@@ -46,10 +37,10 @@ void ImportDBStrings(SharedDatabase *db);
 
 int main(int argc, char **argv) {
 	RegisterExecutablePlatform(ExePlatformClientImport);
-	LogSys.LoadLogSettingsDefaults();
+	EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	path.LoadPaths();
+	PathManager::Instance()->Init();
 
 	LogInfo("Client Files Import Utility");
 	if(!EQEmuConfig::LoadConfig()) {
@@ -92,8 +83,8 @@ int main(int argc, char **argv) {
 		content_db.SetMySQL(database);
 	}
 
-	LogSys.SetDatabase(&database)
+	EQEmuLogSys::Instance()->SetDatabase(&database)
-		->SetLogPath(path.GetLogPath())
+		->SetLogPath(PathManager::Instance()->GetLogPath())
 		->LoadLogDatabaseSettings()
 		->StartFileLogs();
 
@@ -102,7 +93,7 @@ int main(int argc, char **argv) {
 	ImportBaseData(&content_db);
 	ImportDBStrings(&database);
 
-	LogSys.CloseFileLogs();
+	EQEmuLogSys::Instance()->CloseFileLogs();
 
 	return 0;
 }
@@ -138,7 +129,7 @@ bool IsStringField(int i) {
 
 void ImportSpells(SharedDatabase *db) {
 	LogInfo("Importing Spells");
-	std::string file = fmt::format("{}/import/spells_us.txt", path.GetServerPath());
+	std::string file = fmt::format("{}/import/spells_us.txt", PathManager::Instance()->GetServerPath());
 	FILE *f = fopen(file.c_str(), "r");
 	if(!f) {
 		LogError("Unable to open {} to read, skipping.", file);
@@ -228,7 +219,7 @@ void ImportSpells(SharedDatabase *db) {
 void ImportSkillCaps(SharedDatabase *db) {
 	LogInfo("Importing Skill Caps");
 
-	std::string file = fmt::format("{}/import/SkillCaps.txt", path.GetServerPath());
+	std::string file = fmt::format("{}/import/SkillCaps.txt", PathManager::Instance()->GetServerPath());
 	FILE *f = fopen(file.c_str(), "r");
 	if(!f) {
 		LogError("Unable to open {} to read, skipping.", file);
@@ -265,7 +256,7 @@ void ImportBaseData(SharedDatabase *db)
 {
 	LogInfo("Importing Base Data");
 
-	const std::string& file_name = fmt::format("{}/import/BaseData.txt", path.GetServerPath());
+	const std::string& file_name = fmt::format("{}/import/BaseData.txt", PathManager::Instance()->GetServerPath());
 
 	const auto& file_contents = File::GetContents(file_name);
 	if (!file_contents.error.empty()) {
@@ -305,7 +296,7 @@ void ImportBaseData(SharedDatabase *db)
 void ImportDBStrings(SharedDatabase *db) {
 	LogInfo("Importing DB Strings");
 
-	std::string file = fmt::format("{}/import/dbstr_us.txt", path.GetServerPath());
+	std::string file = fmt::format("{}/import/dbstr_us.txt", PathManager::Instance()->GetServerPath());
 	FILE *f = fopen(file.c_str(), "r");
 	if(!f) {
 		LogError("Unable to open {} to read, skipping.", file);

cmake/DependencyHelperMSVC.cmake

@@ -1,94 +0,0 @@
-OPTION(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG "Automatically fetch vcpkg dependencies for MSCV" ON)
-OPTION(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL "Automatically fetch perl dependencies for MSCV" ON)
-
-MARK_AS_ADVANCED(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG)
-MARK_AS_ADVANCED(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL)
-
-SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86 "https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x86.zip")
-SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64 "https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x64.zip")
-SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86 "http://strawberryperl.com/download/5.24.4.1/strawberry-perl-5.24.4.1-32bit-portable.zip")
-SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64 "http://strawberryperl.com/download/5.24.4.1/strawberry-perl-5.24.4.1-64bit-portable.zip")
-SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_ZIP "vcpkg-export-x86.zip")
-SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_ZIP "vcpkg-export-x64.zip")
-SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_DIR "vcpkg-export-x86")
-SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_DIR "vcpkg-export-x64")
-SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86_ZIP "strawberry-perl-5.24.4.1-32bit-portable.zip")
-SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64_ZIP "strawberry-perl-5.24.4.1-64bit-portable.zip")
-SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86_DIR "x86")
-SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64_DIR "x64")
-
-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	SET(EQEMU_VCPKG_URL ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64})
-	SET(EQEMU_PERL_URL ${EQEMU_MSVC_DEPENDENCIES_PERL_X64})
-	SET(EQEMU_VCPKG_ZIP ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_ZIP})
-	SET(EQEMU_VCPKG_DIR ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_DIR})
-	SET(EQEMU_PERL_ZIP ${EQEMU_MSVC_DEPENDENCIES_PERL_X64_ZIP})
-	SET(EQEMU_PERL_DIR ${EQEMU_MSVC_DEPENDENCIES_PERL_X64_DIR})
-ELSE()
-	SET(EQEMU_VCPKG_URL ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86})
-	SET(EQEMU_PERL_URL ${EQEMU_MSVC_DEPENDENCIES_PERL_X86})
-	SET(EQEMU_VCPKG_ZIP ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_ZIP})
-	SET(EQEMU_VCPKG_DIR ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_DIR})
-	SET(EQEMU_PERL_ZIP ${EQEMU_MSVC_DEPENDENCIES_PERL_X86_ZIP})
-	SET(EQEMU_PERL_DIR ${EQEMU_MSVC_DEPENDENCIES_PERL_X86_DIR})
-ENDIF()
-
-IF(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG)
-	MESSAGE(STATUS "Resolving vcpkg dependencies...")
-	
-	IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP})
-		EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/vcpkg)
-		
-		MESSAGE(STATUS "Downloading existing vcpkg dependencies from releases...")
-		FILE(DOWNLOAD ${EQEMU_VCPKG_URL} ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP} 
-			SHOW_PROGRESS
-			STATUS DOWNLOAD_STATUS)
-			
-		LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE)
-		IF(NOT STATUS_CODE EQUAL 0)
-			MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_VCPKG_URL}")
-		ENDIF()
-		
-		MESSAGE(STATUS "Extracting files...")
-		EXECUTE_PROCESS(
-			COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP}
-			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vcpkg
-		)
-	ENDIF()
-	
-	INCLUDE(${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake)
-ENDIF()
-
-IF(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL)
-	#Try to find perl first, (so you can use your active install first)
-	FIND_PACKAGE(PerlLibs)
-	
-	IF(NOT PerlLibs_FOUND)
-		MESSAGE(STATUS "Resolving perl dependencies...")
-		
-		IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP})
-			EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl)
-			EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR})
-			
-			MESSAGE(STATUS "Downloading portable perl...")
-			FILE(DOWNLOAD ${EQEMU_PERL_URL} ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP} 
-				SHOW_PROGRESS
-				STATUS DOWNLOAD_STATUS)
-				
-			LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE)
-			IF(NOT STATUS_CODE EQUAL 0)
-				MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_PERL_URL}")
-			ENDIF()
-			
-			MESSAGE(STATUS "Extracting files...")
-			EXECUTE_PROCESS(
-				COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP}
-				WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}
-			)
-		ENDIF()
-		
-		SET(PERL_EXECUTABLE ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/bin/perl.exe CACHE FILEPATH "Path to perl program" FORCE)
-		SET(PERL_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE CACHE PATH "Path to perl include files" FORCE)
-		SET(PERL_LIBRARY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE/libperl524.a CACHE FILEPATH "Path to perl library" FORCE)
-	ENDIF()
-ENDIF()

cmake/FindLua51.cmake

@@ -1,91 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-# Modified from the FindLua51 that comes with CMake
-
-#[=======================================================================[.rst:
-FindLua51
----------
-
-
-
-Locate Lua51 library This module defines
-
-::
-
-  LUA51_FOUND, if false, do not try to link to Lua
-  LUA_LIBRARIES
-  LUA_INCLUDE_DIR, where to find lua.h
-  LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
-
-
-
-Note that the expected include convention is
-
-::
-
-  #include "lua.h"
-
-and not
-
-::
-
-  #include <lua/lua.h>
-
-This is because, the lua location is not standardized and may exist in
-locations other than lua/
-#]=======================================================================]
-
-find_path(LUA_INCLUDE_DIR lua.h
-  HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-)
-
-find_library(LUA_LIBRARY
-  NAMES lua51 lua5.1 lua-5.1 lua
-  HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES lib
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-
-if(LUA_LIBRARY)
-  # include the math library for Unix
-  if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
-    find_library(LUA_MATH_LIBRARY m)
-    set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
-  # For Windows and Mac, don't need to explicitly include the math library
-  else()
-    set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
-  endif()
-endif()
-
-if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-  file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
-
-  string(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
-  unset(lua_version_str)
-endif()
-
-include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-# handle the QUIETLY and REQUIRED arguments and set LUA51_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua51
-                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
-                                  VERSION_VAR LUA_VERSION_STRING)
-
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
-

cmake/FindLuaJit.cmake

@@ -88,4 +88,3 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJit
                                   VERSION_VAR LUAJIT_VERSION_STRING)
 
 mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES LUAJIT_LIBRARY LUAJIT_MATH_LIBRARY)
-

cmake/FindMariaDB.cmake

@@ -1,87 +0,0 @@
-# - Find mariadbclient
-#
-# -*- cmake -*-
-#
-# Find the native MariaDB includes and library
-#
-#	MariaDB_INCLUDE_DIR	- where to find mysql.h, etc.
-#	MariaDB_LIBRARIES		- List of libraries when using MariaDB.
-#	MariaDB_FOUND			- True if MariaDB found.
-#	The following can be used as a hint as to where to search:
-#	MARIADB_ROOT
-
-IF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARIES)
-	# Already in cache, be silent
-	SET(MariaDB_FIND_QUIETLY TRUE)
-ENDIF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARIES)
-
-# Include dir
-IF(MARIADB_ROOT)
-	FIND_PATH(MariaDB_INCLUDE_DIR
-		NAMES mariadb_version.h
-		PATHS ${MARIADB_ROOT}/include
-		PATH_SUFFIXES mysql mariadb
-		NO_DEFAULT_PATH
-		NO_SYSTEM_ENVIRONMENT_PATH
-	)
-	FIND_PATH(MariaDB_INCLUDE_DIR
-		NAMES mariadb_version.h
-		PATH_SUFFIXES mysql mariadb
-	)
-ELSE(MARIADB_ROOT)
-	FIND_PATH(MariaDB_INCLUDE_DIR
-		NAMES mariadb_version.h
-		PATH_SUFFIXES mysql mariadb
-	)
-ENDIF(MARIADB_ROOT)
-
-# Library
-SET(MariaDB_NAMES libmariadb)
-IF(MARIADB_ROOT)
-	FIND_LIBRARY(MariaDB_LIBRARY
-		NAMES ${MariaDB_NAMES}
-		PATHS ${MARIADB_ROOT}/lib
-		PATH_SUFFIXES mysql mariadb
-		NO_DEFAULT_PATH
-		NO_SYSTEM_ENVIRONMENT_PATH
-	)
-	
-	FIND_LIBRARY(MariaDB_LIBRARY
-		NAMES ${MariaDB_NAMES}
-		PATH_SUFFIXES mysql mariadb
-	)
-ELSE(MARIADB_ROOT)
-	FIND_LIBRARY(MariaDB_LIBRARY
-		NAMES ${MariaDB_NAMES} mariadbclient_r mariadbclient
-		PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
-		PATH_SUFFIXES mysql mariadb
-	)
-ENDIF(MARIADB_ROOT)
-
-IF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
-	SET(MariaDB_FOUND TRUE)
-	SET(MariaDB_LIBRARIES ${MariaDB_LIBRARY})
-ELSE (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
-	SET(MariaDB_FOUND FALSE)
-	SET(MariaDB_LIBRARIES)
-ENDIF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
-
-
-# handle the QUIETLY and REQUIRED arguments and set MariaDB_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MariaDB DEFAULT_MSG MariaDB_LIBRARY MariaDB_INCLUDE_DIR)
-
-IF(MariaDB_FOUND)
-	SET( MariaDB_LIBRARY_RELEASE ${MariaDB_LIBRARY} )
-	SET( MariaDB_LIBRARY_DEBUG ${MariaDB_LIBRARY} )
-	SET( MariaDB_LIBRARIES ${MariaDB_LIBRARY_RELEASE} ${MariaDB_LIBRARY_DEBUG} )
-ELSE(MariaDB_FOUND)
-	SET( MariaDB_LIBRARIES )
-ENDIF(MariaDB_FOUND)
-
-MARK_AS_ADVANCED(
-	MariaDB_LIBRARY_DEBUG
-	MariaDB_LIBRARY_RELEASE
-	MariaDB_INCLUDE_DIR
-	)

cmake/FindMySQL.cmake

@@ -1,87 +0,0 @@
-# - Find mysqlclient
-#
-# -*- cmake -*-
-#
-# Find the native MySQL includes and library
-#
-#	MySQL_INCLUDE_DIR	- where to find mysql.h, etc.
-#	MySQL_LIBRARIES		- List of libraries when using MySQL.
-#	MySQL_FOUND			- True if MySQL found.
-#	The following can be used as a hint as to where to search:
-#	MYSQL_ROOT
-
-IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARIES)
-	# Already in cache, be silent
-	SET(MySQL_FIND_QUIETLY TRUE)
-ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARIES)
-
-# Include dir
-IF(MYSQL_ROOT)
-	FIND_PATH(MySQL_INCLUDE_DIR
-		NAMES mysql.h
-		PATHS ${MYSQL_ROOT}/include
-		PATH_SUFFIXES mysql
-		NO_DEFAULT_PATH
-		NO_SYSTEM_ENVIRONMENT_PATH
-	)
-	FIND_PATH(MySQL_INCLUDE_DIR
-		NAMES mysql.h
-		PATH_SUFFIXES mysql
-	)
-ELSE(MYSQL_ROOT)
-	FIND_PATH(MySQL_INCLUDE_DIR
-		NAMES mysql.h
-		PATH_SUFFIXES mysql
-	)
-ENDIF(MYSQL_ROOT)
-
-# Library
-SET(MySQL_NAMES libmysql)
-IF(MYSQL_ROOT)
-	FIND_LIBRARY(MySQL_LIBRARY
-		NAMES ${MySQL_NAMES}
-		PATHS ${MYSQL_ROOT}/lib
-		PATH_SUFFIXES mysql
-		NO_DEFAULT_PATH
-		NO_SYSTEM_ENVIRONMENT_PATH
-	)
-	
-	FIND_LIBRARY(MySQL_LIBRARY
-		NAMES ${MySQL_NAMES}
-		PATH_SUFFIXES mysql
-	)
-ELSE(MYSQL_ROOT)
-	FIND_LIBRARY(MySQL_LIBRARY
-		NAMES ${MySQL_NAMES} mysqlclient_r mysqlclient
-		PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
-		PATH_SUFFIXES mysql
-	)
-ENDIF(MYSQL_ROOT)
-
-IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-	SET(MySQL_FOUND TRUE)
-	SET( MySQL_LIBRARIES ${MySQL_LIBRARY} )
-ELSE (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-	SET(MySQL_FOUND FALSE)
-	SET( MySQL_LIBRARIES )
-ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
-
-
-# handle the QUIETLY and REQUIRED arguments and set MySQL_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MySQL DEFAULT_MSG MySQL_LIBRARY MySQL_INCLUDE_DIR)
-
-IF(MySQL_FOUND)
-	SET( MySQL_LIBRARY_RELEASE ${MySQL_LIBRARY} )
-	SET( MySQL_LIBRARY_DEBUG ${MySQL_LIBRARY} )
-	SET( MySQL_LIBRARIES ${MySQL_LIBRARY_RELEASE} ${MySQL_LIBRARY_DEBUG} )
-ELSE(MySQL_FOUND)
-	SET( MySQL_LIBRARIES )
-ENDIF(MySQL_FOUND)
-
-MARK_AS_ADVANCED(
-	MySQL_LIBRARY_DEBUG
-	MySQL_LIBRARY_RELEASE
-	MySQL_INCLUDE_DIR
-	)

cmake/FindSodium.cmake

@@ -1,30 +0,0 @@
-if (NOT MSVC)
-include(FindPkgConfig)
-pkg_check_modules(PC_SODIUM "libsodium")
-if (NOT PC_SODIUM_FOUND)
-    pkg_check_modules(PC_SODIUM "sodium")
-endif (NOT PC_SODIUM_FOUND)
-if (PC_SODIUM_FOUND)
-  set(SODIUM_INCLUDE_HINTS ${PC_SODIUM_INCLUDE_DIRS} ${PC_SODIUM_INCLUDE_DIRS}/*)
-  set(SODIUM_LIBRARY_HINTS ${PC_SODIUM_LIBRARY_DIRS} ${PC_SODIUM_LIBRARY_DIRS}/*)
-endif()
-endif (NOT MSVC)
-
-# some libraries install the headers is a subdirectory of the include dir
-# returned by pkg-config, so use a wildcard match to improve chances of finding
-# headers and libraries.
-find_path(
-    SODIUM_INCLUDE_DIRS
-    NAMES sodium.h
-    HINTS ${SODIUM_INCLUDE_HINTS}
-)
-
-find_library(
-    SODIUM_LIBRARIES
-    NAMES libsodium sodium
-    HINTS ${SODIUM_LIBRARY_HINTS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SODIUM DEFAULT_MSG SODIUM_LIBRARIES SODIUM_INCLUDE_DIRS)
-mark_as_advanced(SODIUM_FOUND SODIUM_LIBRARIES SODIUM_INCLUDE_DIRS)

cmake/FindmbedTLS.cmake

@@ -1,93 +0,0 @@
-# - Try to find mbedTLS
-# Once done this will define
-#
-# Read-Only variables
-#  MBEDTLS_FOUND - system has mbedTLS
-#  MBEDTLS_INCLUDE_DIR - the mbedTLS include directory
-#  MBEDTLS_LIBRARY_DIR - the mbedTLS library directory
-#  MBEDTLS_LIBRARIES - Link these to use mbedTLS
-#  MBEDTLS_LIBRARY - path to mbedTLS library
-#  MBEDX509_LIBRARY - path to mbedTLS X.509 library
-#  MBEDCRYPTO_LIBRARY - path to mbedTLS Crypto library
-#
-# Hint
-#  MBEDTLS_ROOT_DIR can be pointed to a local mbedTLS installation.
-
-SET(_MBEDTLS_ROOT_HINTS
-    ${MBEDTLS_ROOT_DIR}
-    ENV MBEDTLS_ROOT_DIR
-)
-
-SET(_MBEDTLS_ROOT_HINTS_AND_PATHS
-    HINTS ${_MBEDTLS_ROOT_HINTS}
-    PATHS ${_MBEDTLS_ROOT_PATHS}
-)
-
-FIND_PATH(MBEDTLS_INCLUDE_DIR
-    NAMES mbedtls/version.h
-    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
-    PATH_SUFFIXES include
-)
-
-IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARIES)
-    # Already in cache, be silent
-    SET(MBEDTLS_FIND_QUIETLY TRUE)
-ENDIF()
-
-FIND_LIBRARY(MBEDTLS_LIBRARY
-    NAMES mbedtls libmbedtls
-    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
-    PATH_SUFFIXES library
-)
-FIND_LIBRARY(MBEDX509_LIBRARY
-    NAMES mbedx509 libmbedx509
-    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
-    PATH_SUFFIXES library
-)
-FIND_LIBRARY(MBEDCRYPTO_LIBRARY
-    NAMES mbedcrypto libmbedcrypto
-    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
-    PATH_SUFFIXES library
-)
-
-IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
-     SET(MBEDTLS_FOUND TRUE)
-ENDIF()
-
-IF(MBEDTLS_FOUND)
-    # split mbedTLS into -L and -l linker options, so we can set them for pkg-config
-    GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_DIR ${MBEDTLS_LIBRARY} PATH)
-    GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY} NAME_WE)
-    GET_FILENAME_COMPONENT(MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY} NAME_WE)
-    GET_FILENAME_COMPONENT(MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY} NAME_WE)
-    STRING(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
-    STRING(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
-    STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
-    SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
-
-    IF(NOT MBEDTLS_FIND_QUIETLY)
-        MESSAGE(STATUS "Found mbedTLS:")
-        FILE(READ ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLSCONTENT)
-        STRING(REGEX MATCH "MBEDTLS_VERSION_STRING +\"[0-9|.]+\"" MBEDTLSMATCH ${MBEDTLSCONTENT})
-        IF (MBEDTLSMATCH)
-            STRING(REGEX REPLACE "MBEDTLS_VERSION_STRING +\"([0-9|.]+)\"" "\\1" MBEDTLS_VERSION ${MBEDTLSMATCH})
-            MESSAGE(STATUS "  version ${MBEDTLS_VERSION}")
-        ENDIF(MBEDTLSMATCH)
-        MESSAGE(STATUS "  TLS: ${MBEDTLS_LIBRARY}")
-        MESSAGE(STATUS "  X509: ${MBEDX509_LIBRARY}")
-        MESSAGE(STATUS "  Crypto: ${MBEDCRYPTO_LIBRARY}")
-    ENDIF(NOT MBEDTLS_FIND_QUIETLY)
-ELSE(MBEDTLS_FOUND)
-    IF(MBEDTLS_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could not find mbedTLS")
-    ENDIF(MBEDTLS_FIND_REQUIRED)
-ENDIF(MBEDTLS_FOUND)
-
-MARK_AS_ADVANCED(
-    MBEDTLS_INCLUDE_DIR
-    MBEDTLS_LIBRARY_DIR
-    MBEDTLS_LIBRARIES
-    MBEDTLS_LIBRARY
-    MBEDX509_LIBRARY
-    MBEDCRYPTO_LIBRARY
-)

common/SocketLib/Base64.cpp

@@ -1,266 +0,0 @@
-/** \file Base64.cpp
- **	\date  2004-02-13
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#include "Base64.h"
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-const char *Base64::bstr =
-	"ABCDEFGHIJKLMNOPQ"
-	"RSTUVWXYZabcdefgh"
-	"ijklmnopqrstuvwxy"
-	"z0123456789+/";
-
-const char Base64::rstr[] = {
-	  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 
-	  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 
-	  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  62,   0,   0,   0,  63, 
-	 52,  53,  54,  55,  56,  57,  58,  59,  60,  61,   0,   0,   0,   0,   0,   0, 
-	  0,   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14, 
-	 15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,   0,   0,   0,   0,   0, 
-	  0,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40, 
-	 41,  42,  43,  44,  45,  46,  47,  48,  49,  50,  51,   0,   0,   0,   0,   0};
-
-
-void Base64::encode(FILE *fil, std::string& output, bool add_crlf)
-{
-	size_t remain;
-	size_t i = 0;
-	size_t o = 0;
-	char input[4];
-
-	output = "";
-	remain = fread(input,1,3,fil);
-	while (remain > 0)
-	{
-		if (add_crlf && o && o % 76 == 0)
-			output += "\n";
-		switch (remain)
-		{
-		case 1:
-			output += bstr[ ((input[i] >> 2) & 0x3f) ];
-			output += bstr[ ((input[i] << 4) & 0x30) ];
-			output += "==";
-			break;
-		case 2:
-			output += bstr[ ((input[i] >> 2) & 0x3f) ];
-			output += bstr[ ((input[i] << 4) & 0x30) + ((input[i + 1] >> 4) & 0x0f) ];
-			output += bstr[ ((input[i + 1] << 2) & 0x3c) ];
-			output += "=";
-			break;
-		default:
-			output += bstr[ ((input[i] >> 2) & 0x3f) ];
-			output += bstr[ ((input[i] << 4) & 0x30) + ((input[i + 1] >> 4) & 0x0f) ];
-			output += bstr[ ((input[i + 1] << 2) & 0x3c) + ((input[i + 2] >> 6) & 0x03) ];
-			output += bstr[ (input[i + 2] & 0x3f) ];
-		}
-		o += 4;
-		//
-		remain = fread(input,1,3,fil);
-	}
-}
-
-
-void Base64::encode(const std::string& str_in, std::string& str_out, bool add_crlf)
-{
-	encode(str_in.c_str(), str_in.size(), str_out, add_crlf);
-}
-
-
-void Base64::encode(const char* input,size_t l,std::string& output, bool add_crlf)
-{
-	size_t i = 0;
-	size_t o = 0;
-	
-	output = "";
-	while (i < l)
-	{
-		size_t remain = l - i;
-		if (add_crlf && o && o % 76 == 0)
-			output += "\n";
-		switch (remain)
-		{
-		case 1:
-			output += bstr[ ((input[i] >> 2) & 0x3f) ];
-			output += bstr[ ((input[i] << 4) & 0x30) ];
-			output += "==";
-			break;
-		case 2:
-			output += bstr[ ((input[i] >> 2) & 0x3f) ];
-			output += bstr[ ((input[i] << 4) & 0x30) + ((input[i + 1] >> 4) & 0x0f) ];
-			output += bstr[ ((input[i + 1] << 2) & 0x3c) ];
-			output += "=";
-			break;
-		default:
-			output += bstr[ ((input[i] >> 2) & 0x3f) ];
-			output += bstr[ ((input[i] << 4) & 0x30) + ((input[i + 1] >> 4) & 0x0f) ];
-			output += bstr[ ((input[i + 1] << 2) & 0x3c) + ((input[i + 2] >> 6) & 0x03) ];
-			output += bstr[ (input[i + 2] & 0x3f) ];
-		}
-		o += 4;
-		i += 3;
-	}
-}
-
-
-void Base64::encode(unsigned char* input,size_t l,std::string& output,bool add_crlf)
-{
-	size_t i = 0;
-	size_t o = 0;
-	
-	output = "";
-	while (i < l)
-	{
-		size_t remain = l - i;
-		if (add_crlf && o && o % 76 == 0)
-			output += "\n";
-		switch (remain)
-		{
-		case 1:
-			output += bstr[ ((input[i] >> 2) & 0x3f) ];
-			output += bstr[ ((input[i] << 4) & 0x30) ];
-			output += "==";
-			break;
-		case 2:
-			output += bstr[ ((input[i] >> 2) & 0x3f) ];
-			output += bstr[ ((input[i] << 4) & 0x30) + ((input[i + 1] >> 4) & 0x0f) ];
-			output += bstr[ ((input[i + 1] << 2) & 0x3c) ];
-			output += "=";
-			break;
-		default:
-			output += bstr[ ((input[i] >> 2) & 0x3f) ];
-			output += bstr[ ((input[i] << 4) & 0x30) + ((input[i + 1] >> 4) & 0x0f) ];
-			output += bstr[ ((input[i + 1] << 2) & 0x3c) + ((input[i + 2] >> 6) & 0x03) ];
-			output += bstr[ (input[i + 2] & 0x3f) ];
-		}
-		o += 4;
-		i += 3;
-	}
-}
-
-
-void Base64::decode(const std::string& input,std::string& output)
-{
-	size_t i = 0;
-	size_t l = input.size();
-	
-	output = "";
-	while (i < l)
-	{
-		while (i < l && (input[i] == 13 || input[i] == 10))
-			i++;
-		if (i < l)
-		{
-			char b1 = (char)((rstr[(int)input[i]] << 2 & 0xfc) +
-					(rstr[(int)input[i + 1]] >> 4 & 0x03));
-			output += b1;
-			if (input[i + 2] != '=')
-			{
-				char b2 = (char)((rstr[(int)input[i + 1]] << 4 & 0xf0) +
-						(rstr[(int)input[i + 2]] >> 2 & 0x0f));
-				output += b2;
-			}
-			if (input[i + 3] != '=')
-			{
-				char b3 = (char)((rstr[(int)input[i + 2]] << 6 & 0xc0) +
-						rstr[(int)input[i + 3]]);
-				output += b3;
-			}
-			i += 4;
-		}
-	}
-}
-
-
-void Base64::decode(const std::string& input, unsigned char *output, size_t& sz)
-{
-	size_t i = 0;
-	size_t l = input.size();
-	size_t j = 0;
-	
-	while (i < l)
-	{
-		while (i < l && (input[i] == 13 || input[i] == 10))
-			i++;
-		if (i < l)
-		{
-			unsigned char b1 = (unsigned char)((rstr[(int)input[i]] << 2 & 0xfc) +
-					(rstr[(int)input[i + 1]] >> 4 & 0x03));
-			if (output)
-			{
-				output[j] = b1;
-			}
-			j++;
-			if (input[i + 2] != '=')
-			{
-				unsigned char b2 = (unsigned char)((rstr[(int)input[i + 1]] << 4 & 0xf0) +
-						(rstr[(int)input[i + 2]] >> 2 & 0x0f));
-				if (output)
-				{
-					output[j] = b2;
-				}
-				j++;
-			}
-			if (input[i + 3] != '=')
-			{
-				unsigned char b3 = (unsigned char)((rstr[(int)input[i + 2]] << 6 & 0xc0) +
-						rstr[(int)input[i + 3]]);
-				if (output)
-				{
-					output[j] = b3;
-				}
-				j++;
-			}
-			i += 4;
-		}
-	}
-	sz = j;
-}
-
-
-size_t Base64::decode_length(const std::string& str64)
-{
-	if (!str64.size() || str64.size() % 4)
-		return 0;
-	size_t l = 3 * (str64.size() / 4 - 1) + 1;
-	if (str64[str64.size() - 2] != '=')
-		l++;
-	if (str64[str64.size() - 1] != '=')
-		l++;
-	return l;
-}
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-

common/SocketLib/Base64.h

@@ -1,67 +0,0 @@
-/** \file Base64.h
- **	\date  2004-02-13
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef _BASE64_H
-#define _BASE64_H
-
-#include <stdio.h>
-#include <string>
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-/** \defgroup util Utilities */
-
-/** Base64 encode/decode. 
-	\ingroup util */
-class Base64 {
-public:
-
-	static void encode(FILE *, std::string& , bool add_crlf = true);
-	static void encode(const std::string&, std::string& , bool add_crlf = true);
-	static void encode(const char *, size_t, std::string& , bool add_crlf = true);
-	static void encode(unsigned char *, size_t, std::string& , bool add_crlf = true);
-
-	static void decode(const std::string&, std::string& );
-	static void decode(const std::string& in, unsigned char *out, size_t&);
-
-	static size_t decode_length(const std::string& );
-
-private:
-static	const char *bstr;
-static	const char rstr[128];
-};
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _BASE64_H

common/SocketLib/File.cpp

@@ -1,126 +0,0 @@
-/** \file File.cpp
- **	\date  2005-04-25
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#include <stdio.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-
-#include "File.h"
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-File::File()
-:m_fil(nullptr)
-{
-}
-
-
-File::~File()
-{
-}
-
-
-bool File::fopen(const std::string& path, const std::string& mode)
-{
-	m_path = path;
-	m_mode = mode;
-	m_fil = ::fopen(path.c_str(), mode.c_str());
-	return m_fil ? true : false;
-}
-
-
-void File::fclose()
-{
-	if (m_fil)
-		::fclose(m_fil);
-}
-
-
-
-size_t File::fread(char *ptr, size_t size, size_t nmemb)
-{
-	return m_fil ? ::fread(ptr, size, nmemb, m_fil) : 0;
-}
-
-
-size_t File::fwrite(const char *ptr, size_t size, size_t nmemb)
-{
-	return m_fil ? ::fwrite(ptr, size, nmemb, m_fil) : 0;
-}
-
-
-
-char *File::fgets(char *s, int size)
-{
-	return m_fil ? ::fgets(s, size, m_fil) : nullptr;
-}
-
-
-void File::fprintf(char *format, ...)
-{
-	va_list ap;
-	va_start(ap, format);
-	vfprintf(m_fil, format, ap);
-	va_end(ap);
-}
-
-
-off_t File::size()
-{
-	struct stat st;
-	if (stat(m_path.c_str(), &st) == -1)
-	{
-		return 0;
-	}
-	return st.st_size;
-}
-
-
-bool File::eof()
-{
-	if (m_fil)
-	{
-		if (feof(m_fil))
-			return true;
-	}
-	return false;
-}
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-

common/SocketLib/File.h

@@ -1,76 +0,0 @@
-/** \file File.h
- **	\date  2005-04-25
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef _FILE_H
-#define _FILE_H
-
-#include "IFile.h"
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-/** IFile implementation of a disk file. 
-	\ingroup file */
-class File : public IFile
-{
-public:
-	File();
-	~File();
-
-	bool fopen(const std::string&, const std::string&);
-	void fclose();
-
-	size_t fread(char *, size_t, size_t);
-	size_t fwrite(const char *, size_t, size_t);
-
-	char *fgets(char *, int);
-	void fprintf(char *format, ...);
-
-	off_t size();
-	bool eof();
-
-private:
-	File(const File& ) {} // copy constructor
-	File& operator=(const File& ) { return *this; } // assignment operator
-
-	std::string m_path;
-	std::string m_mode;
-	FILE *m_fil;
-};
-
-
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _FILE_H

common/SocketLib/HTTPSocket.cpp

@@ -1,366 +0,0 @@
-/*  EQEMu:  Everquest Server Emulator
- * 
- * 	This code originated from `C++ Sockets Library` referenced below.
- * 	Taken and stripped/modified to remove dependancies on parts of
- * 	the library which we are not using, and to suit other needs.
- * 		2006 - EQEMu Development Team (http://eqemulator.net)
- * 
- * 
- */
- 
-/** \file HTTPSocket.cpp
- **	\date  2004-04-06
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#endif
-#include "../global_define.h"
-#include <stdio.h>
-#include <string>
-#include <stdarg.h>
-#include "Parse.h"
-#include "HTTPSocket.h"
-#include "../tcp_connection.h"
-#include <cstdlib>
-#include <cstring>
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-
-
-HTTPSocket::HTTPSocket(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 irPort)
-:TCPConnection(ID,in_socket,irIP,irPort)
-,m_first(true)
-,m_header(true)
-,m_http_version("HTTP/1.0")
-,m_request(false)
-,m_response(false)
-{
-}
-
-
-HTTPSocket::~HTTPSocket()
-{
-}
-
-/*
- * eqemu stuff 
- */
-
-bool HTTPSocket::ProcessReceivedData(char *errbuf)
-{
-	if (errbuf)
-		errbuf[0] = 0;
-	if (!recvbuf)
-		return true;
-
-	char *buff=(char *)recvbuf;
-	unsigned long bufflen=recvbuf_used;
-
-	while(1) {
-		if (m_header) {
-			char *ptr=(char *)memchr(buff,'\n',bufflen);
-			if (!ptr)
-				break;
-			int length=(ptr-buff)+1;
-			std::string line;
-			line.append(buff,length-2);
-			OnLine(line);
-
-			buff+=length;
-			bufflen-=length;
-		} else {
-			OnData(buff,bufflen);
-			buff+=bufflen;
-			bufflen=0;
-			break;
-		}
-	}
-
-	if (bufflen) {
-		memmove(recvbuf,buff,bufflen);
-		recvbuf_used=bufflen;
-	} else {
-		safe_delete_array(recvbuf);
-	}
-}
-
-bool HTTPSocket::SendString(const char *str) {
-	return(TCPConnection::Send((const uchar *) str, strlen(str)));
-}
-
-bool HTTPSocket::SendBuf(const char *dat, unsigned int len) {
-	return(TCPConnection::Send((const uchar *) dat, len));
-}
-
-/*
- * /eqemu stuff 
- */
-
-void HTTPSocket::OnLine(const std::string& line)
-{
-	if (m_first)
-	{
-		Parse pa(line);
-		std::string str = pa.getword();
-		if (str.substr(0,4) == "HTTP") // response
-		{
-			m_http_version = str;
-			m_status = pa.getword();
-			m_status_text = pa.getrest();
-			m_response = true;
-		}
-		else // request
-		{
-			m_method = str;
-			m_url = pa.getword();
-			size_t spl = m_url.find("?");
-			if (spl != std::string::npos)
-			{
-				m_uri = m_url.substr(0,spl);
-				m_query_string = m_url.substr(spl + 1);
-			}
-			else
-			{
-				m_uri = m_url;
-			}
-			m_http_version = pa.getword();
-			m_request = true;
-		}
-		m_first = false;
-		OnFirst();
-		return;
-	}
-	if (!line.size())
-	{
-//		SetLineProtocol(false);
-		m_header = false;
-		OnHeaderComplete();
-		return;
-	}
-	Parse pa(line,":");
-	std::string key = pa.getword();
-	std::string value = pa.getrest();
-	OnHeader(key,value);
-	/* If remote end tells us to keep connection alive, and we're operating
-	in http/1.1 mode (not http/1.0 mode), then we mark the socket to be
-	retained. */
-/*	if (!strcasecmp(key.c_str(), "connection") &&
-	    !strcasecmp(value.c_str(), "keep-alive") )
-	{
-		SetRetain();
-	}*/
-}
-
-
-void HTTPSocket::SendResponse()
-{
-	std::string msg;
-	msg = m_http_version + " " + m_status + " " + m_status_text + "\r\n";
-	for (string_m::iterator it = m_response_header.begin(); it != m_response_header.end(); it++)
-	{
-		std::string key = (*it).first;
-		std::string val = (*it).second;
-		msg += key + ": " + val + "\r\n";
-	}
-	msg += "\r\n";
-	SendString( msg.c_str() );
-}
-
-
-void HTTPSocket::AddResponseHeader(const std::string& header, const char *format, ...)
-{
-	static char slask[5000];
-	va_list ap;
-
-	va_start(ap, format);
-#ifdef _WIN32
-	vsprintf(slask, format, ap);
-#else
-	vsnprintf(slask, 5000, format, ap);
-#endif
-	va_end(ap);
-
-	m_response_header[header] = slask;
-}
-
-
-void HTTPSocket::SendRequest()
-{
-	std::string msg;
-	msg = m_method + " " + m_url + " " + m_http_version + "\r\n";
-	for (string_m::iterator it = m_response_header.begin(); it != m_response_header.end(); it++)
-	{
-		std::string key = (*it).first;
-		std::string val = (*it).second;
-		msg += key + ": " + val + "\r\n";
-	}
-	msg += "\r\n";
-	SendString( msg.c_str() );
-}
-
-
-std::string HTTPSocket::MyUseragent()
-{
-	std::string version = "C++Sockets/";
-#ifdef _VERSION
-	version += _VERSION;
-#endif
-	return version;
-}
-
-
-void HTTPSocket::Reset()
-{
-	m_first = true;
-	m_header = true;
-	m_request = false;
-	m_response = false;
-//	SetLineProtocol(true);
-        while (m_response_header.size())
-        {
-                string_m::iterator it = m_response_header.begin();
-                m_response_header.erase(it);
-        }
-
-}
-
-
-const std::string& HTTPSocket::GetMethod()
-{
-	return m_method;
-}
-
-
-void HTTPSocket::SetMethod(const std::string& x)
-{
-	m_method = x;
-}
-
-
-const std::string& HTTPSocket::GetUrl()
-{
-	return m_url;
-}
-
-
-void HTTPSocket::SetUrl(const std::string& x)
-{
-	m_url = x;
-}
-
-
-const std::string& HTTPSocket::GetUri()
-{
-	return m_uri;
-}
-
-
-const std::string& HTTPSocket::GetQueryString()
-{
-	return m_query_string;
-}
-
-
-const std::string& HTTPSocket::GetHttpVersion()
-{
-	return m_http_version;
-}
-
-
-const std::string& HTTPSocket::GetStatus()
-{
-	return m_status;
-}
-
-
-const std::string& HTTPSocket::GetStatusText()
-{
-	return m_status_text;
-}
-
-
-bool HTTPSocket::IsRequest()
-{
-	return m_request;
-}
-
-
-bool HTTPSocket::IsResponse()
-{
-	return m_response;
-}
-
-
-void HTTPSocket::SetHttpVersion(const std::string& x)
-{
-	m_http_version = x;
-}
-
-
-void HTTPSocket::SetStatus(const std::string& num, const std::string& text) {
-	m_status = num;
-	m_status_text = text;
-}
-
-void HTTPSocket::SetStatus(const std::string& x)
-{
-	m_status = x;
-}
-
-
-void HTTPSocket::SetStatusText(const std::string& x)
-{
-	m_status_text = x;
-}
-
-
-void HTTPSocket::AddResponseHeader(const std::string& x,const std::string& y)
-{
-	m_response_header[x] = y;
-}
-
-
-void HTTPSocket::SetUri(const std::string& x)
-{
-	m_uri = x;
-}
-
-void HTTPSocket::SendResponse(const std::string& status_num, const std::string& status_text) {
-	SetStatus(status_num, status_text);
-	SendResponse();
-}
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-

common/SocketLib/HTTPSocket.h

@@ -1,137 +0,0 @@
-/*  EQEMu:  Everquest Server Emulator
- * 
- * 	This code originated from `C++ Sockets Library` referenced below.
- * 	Taken and stripped/modified to remove dependancies on parts of
- * 	the library which we are not using, and to suit other needs.
- * 		2006 - EQEMu Development Team (http://eqemulator.net)
- * 
- * 
- */
-
-/** \file HTTPSocket.h 	Class HTTPSocket definition.
- **	\date  2004-04-06
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef _HTTPSOCKET_H
-#define _HTTPSOCKET_H
-
-#include <map>
-#include <string>
-#include "../tcp_connection.h"
-
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-/** \defgroup http HTTP Sockets */
-/** HTTP request/response base class. 
-	\ingroup http */
-class HTTPSocket : public TCPConnection
-{
-	/** map to hold http header values. */
-	typedef std::map<std::string,std::string> string_m;
-public:
-	HTTPSocket(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 irPort);
-	virtual ~HTTPSocket();
-
-	void OnLine(const std::string& line);
-
-	/** Callback executes when first line has been received.
-		GetMethod, GetUrl/GetUri, and GetHttpVersion are valid when this callback is executed. */
-	virtual void OnFirst() = 0;
-	/** For each header line this callback is executed.
-		\param key Http header name
-		\param value Http header value */
-	virtual void OnHeader(const std::string& key,const std::string& value) = 0;
-	/** Callback fires when all http headers have been received. */
-	virtual void OnHeaderComplete() = 0;
-	/** Chunk of http body data recevied. */
-	virtual void OnData(const char *,size_t) = 0;
-
-	const std::string& GetMethod();
-	void SetMethod(const std::string& x);
-	const std::string& GetUrl();
-	void SetUrl(const std::string& x);
-	const std::string& GetUri();
-	void SetUri(const std::string& x);
-	const std::string& GetQueryString();
-	const std::string& GetHttpVersion();
-	const std::string& GetStatus();
-	const std::string& GetStatusText();
-	bool IsRequest();
-	bool IsResponse();
-
-	void SetHttpVersion(const std::string& x);
-	void SetStatus(const std::string& x);
-	void SetStatus(const std::string& num, const std::string& text);
-	void SetStatusText(const std::string& x);
-	void AddResponseHeader(const std::string& x,const std::string& y);
-	void AddResponseHeader(const std::string& x,const char *format, ...);
-	void SendResponse();
-	void SendResponse(const std::string& status_num, const std::string& status_text);
-	void SendRequest();
-
-	/** Implement this to return your own User-agent string. */
-	virtual std::string MyUseragent();
-
-protected:
-	/** Reset state of socket to sucessfully implement keep-alive. */
-	virtual void Reset();
-	
-	//stubs for crap which used to be in our parent class (TcpSocket)
-	bool SendString(const char *str);
-	bool SendBuf(const char *dat, unsigned int len);
-
-	virtual bool ProcessReceivedData(char* errbuf = 0);
-	
-private:
-//	HTTPSocket& operator=(const HTTPSocket& ) { return *this; }
-	bool m_first;
-	bool m_header;
-	std::string m_line;
-	std::string m_method;
-	std::string m_url;
-	std::string m_uri;
-	std::string m_query_string;
-	std::string m_http_version;
-	std::string m_status;
-	std::string m_status_text;
-	bool m_request;
-	bool m_response;
-	string_m m_response_header;
-};
-
-
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _HTTPSOCKET_H

common/SocketLib/HttpdCookies.cpp

@@ -1,250 +0,0 @@
-/** \file HttpdCookies.cpp
-*/
-/*
-Copyright (C) 2003-2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include "../global_define.h"
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#endif
-#include "Parse.h"
-#include "Utility.h"
-#include "HTTPSocket.h"
-#include "HttpdCookies.h"
-#include "../types.h"
-#include <time.h>
-#include <cstdlib>
-#include <cstring>
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-HttpdCookies::HttpdCookies()
-{
-}
-
-HttpdCookies::HttpdCookies(const std::string& s)
-{
-	Parse *pa = new Parse(s,";");
-
-	std::string slask = pa -> getword();
-	while (slask.size())
-	{
-		Parse *pa2 = new Parse(slask,"=");
-		std::string name = pa2 -> getword();
-		std::string value = pa2 -> getword();
-		delete pa2;
-		COOKIE *c = new COOKIE(name,value);
-		m_cookies.push_back(c);
-		//
-		slask = pa -> getword();
-	}
-	delete pa;
-}
-
-HttpdCookies::~HttpdCookies()
-{
-	for (cookie_v::iterator it = m_cookies.begin(); it != m_cookies.end(); it++)
-	{
-		COOKIE *c = *it;
-		delete c;
-	}
-}
-
-bool HttpdCookies::getvalue(const std::string& name,std::string& buffer) //char *buffer,size_t length)
-{
-	for (cookie_v::iterator it = m_cookies.begin(); it != m_cookies.end(); it++)
-	{
-		COOKIE *c = *it;
-		if (!strcasecmp(c -> name.c_str(),name.c_str()))
-		{
-			buffer = c -> value;
-			return true;
-		}
-	}
-	buffer = "";
-	return false;
-}
-
-void HttpdCookies::replacevalue(const std::string& name,const std::string& value)
-{
-	COOKIE *c = nullptr;
-	
-	for (cookie_v::iterator it = m_cookies.begin(); it != m_cookies.end(); it++)
-	{
-		c = *it;
-		if (!strcasecmp(c -> name.c_str(),name.c_str()))
-			break;
-		c = nullptr;
-	}
-
-	if (c)
-	{
-		c -> value = value;
-	}
-	else
-	{
-		c = new COOKIE(name,value);
-		m_cookies.push_back(c);
-	}
-}
-
-void HttpdCookies::replacevalue(const std::string& name,long l)
-{
-	replacevalue(name, Utility::l2string(l));
-}
-
-void HttpdCookies::replacevalue(const std::string& name,int i)
-{
-	replacevalue(name, Utility::l2string(i));
-}
-
-size_t HttpdCookies::getlength(const std::string& name)
-{
-	COOKIE *c = nullptr;
-
-	for (cookie_v::iterator it = m_cookies.begin(); it != m_cookies.end(); it++)
-	{
-		c = *it;
-		if (!strcasecmp(c -> name.c_str(),name.c_str()))
-			break;
-		c = nullptr;
-	}
-	return c ? c -> value.size() : 0;
-}
-
-void HttpdCookies::setcookie(HTTPSocket *sock, const std::string& domain, const std::string& path, const std::string& name, const std::string& value)
-{
-	char *str = new char[name.size() + value.size() + domain.size() + path.size() + 100];
-
-	// set-cookie response
-	if (domain.size())
-	{
-		sprintf(str, "%s=%s; domain=%s; path=%s; expires=%s",
-		 name.c_str(), value.c_str(),
-		 domain.c_str(),
-		 path.c_str(),
-		 expiredatetime().c_str());
-	}
-	else
-	{
-		sprintf(str, "%s=%s; path=%s; expires=%s",
-		 name.c_str(), value.c_str(),
-		 path.c_str(),
-		 expiredatetime().c_str());
-	}
-	sock -> AddResponseHeader("Set-cookie", str);
-	delete[] str;
-
-	replacevalue(name, value);
-}
-
-void HttpdCookies::setcookie(HTTPSocket *sock, const std::string& domain, const std::string& path, const std::string& name, long value)
-{
-	char *str = new char[name.size() + domain.size() + path.size() + 100];
-	char dt[80];
-
-	// set-cookie response
-	if (domain.size())
-	{
-		sprintf(str, "%s=%ld; domain=%s; path=%s; expires=%s",
-		 name.c_str(), value,
-		 domain.c_str(),
-		 path.c_str(),
-		 expiredatetime().c_str());
-	}
-	else
-	{
-		sprintf(str, "%s=%ld; path=%s; expires=%s",
-		 name.c_str(), value,
-		 path.c_str(),
-		 expiredatetime().c_str());
-	}
-	sock -> AddResponseHeader("Set-cookie", str);
-	delete[] str;
-
-	sprintf(dt, "%ld", value);
-	replacevalue(name, dt);
-}
-
-void HttpdCookies::setcookie(HTTPSocket *sock, const std::string& domain, const std::string& path, const std::string& name, int value)
-{
-	char *str = new char[name.size() + domain.size() + path.size() + 100];
-	char dt[80];
-
-	// set-cookie response
-	if (domain.size())
-	{
-		sprintf(str, "%s=%d; domain=%s; path=%s; expires=%s",
-		 name.c_str(), value,
-		 domain.c_str(),
-		 path.c_str(),
-		 expiredatetime().c_str());
-	}
-	else
-	{
-		sprintf(str, "%s=%d; path=%s; expires=%s",
-		 name.c_str(), value,
-		 path.c_str(),
-		 expiredatetime().c_str());
-	}
-	sock -> AddResponseHeader("Set-cookie", str);
-	delete[] str;
-
-	sprintf(dt, "%d", value);
-	replacevalue(name, dt);
-}
-
-
-const std::string& HttpdCookies::expiredatetime()
-{
-	time_t t = time(nullptr);
-	struct tm * tp = gmtime(&t);
-	const char *days[7] = {"Sunday", "Monday",
-	 "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
-	const char *months[12] = {"Jan", "Feb", "Mar", "Apr", "May",
-	 "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-	char dt[100];
-
-	sprintf(dt, "%s, %02d-%s-%04d %02d:%02d:%02d GMT",
-	 days[tp -> tm_wday],
-	 tp -> tm_mday,
-	 months[tp -> tm_mon],
-	 tp -> tm_year + 1910,
-	 tp -> tm_hour,
-	 tp -> tm_min,
-	 tp -> tm_sec);
-	m_date = dt;
-	return m_date;
-}
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-

common/SocketLib/HttpdCookies.h

@@ -1,91 +0,0 @@
-/** \file HttpdCookies.h
-*/
-/*
-Copyright (C) 2003-2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef _COOKIES_H
-#define _COOKIES_H
-
-#include <list>
-#include <string>
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-//! Store the cookies name/value pairs.
-
-
-
-//! Retrieve and manage cookies during a cgi call.
-class HTTPSocket;
-
-/** HTTP Cookie parse/container class. 
-\sa HttpdSocket
-\sa HttpdForm 
-\ingroup webserver */
-class HttpdCookies 
-{
-	/** Name/value pair store struct. 
-		\ingroup webserver */
-	struct COOKIE
-	{
-		COOKIE(const std::string& n,const std::string& v) : name(n),value(v) {}
-		std::string name;
-		std::string value;
-	};
-	/** list of key/value structs. */
-	typedef std::list<COOKIE *> cookie_v;
-public:
-	HttpdCookies();
-	HttpdCookies(const std::string& query_string);
-	~HttpdCookies();
-
-//	int getvalue(const std::string& ,char *,size_t); // (name, buffer, length)
-	bool getvalue(const std::string&,std::string&);
-	void replacevalue(const std::string& ,const std::string& );
-	void replacevalue(const std::string& ,long);
-	void replacevalue(const std::string& ,int);
-	size_t getlength(const std::string& );
-	void setcookie(HTTPSocket *,const std::string& d,const std::string& p,const std::string& c,const std::string& v);
-	void setcookie(HTTPSocket *,const std::string& d,const std::string& p,const std::string& c,long v);
-	void setcookie(HTTPSocket *,const std::string& d,const std::string& p,const std::string& c,int v);
-	const std::string& expiredatetime();
-
-	cookie_v& GetHttpdCookies() { return m_cookies; }
-
-private:
-	cookie_v m_cookies;
-	std::string m_date;
-};
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _COOKIES_H

common/SocketLib/HttpdForm.cpp

@@ -1,621 +0,0 @@
-/** \file HttpdForm.cpp - read stdin, parse cgi input
- **
- **	Written: 1999-Feb-10 grymse@alhem.net
- **/
-
-/*
-Copyright (C) 1999-2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#include <stdio.h>
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#include <windows.h>
-#endif
-#include "socket_include.h"
-#include "Parse.h"
-#include "IFile.h"
-#include "HttpdForm.h"
-#include <cstdlib>
-#include <cstring>
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-HttpdForm::HttpdForm(IFile *infil) : raw(false)
-{
-	CGI *cgi = nullptr;
-	char *c_t = getenv("CONTENT_TYPE");
-	char *c_l = getenv("CONTENT_LENGTH");
-	size_t extra = 2;
-	char name[200];
-
-	m_current = m_cgi.end();
-	*name = 0;
-
-	if (c_t && !strncmp(c_t, "multipart/form-data",19))
-	{
-		Parse pa(c_t,";=");
-		char *tempcmp = nullptr;
-		size_t tc = 0;
-		size_t l = 0;
-		std::string str = pa.getword();
-		m_strBoundary = "";
-		while (str.size())
-		{
-			if (!strcmp(str.c_str(),"boundary"))
-			{
-				m_strBoundary = pa.getword();
-				l = m_strBoundary.size();
-				tempcmp = new char[l + extra];
-			}
-			//
-			str = pa.getword();
-		}
-		if (m_strBoundary.size())
-		{
-			std::string content_type;
-			std::string current_name;
-			std::string current_filename;
-			char slask[2000];
-			infil -> fgets(slask, 200);
-			while (!infil -> eof())
-			{
-				while (strlen(slask) && (slask[strlen(slask) - 1] == 13 || slask[strlen(slask) - 1] == 10))
-				{
-					slask[strlen(slask) - 1] = 0;
-				}
-				content_type = "";
-				current_name = "";
-				current_filename = "";
-				if ((strstr(slask,m_strBoundary.c_str()) || strstr(m_strBoundary.c_str(),slask)) && strcmp(slask, m_strBoundary.c_str()))
-				{
-					m_strBoundary = slask;
-					l = m_strBoundary.size();
-					delete[] tempcmp;
-					tempcmp = new char[l + extra];
-				}
-				if (!strcmp(slask, m_strBoundary.c_str()))
-				{
-					// Get headers until empty line
-					infil -> fgets(slask, 200);
-					while (strlen(slask) && (slask[strlen(slask) - 1] == 13 || slask[strlen(slask) - 1] == 10))
-					{
-						slask[strlen(slask) - 1] = 0;
-					}
-					while (!infil -> eof() && *slask)
-					{
-						Parse pa(slask,";");
-						std::string h = pa.getword();
-						if (!strcasecmp(h.c_str(),"Content-type:"))
-						{
-							content_type = pa.getword();
-						}
-						else
-						if (!strcasecmp(h.c_str(),"Content-Disposition:"))
-						{
-							h = pa.getword();
-							if (!strcmp(h.c_str(),"form-data"))
-							{
-								pa.EnableQuote(true);
-								h = pa.getword();
-								while (h.size())
-								{
-									Parse pa2(slask,"=");
-									std::string name = pa2.getword();
-									std::string h = pa2.getrest();
-									if (!strcmp(name.c_str(),"name"))
-									{
-										if (h.size() && h[0] == '"')
-										{
-											current_name = h.substr(1, h.size() - 2);
-										}
-										else
-										{
-											current_name = h;
-										}
-									}
-									else
-									if (!strcmp(name.c_str(),"filename"))
-									{
-										if (h.size() && h[0] == '"')
-										{
-											current_filename = h.substr(1, h.size() - 2);
-										}
-										else
-										{
-											current_filename = h;
-										}
-										size_t x = 0;
-										for (size_t i = 0; i < current_filename.size(); i++)
-										{
-											if (current_filename[i] == '/' || current_filename[i] == '\\')
-												x = i + 1;
-										}
-										if (x)
-										{
-											current_filename = current_filename.substr(x);
-										}
-									}
-									h = pa.getword();
-								}
-							}
-						}
-						// get next header value
-						infil -> fgets(slask, 200);
-						while (strlen(slask) && (slask[strlen(slask) - 1] == 13 || slask[strlen(slask) - 1] == 10))
-						{
-							slask[strlen(slask) - 1] = 0;
-						}
-					}
-					// Read content, save...?
-					if (!current_filename.size()) // not a file
-					{
-						std::string val;
-						infil -> fgets(slask,1000);
-						while (!infil -> eof() && strncmp(slask,m_strBoundary.c_str(),m_strBoundary.size() ))
-						{
-							val += slask;
-							infil -> fgets(slask,1000);
-						}
-						// remove trailing cr/linefeed
-						while (val.size() && (val[val.size() - 1] == 13 || val[val.size() - 1] == 10))
-						{
-							val = val.substr(0,val.size() - 1);
-						}
-						cgi = new CGI(current_name, val);
-						m_cgi.push_back(cgi);
-					}
-					else // current_filename.size() > 0
-					{
-						// read until m_strBoundary...
-						FILE *fil;
-						int out = 0;
-						char c;
-						char fn[1000]; // where post'd file will be saved
-#ifdef _WIN32
-						{
-							char tmp_path[1000];
-							::GetTempPath(1000, tmp_path);
-							if (tmp_path[strlen(tmp_path) - 1] != '\\')
-							{
-								strcat(tmp_path, "\\");
-							}
-							sprintf(fn,"%s%s",tmp_path,current_filename.c_str());
-						}
-#else
-						sprintf(fn,"/tmp/%s",current_filename.c_str());
-#endif
-						if ((fil = fopen(fn, "wb")) != nullptr)
-						{
-							infil -> fread(&c,1,1);
-							while (!infil -> eof())
-							{
-								if (out)
-								{
-									fwrite(&tempcmp[tc],1,1,fil);
-								}
-								tempcmp[tc] = c;
-								tc++;
-								if (tc >= l + extra)
-								{
-									tc = 0;
-									out = 1;
-								}
-								if (tc)
-								{
-									if (!strncmp(tempcmp + tc + extra, m_strBoundary.c_str(), l - tc) &&
-											!strncmp(tempcmp, m_strBoundary.c_str() + l - tc, tc))
-									{
-										break;
-									}
-								}
-								else
-								{
-									if (!strncmp(tempcmp + extra, m_strBoundary.c_str(), l))
-									{
-										break;
-									}
-								}
-								infil -> fread(&c,1,1);
-							}
-							fclose(fil);
-
-							cgi = new CGI(current_name,fn,fn);
-							m_cgi.push_back(cgi);
-						
-							strcpy(slask, m_strBoundary.c_str());
-							infil -> fgets(slask + strlen(slask), 200); // next line
-						}
-						else
-						{
-							// couldn't open file
-							break;
-						}
-					}
-				}
-				else
-				{
-					// Probably '<m_strBoundary>--'
-					break;
-				}
-			} // while (!infil -> eof())
-		} // if (m_strBoundary)
-		if (tempcmp)
-		{
-			delete[] tempcmp;
-		}
-	}
-	else
-	{
-		int i = 0;
-		int cl = c_l ? atoi(c_l) : -1;
-		char c,chigh,clow;
-		char *slask = new char[8888];
-		bool got_name = false;
-		m_current = m_cgi.end();
-
-		*name = 0;
-
-		infil -> fread(&c,1,1);
-		cl--;
-		while (cl >= 0)
-		{
-			switch (c)
-			{
-				case '=': /* end of name */
-					slask[i] = 0;
-					i = 0;
-					strcpy(name,slask);
-					got_name = true;
-					break;
-				case '&': /* end of value */
-					slask[i] = 0;
-					i = 0;
-					if(got_name) {
-						got_name = false;
-						cgi = new CGI(name,slask);
-						m_cgi.push_back(cgi);
-					} else {
-						cgi = new CGI(slask,"");
-						m_cgi.push_back(cgi);
-					}
-					break;
-				case '+': /* space */
-					slask[i++] = ' ';
-					break;
-				case '%': /* hex value */
-					infil -> fread(&chigh,1,1);
-					cl--;
-					chigh -= 48;
-					chigh &= 0xff - 32;
-					if (chigh > 9)
-						chigh -= 7;
-					infil -> fread(&clow,1,1);
-					cl--;
-					clow -= 48;
-					clow &= 0xff - 32;
-					if (clow > 9)
-						clow -= 7;
-					slask[i++] = (char)(chigh * 16 + clow);
-					break;
-				default: /* just another char */
-					slask[i++] = c;
-					break;
-			}
-			if(infil -> eof())
-				break;
-			//
-			if (cl > 0)
-			{
-				infil -> fread(&c,1,1);
-			}
-			cl--;
-		}
-		slask[i] = 0;
-		i = 0;
-		if(got_name) {
-			cgi = new CGI(name,slask);
-			m_cgi.push_back(cgi);
-		} else {
-			cgi = new CGI(slask,"");
-			m_cgi.push_back(cgi);
-		}
-		delete[] slask;
-	}
-}
-
-
-// HttpdForm(buffer,l) -- request_method GET
-
-HttpdForm::HttpdForm(const std::string& buffer,size_t l) : raw(false)
-{
-	CGI *cgi = nullptr;
-	char slask[8888];
-	char name[200];
-	int i = 0;
-	char c,chigh,clow;
-	bool got_name = false;
-	size_t ptr = 0;
-
-	m_current = m_cgi.end();
-
-	*name = 0;
-	
-	ptr = 0;
-	while (ptr < l)
-	{
-		c = buffer[ptr++];
-		switch (c)
-		{
-			case '=': /* end of name */
-				slask[i] = 0;
-				i = 0;
-				got_name = true;
-				strcpy(name,slask);
-				break;
-			case '&': /* end of value */
-				slask[i] = 0;
-				i = 0;
-				if(got_name) {
-					got_name = false;
-					cgi = new CGI(name,slask);
-					m_cgi.push_back(cgi);
-				} else {
-					cgi = new CGI(slask, "");
-					m_cgi.push_back(cgi);
-				}
-				break;
-			case '+': /* space */
-				slask[i++] = ' ';
-				break;
-			case '%': /* hex value */
-				chigh = buffer[ptr++];
-				chigh -= 48;
-				chigh &= 0xff - 32;
-				if (chigh > 9)
-					chigh -= 7;
-				clow = buffer[ptr++];
-				clow -= 48;
-				clow &= 0xff - 32;
-				if (clow > 9)
-					clow -= 7;
-				slask[i++] = (char)(chigh * 16 + clow);
-				break;
-			default: /* just another char */
-				slask[i++] = c;
-				break;
-		}
-	}
-	slask[i] = 0;
-	i = 0;
-	if(got_name) {
-		cgi = new CGI(name,slask);
-		m_cgi.push_back(cgi);
-	} else {
-		cgi = new CGI(slask, "");
-		m_cgi.push_back(cgi);
-	}
-}
-
-
-HttpdForm::~HttpdForm()
-{
-	CGI *cgi = nullptr; //,*tmp;
-
-	for (cgi_v::iterator it = m_cgi.begin(); it != m_cgi.end(); it++)
-	{
-		cgi = *it;
-		delete cgi;
-	}
-}
-
-
-void HttpdForm::EnableRaw(bool b)
-{
-	raw = b;
-}
-
-
-void HttpdForm::strcpyval(std::string& v,const char *value) //,size_t len)
-{
-	v = "";
-	for (size_t i = 0; i < strlen(value); i++)
-	{
-		if (value[i] == '<')
-		{
-			v += "&lt;";
-		}
-		else
-		if (value[i] == '>')
-		{
-			v += "&gt;";
-		}
-		else
-		if (value[i] == '&')
-		{
-			v += "&amp;";
-		}
-		else
-		{
-			v += value[i];
-		}
-	}
-}
-
-
-bool HttpdForm::getfirst(std::string& n) //char *n,size_t len)
-{
-	m_current = m_cgi.begin();
-	return getnext(n);
-}
-
-
-bool HttpdForm::getnext(std::string& n) //char *n,size_t len)
-{
-	if (m_current != m_cgi.end() )
-	{
-		CGI *current = *m_current;
-		n = current -> name;
-		m_current++;
-		return true;
-	}
-	else
-	{
-		n = "";
-	}
-	return false;
-}
-
-
-bool HttpdForm::getfirst(std::string& n,std::string& v) //char *n,size_t len,char *v,size_t vlen)
-{
-	m_current = m_cgi.begin();
-	return getnext(n,v);
-}
-
-
-bool HttpdForm::getnext(std::string& n,std::string& v) //char *n,size_t len,char *v,size_t vlen)
-{
-	if (m_current != m_cgi.end() )
-	{
-		CGI *current = *m_current;
-		n = current -> name;
-		if (raw)
-		{
-			v = current -> value;
-		}
-		else
-		{
-			strcpyval(v,current -> value.c_str());
-		}
-		m_current++;
-		return true;
-	}
-	else
-	{
-		n = "";
-	}
-	return false;
-}
-
-
-int HttpdForm::getvalue(const std::string& n,std::string& v) //char *v,size_t len)
-{
-	CGI *cgi = nullptr;
-	int r = 0;
-
-	for (cgi_v::iterator it = m_cgi.begin(); it != m_cgi.end(); it++)
-	{
-		cgi = *it;
-		if (cgi -> name == n)
-			break;
-		cgi = nullptr;
-	}
-	if (cgi)
-	{
-		if (raw)
-		{
-			v = cgi -> value;
-		}
-		else
-		{
-			strcpyval(v,cgi -> value.c_str());
-		}
-		r++;
-	}
-	else
-	{
-		v = "";
-	}
-
-	return r;
-}
-
-
-std::string HttpdForm::getvalue(const std::string& n)
-{
-	for (cgi_v::iterator it = m_cgi.begin(); it != m_cgi.end(); it++)
-	{
-		CGI *cgi = *it;
-		if (cgi -> name == n)
-		{
-			return cgi -> value;
-		}
-	}
-	return "";
-}
-
-
-size_t HttpdForm::getlength(const std::string& n)
-{
-	CGI *cgi = nullptr;
-	size_t l;
-
-	for (cgi_v::iterator it = m_cgi.begin(); it != m_cgi.end(); it++)
-	{
-		cgi = *it;
-		if (cgi -> name == n)
-			break;
-		cgi = nullptr;
-	}
-	l = cgi ? cgi -> value.size() : 0;
-	if (cgi && !raw)
-	{
-		for (size_t i = 0; i < cgi -> value.size(); i++)
-		{
-			switch (cgi -> value[i])
-			{
-			case '<': // &lt;
-			case '>': // &gt;
-				l += 4;
-				break;
-			case '&': // &amp;
-				l += 5;
-				break;
-			}
-		}
-	}
-	return l;
-}
-
-
-HttpdForm::cgi_v& HttpdForm::getbase()
-{
-	return m_cgi;
-}
-
-
-const std::string& HttpdForm::GetBoundary()
-{
-	return m_strBoundary;
-}
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-

common/SocketLib/HttpdForm.h

@@ -1,115 +0,0 @@
-/** \file HttpdForm.h - read stdin, parse cgi input
- **
- **	Written: 1999-Feb-10 grymse@alhem.net
- **/
-
-/*
-Copyright (C) 1999-2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef _FORM_H
-#define _FORM_H
-
-#include <string>
-#include <list>
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-class IFile;
-
-/** Parse/store a http query_string/form-data body. 
-	\ingroup webserver */
-class HttpdForm
-{
-	/**
-	 * Store the name/value pairs from a GET/POST operation.
-	 * "name" does not have to be unique.
-	 \ingroup webserver
-	*/
-	struct CGI
-	{
-		CGI(const std::string& n,const std::string& v) : name(n),value(v) {}
-		CGI(const std::string& n,const std::string& v,const std::string& p) : name(n),value(v),path(p) {}
-		std::string name;
-		std::string value;
-		std::string path;
-	};
-	/** list of key/value pairs. */
-	typedef std::list<CGI *> cgi_v;
-
-public:
-	/**
-	 * Default constructor (used in POST operations).
-	 * Input is read from stdin. Number of characters to read
-	 * can be found in the environment variable CONTENT_LENGTH.
-	*/
-	HttpdForm(IFile *);
-	/**
-	 * Another constructor (used in GET operations).
-	 * Input is read from the environment variable QUERY_STRING.
-	 * @param query_string The httpd server provided QUERY_STRING
-	 * @param length Query string length.
-	*/
-	HttpdForm(const std::string& query_string,size_t length);
-	~HttpdForm();
-
-	void EnableRaw(bool);
-
-	void strcpyval(std::string&,const char *); //,size_t);
-
-	/* get names */
-	bool getfirst(std::string& n); //char *,size_t);
-	bool getnext(std::string& n); //char *,size_t);
-
-	/* get names and values */
-	bool getfirst(std::string& n,std::string& v); //char *,size_t,char *,size_t);
-	bool getnext(std::string& n,std::string& v); //char *,size_t,char *,size_t);
-
-	/* get value */
-	int getvalue(const std::string& ,std::string& ); //char *,size_t);
-	std::string getvalue(const std::string& );
-	size_t getlength(const std::string& );
-	cgi_v& getbase();
-
-	const std::string& GetBoundary();
-
-private:
-	HttpdForm(const HttpdForm& ) {}
-	HttpdForm& operator=(const HttpdForm& ) { return *this; }
-	cgi_v m_cgi;
-	cgi_v::iterator m_current;
-	std::string m_strBoundary;
-	bool raw;
-};
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _FORM_H

common/SocketLib/HttpdSocket.cpp

@@ -1,352 +0,0 @@
-/** \file HttpdSocket.cpp
-*/
-/*
-Copyright (C) 2001-2004,2005  Anders Hedstrom (grymse@alhem.net)
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#endif
-#include "../global_define.h"
-#include "Utility.h"
-#include "HttpdCookies.h"
-#include "HttpdForm.h"
-#include "MemFile.h"
-#include "HttpdSocket.h"
-#include "../types.h"
-#include <time.h>
-#include <stdio.h>
-#include <cstdlib>
-#include <cstring>
-
-#define DEB(x)
-/*
-#define DEB(x) { \
-	FILE *fil = fopen("httpdlog","at"); \
-	if (!fil) \
-		fil = fopen("httpdlog","wt"); \
-	if (fil) { x; fclose(fil); } \
-}
-*/
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-
-// statics
-int HttpdSocket::m_request_count = 0;
-std::string HttpdSocket::m_start = "";
-
-
-HttpdSocket::HttpdSocket(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 irPort)
-: HTTPSocket(ID,in_socket,irIP,irPort)
-,m_content_length(0)
-,m_file(nullptr)
-,m_received(0)
-,m_request_id(++m_request_count)
-,m_cookies(nullptr)
-,m_form(nullptr)
-{
-	m_http_date = datetime2httpdate(GetDate());
-	if (!m_start.size())
-		m_start = m_http_date;
-}
-
-
-HttpdSocket::~HttpdSocket()
-{
-	if (m_file)
-	{
-		delete m_file;
-	}
-	if (m_cookies)
-		delete m_cookies;
-	if (m_form)
-		delete m_form;
-}
-
-
-void HttpdSocket::OnFirst()
-{
-//	printf("Request: %s %s %s\n",GetMethod().c_str(),GetUrl().c_str(),GetHttpVersion().c_str());
-}
-
-
-void HttpdSocket::OnHeader(const std::string& key,const std::string& value)
-{
-	if (!strcasecmp(key.c_str(),"content-length"))
-	{
-		m_content_length = atoi(value.c_str());
-		m_content_length_str = value;
-	}
-	else
-	if (!strcasecmp(key.c_str(),"cookie"))
-	{
-		m_http_cookie = value;
-	}
-	else
-	if (!strcasecmp(key.c_str(),"content-type"))
-	{
-		m_content_type = value;
-	}
-	else
-	if (!strcasecmp(key.c_str(),"if-modified-since"))
-	{
-		m_if_modified_since = value;
-	}
-}
-
-
-void HttpdSocket::OnHeaderComplete()
-{
-	m_cookies = new HttpdCookies(m_http_cookie);
-
-#if (defined(SOLARIS8) || defined(SOLARIS))
-	{
-		char slask[1000];
-		if (GetMethod() == "GET")
-		{
-			sprintf(slask,"QUERY_STRING=%s", GetQueryString().c_str());
-			putenv(slask);
-		}
-		sprintf(slask,"REQUEST_METHOD=%s", GetMethod().c_str());
-		putenv(slask);
-		sprintf(slask,"HTTP_COOKIE=%s", m_http_cookie.c_str());
-		putenv(slask);
-		sprintf(slask,"CONTENT_TYPE=%s", m_content_type.c_str());
-		putenv(slask);
-		sprintf(slask,"CONTENT_LENGTH=%s", m_content_length_str.c_str());
-		putenv(slask);
-	}
-#elif defined _WIN32
-	{
-		char slask[1000];
-		if (GetMethod() == "GET")
-		{
-			sprintf(slask,"QUERY_STRING=%s", GetQueryString().c_str());
-			_putenv(slask);
-		}
-		sprintf(slask,"REQUEST_METHOD=%s", GetMethod().c_str());
-		_putenv(slask);
-		sprintf(slask,"HTTP_COOKIE=%s", m_http_cookie.c_str());
-		_putenv(slask);
-		sprintf(slask,"CONTENT_TYPE=%s", m_content_type.c_str());
-		_putenv(slask);
-		sprintf(slask,"CONTENT_LENGTH=%s", m_content_length_str.c_str());
-		_putenv(slask);
-	}
-#else
-	if (GetMethod() == "GET")
-	{
-		setenv("QUERY_STRING", GetQueryString().c_str(), 1);
-	}
-	setenv("REQUEST_METHOD", GetMethod().c_str(), 1);
-	setenv("HTTP_COOKIE", m_http_cookie.c_str(), 1);
-	setenv("CONTENT_TYPE", m_content_type.c_str(), 1);
-	setenv("CONTENT_LENGTH", m_content_length_str.c_str(), 1);
-#endif
-
-	if (GetMethod() == "POST")
-	{
-		m_file = new MemFile;
-	}
-	else
-	if (GetMethod() == "GET")
-	{
-		m_form = new HttpdForm(GetQueryString(), GetQueryString().size() );
-		AddResponseHeader("Date", datetime2httpdate(GetDate()) );
-		Exec();
-		Reset(); // prepare for next request
-	}
-	else
-	{
-		AddResponseHeader("Date", GetHttpDate());
-		AddResponseHeader("Connection", "close");
-		SetStatus("405");
-		SetStatusText("Method not allowed");
-		SendResponse();
-	}
-}
-
-
-void HttpdSocket::OnData(const char *p,size_t l)
-{
-	if (m_file)
-	{
-		m_file -> fwrite(p,1,l);
-	}
-	m_received += l;
-	if (m_received >= m_content_length && m_content_length)
-	{
-		// all done
-		if (m_file && !m_form)
-		{
-			m_form = new HttpdForm(m_file);
-			AddResponseHeader("Date", datetime2httpdate(GetDate()) );
-			Exec();
-			Reset(); // prepare for next request
-		}
-	}
-}
-
-
-void HttpdSocket::Send64(const std::string& str64, const std::string& type)
-{
-	if (!strcasecmp(m_start.c_str(), m_if_modified_since.c_str()))
-	{
-		SetStatus("304");
-		SetStatusText("Not Modified");
-		SendResponse();
-	}
-	else
-	{
-		size_t len = Base64::decode_length(str64);
-		unsigned char *buf = new unsigned char[len];
-
-		SetStatus("200");
-		SetStatusText("OK");
-
-		AddResponseHeader("Content-length", Utility::l2string( (long)len) );
-		AddResponseHeader("Content-type", type );
-		AddResponseHeader("Last-modified", m_start);
-		SendResponse();
-
-		Base64::decode(str64, buf, len);
-		SendBuf( (char *)buf, len);
-		delete[] buf;
-	}
-}
-
-
-std::string HttpdSocket::datetime2httpdate(const std::string& dt)
-{
-	struct tm tp;
-	time_t t;
-	const char *days[] = { "Sun","Mon","Tue","Wed","Thu","Fri","Sat" };
-	const char *months[] = { "Jan","Feb","Mar","Apr","May","Jun",
-	                   "Jul","Aug","Sep","Oct","Nov","Dec" };
-	int i;
-	char s[40];
-
-/* 1997-12-16 09:50:40 */
-
-	if (dt.size() == 19) 
-	{
-		tp.tm_year = atoi(dt.substr(0,4).c_str()) - 1900;
-		i = atoi(dt.substr(5,2).c_str()) - 1;
-		tp.tm_mon = i >= 0 ? i : 0;
-		tp.tm_mday = atoi(dt.substr(8,2).c_str());
-		tp.tm_hour = atoi(dt.substr(11,2).c_str());
-		tp.tm_min = atoi(dt.substr(14,2).c_str());
-		tp.tm_sec = atoi(dt.substr(17,2).c_str());
-		tp.tm_wday = 0;
-		tp.tm_yday = 0;
-		tp.tm_isdst = 0;
-		t = mktime(&tp);
-		/*if (t == -1)
-		{
-			Handler().LogError(this, "datetime2httpdate", 0, "mktime() failed");
-		}*/
-
-		sprintf(s,"%s, %02d %s %d %02d:%02d:%02d GMT",
-		 days[tp.tm_wday],
-		 tp.tm_mday,
-		 months[tp.tm_mon],
-		 tp.tm_year + 1900,
-		 tp.tm_hour,tp.tm_min,tp.tm_sec);
-	} 
-	else
-	{
-		*s = 0;
-	}
-	return s;
-}
-
-
-std::string HttpdSocket::GetDate()
-{
-	time_t t = time(nullptr);
-	struct tm* tp = localtime(&t);
-	char slask[40];
-	if (tp)
-	{
-		sprintf(slask,"%d-%02d-%02d %02d:%02d:%02d",
-			tp -> tm_year + 1900,
-			tp -> tm_mon + 1,
-			tp -> tm_mday,
-			tp -> tm_hour,tp -> tm_min,tp -> tm_sec);
-	}
-	else
-	{
-		*slask = 0;
-	}
-	return slask;
-}
-
-
-void HttpdSocket::Reset()
-{
-	HTTPSocket::Reset();
-	m_content_length = 0;
-	if (m_file)
-	{
-		delete m_file;
-		m_file = nullptr;
-	}
-	m_received = 0;
-	m_request_id = ++m_request_count;
-	if (m_cookies)
-		delete m_cookies;
-	m_cookies = nullptr;
-	if (m_form)
-		delete m_form;
-	m_form = nullptr;
-}
-
-
-const std::string& HttpdSocket::GetHttpDate() 
-{
-	return m_http_date; 
-}
-
-
-HttpdCookies *HttpdSocket::GetCookies() 
-{
-	return m_cookies; 
-}
-
-
-HttpdForm *HttpdSocket::GetHttpForm() 
-{
-	return m_form; 
-}
-
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-

common/SocketLib/HttpdSocket.h

@@ -1,99 +0,0 @@
-/** \file HttpdSocket.h
-*/
-/*
-Copyright (C) 2001-2004,2005  Anders Hedstrom (grymse@alhem.net)
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef _HTTPDSOCKET_H
-#define _HTTPDSOCKET_H
-
-#include "HTTPSocket.h"
-
-class TCPConnection;
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-class HttpdCookies;
-class HttpdForm;
-class IFile;
-
-/** \defgroup webserver Webserver framework */
-/** Web server socket framework. 
-	\ingroup webserver */
-class HttpdSocket : public HTTPSocket
-{
-public:
-	HttpdSocket(uint32 ID, SOCKET in_socket, uint32 irIP, uint16 irPort);
-	~HttpdSocket();
-
-	void OnFirst();
-	void OnHeader(const std::string& key,const std::string& value);
-	void OnHeaderComplete();
-	void OnData(const char *,size_t);
-
-	/** This method needs to be implemented with logic to produce
-		a response to an incoming request. */
-	virtual void Exec() = 0;
-	/** Get current date in http rfc format. */
-	const std::string& GetHttpDate();
-	/** Get pointer to cookie class. */
-	HttpdCookies *GetCookies();
-	/** Get pointer to query string/form data class. */
-	HttpdForm *GetHttpForm();
-
-protected:
-	/** Decode and send a base64-encoded string. 
-		\param str64 Base64-encoded string
-		\param type Mime type of content (content-type header) */
-	void Send64(const std::string& str64, const std::string& type);
-	std::string datetime2httpdate(const std::string& dt);
-	std::string GetDate();
-	void Reset();
-	// headers
-	std::string m_http_cookie;
-	std::string m_content_type;
-	std::string m_content_length_str;
-	std::string m_if_modified_since;
-
-private:
-static	int m_request_count;
-static	std::string m_start;
-	size_t m_content_length;
-	IFile *m_file;
-	size_t m_received;
-	int m_request_id;
-	std::string m_http_date;
-	HttpdCookies *m_cookies;
-	HttpdForm *m_form;
-};
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _HTTPDSOCKET_H

common/SocketLib/IFile.h

@@ -1,65 +0,0 @@
-/** \file IFile.h
- **	\date  2005-04-25
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef _IFILE_H
-#define _IFILE_H
-
-#include <string>
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-/** \defgroup file File handling */
-/** Pure virtual file I/O interface. 
-	\ingroup file */
-class IFile
-{
-public:
-	virtual ~IFile() {}
-
-	virtual bool fopen(const std::string&, const std::string&) = 0;
-	virtual void fclose() = 0;
-
-	virtual size_t fread(char *, size_t, size_t) = 0;
-	virtual size_t fwrite(const char *, size_t, size_t) = 0;
-
-	virtual char *fgets(char *, int) = 0;
-	virtual void fprintf(char *format, ...) = 0;
-
-	virtual off_t size() = 0;
-	virtual bool eof() = 0;
-};
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _IFILE_H

common/SocketLib/MemFile.cpp

@@ -1,212 +0,0 @@
-/** \file MemFile.cpp
- **	\date  2005-04-25
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifdef _WIN32
-#pragma warning(disable:4786)
-#endif
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "MemFile.h"
-#include <cstdlib>
-#include <cstring>
-
-#ifdef _DEBUG
-#define DEB(x) x
-#else
-#define DEB(x)
-#endif
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-std::map<std::string,MemFile::block_t *> MemFile::m_files;
-
-
-MemFile::MemFile()
-:m_temporary(true)
-,m_base(new block_t)
-,m_current_read(m_base)
-,m_current_write(m_base)
-,m_read_ptr(0)
-,m_write_ptr(0)
-{
-}
-
-
-MemFile::MemFile(const std::string& path)
-:m_path(path)
-,m_temporary(false)
-,m_base(m_files[path])
-,m_current_read(nullptr)
-,m_current_write(nullptr)
-,m_read_ptr(0)
-,m_write_ptr(0)
-{
-	if (!m_base)
-	{
-		m_base = new block_t;
-		m_files[path] = m_base;
-	}
-	m_current_read = m_base;
-	m_current_write = m_base;
-}
-
-
-MemFile::~MemFile()
-{
-	while (m_base && m_temporary)
-	{
-		block_t *p = m_base;
-		m_base = p -> next;
-		delete p;
-	}
-}
-
-
-bool MemFile::fopen(const std::string& path, const std::string& mode)
-{
-	return true;
-}
-
-
-void MemFile::fclose()
-{
-}
-
-
-
-size_t MemFile::fread(char *ptr, size_t size, size_t nmemb)
-{
-	size_t p = m_read_ptr % BLOCKSIZE;
-	size_t sz = size * nmemb;
-	if (p + sz < BLOCKSIZE)
-	{
-		memcpy(ptr, m_current_read -> data + p, sz);
-		m_read_ptr += sz;
-	}
-	else
-	{
-		size_t sz1 = BLOCKSIZE - p;
-		size_t sz2 = size - sz1;
-		memcpy(ptr, m_current_read -> data + p, sz1);
-		m_read_ptr += sz1;
-		if (m_current_read -> next)
-		{
-			m_current_read = m_current_read -> next;
-			memcpy(ptr + sz1, m_current_read -> data, sz2);
-			m_read_ptr += sz2;
-		}
-		else
-		{
-DEB(printf("Read beyond available data\n");)
-			return sz1;
-		}
-	}
-	return sz;
-}
-
-
-size_t MemFile::fwrite(const char *ptr, size_t size, size_t nmemb)
-{
-	size_t p = m_write_ptr % BLOCKSIZE;
-	size_t sz = size * nmemb;
-	if (p + sz < BLOCKSIZE)
-	{
-		memcpy(m_current_write -> data + p, ptr, sz);
-		m_write_ptr += sz;
-	}
-	else
-	{
-		size_t sz1 = BLOCKSIZE - p;
-		size_t sz2 = size - sz1;
-		memcpy(m_current_write -> data + p, ptr, sz1);
-		block_t *next = new block_t;
-		m_current_write -> next = next;
-		m_current_write = next;
-		memcpy(m_current_write -> data, ptr + sz1, sz2);
-		m_write_ptr += sz;
-	}
-	return sz;
-}
-
-
-
-char *MemFile::fgets(char *s, int size)
-{
-	int n = 0;
-	while (n < size - 1 && !eof())
-	{
-		char c;
-		fread(&c, 1, 1);
-		if (c == 10)
-		{
-			s[n] = 0;
-			return s;
-		}
-		s[n++] = c;
-	}
-	s[n] = 0;
-	return s;
-}
-
-
-void MemFile::fprintf(char *format, ...)
-{
-	va_list ap;
-	char tmp[BLOCKSIZE];
-	va_start(ap, format);
-#ifdef _WIN32
-	vsprintf(tmp, format, ap);
-#else
-	vsnprintf(tmp, BLOCKSIZE - 1, format, ap);
-#endif
-	va_end(ap);
-	fwrite(tmp, 1, strlen(tmp));
-}
-
-
-off_t MemFile::size()
-{
-	return (off_t)m_write_ptr;
-}
-
-
-bool MemFile::eof()
-{
-	return (m_read_ptr < m_write_ptr) ? false : true;
-}
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-

common/SocketLib/MemFile.h

@@ -1,93 +0,0 @@
-/** \file MemFile.h
- **	\date  2005-04-25
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef _MEMFILE_H
-#define _MEMFILE_H
-
-#include <map>
-#include "IFile.h"
-
-#define BLOCKSIZE 32768
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-/** Implements a memory file. 
-	\ingroup file */
-class MemFile : public IFile
-{
-public:
-	/** File block structure. 
-		\ingroup file */
-	struct block_t {
-		block_t() : next(nullptr) {}
-		struct block_t *next;
-		char data[BLOCKSIZE];
-	};
-public:
-	MemFile();
-	MemFile(const std::string& path);
-	~MemFile();
-
-	bool fopen(const std::string& path, const std::string& mode);
-	void fclose();
-
-	size_t fread(char *ptr, size_t size, size_t nmemb);
-	size_t fwrite(const char *ptr, size_t size, size_t nmemb);
-
-	char *fgets(char *s, int size);
-	void fprintf(char *format, ...);
-
-	off_t size();
-	bool eof();
-
-private:
-	MemFile(const MemFile& ) {} // copy constructor
-	MemFile& operator=(const MemFile& ) { return *this; } // assignment operator
-
-static	std::map<std::string,block_t *> m_files;
-	std::string m_path;
-	bool m_temporary;
-	block_t *m_base;
-	block_t *m_current_read;
-	block_t *m_current_write;
-	size_t m_read_ptr;
-	size_t m_write_ptr;
-};
-
-
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _MEMFILE_H

common/SocketLib/Mime.cpp

@@ -1,92 +0,0 @@
-/**
- **	File ......... Mime.cpp
- **	Published ....  2004-07-13
- **	Author ....... grymse@alhem.net
-**/
-/*
-Copyright (C) 2004  Anders Hedstrom
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#include <stdio.h>
-
-#include "Parse.h"
-#include "Mime.h"
-#include <cstring>
-
-
-
-Mime::Mime() {
-}
-
-Mime::Mime(const std::string& filename) {
-	LoadMimeFile(filename);
-}
-
-bool Mime::LoadMimeFile(const std::string& filename) {
-	FILE *fil;
-	if ((fil = fopen(filename.c_str(),"rt")) != nullptr) {
-		char * slask = new char[1000];
-		fgets(slask,1000,fil);
-		while (!feof(fil))
-		{
-			while (strlen(slask) && (slask[strlen(slask) - 1] == 13 || slask[strlen(slask) - 1] == 10))
-			{
-				slask[strlen(slask) - 1] = 0;
-			}
-			Parse pa(slask);
-			std::string mime_type = pa.getword();
-			std::string ext = pa.getword();
-			while (ext.size())
-			{
-				m_mime[ext] = mime_type;
-				ext = pa.getword();
-			}
-			//
-			fgets(slask,1000,fil);
-		}
-		delete[] slask;
-		fclose(fil);
-		return(true);
-	}
-	return(false);
-}
-
-
-Mime::~Mime()
-{
-}
-
-void Mime::Clear() {
-	m_mime.clear();
-}
-
-std::string Mime::GetMimeFromFilename(const std::string &filename) const {
-	std::string::size_type pos = filename.find_last_of('.');
-	if(pos == std::string::npos)
-		return(std::string("text/plain"));
-	return(GetMimeFromExtension(filename.substr(pos+1)));
-}
-
-std::string Mime::GetMimeFromExtension(const std::string& ext) const {
-	mime_m::const_iterator res;
-	res = m_mime.find(ext);
-	if(res == m_mime.end())
-		return(std::string("text/plain"));
-	
-	return res->second;
-}
-
-

common/SocketLib/Mime.h

@@ -1,55 +0,0 @@
-/**
- **	File ......... Mime.h
- **	Published ....  2004-07-13
- **	Author ....... grymse@alhem.net
-**/
-/*
-Copyright (C) 2004  Anders Hedstrom
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef _MIME_H
-#define _MIME_H
-
-#include <string>
-#include <map>
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-class Mime {
-	typedef std::map<std::string,std::string> mime_m;
-public:
-	Mime();
-	Mime(const std::string& mime_file);
-	~Mime();
-	
-	void Clear();
-	bool LoadMimeFile(const std::string& mime_file);
-	
-	std::string GetMimeFromFilename(const std::string &filename) const;
-	std::string GetMimeFromExtension(const std::string &ext) const;
-
-private:
-	mime_m m_mime;
-};
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _MIME_H

common/SocketLib/Parse.cpp

@@ -1,327 +0,0 @@
-/** \file Parse.cpp - parse a string
- **
- **	Written: 1999-Feb-10 grymse@alhem.net
- **/
-
-/*
-Copyright (C) 1999-2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "Parse.h"
-
-#ifdef _DEBUG
-#define DEB(x) 
-#else
-#define DEB(x) 
-#endif
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-/* implementation of class Parse */
-
-Parse::Parse()
-:pa_the_str("")
-,pa_splits("")
-,pa_ord("")
-,pa_the_ptr(0)
-,pa_breakchar(0)
-,pa_enable(0)
-,pa_disable(0)
-,pa_nospace(0)
-,pa_quote(false)
-{
-}
-
-Parse::Parse(const std::string&s)
-:pa_the_str(s)
-,pa_splits("")
-,pa_ord("")
-,pa_the_ptr(0)
-,pa_breakchar(0)
-,pa_enable(0)
-,pa_disable(0)
-,pa_nospace(0)
-,pa_quote(false)
-{
-}
-
-Parse::Parse(const std::string&s,const std::string&sp)
-:pa_the_str(s)
-,pa_splits(sp)
-,pa_ord("")
-,pa_the_ptr(0)
-,pa_breakchar(0)
-,pa_enable(0)
-,pa_disable(0)
-,pa_nospace(0)
-,pa_quote(false)
-{
-}
-
-Parse::Parse(const std::string&s,const std::string&sp,short nospace)
-:pa_the_str(s)
-,pa_splits(sp)
-,pa_ord("")
-,pa_the_ptr(0)
-,pa_breakchar(0)
-,pa_enable(0)
-,pa_disable(0)
-,pa_nospace(1)
-,pa_quote(false)
-{
-}
-
-
-Parse::~Parse()
-{
-}
-
-#define C ((pa_the_ptr<pa_the_str.size()) ? pa_the_str[pa_the_ptr] : 0)
-
-short Parse::issplit(char c)
-{
-	for (size_t i = 0; i < pa_splits.size(); i++)
-		if (pa_splits[i] == c)
-			return 1;
-	return 0;
-}
-
-void Parse::getsplit(void)
-{
-	size_t x;
-
-	if (C == '=')
-	{
-		x = pa_the_ptr++;
-	} else
-	{
-		while (C && (issplit(C)))
-			pa_the_ptr++;
-		x = pa_the_ptr;
-		while (C && !issplit(C) && C != '=')
-			pa_the_ptr++;
-	}
-	if (x == pa_the_ptr && C == '=')
-		pa_the_ptr++;
-	pa_ord = (x < pa_the_str.size()) ? pa_the_str.substr(x,pa_the_ptr - x) : "";
-}
-
-std::string Parse::getword(void)
-{
-	size_t x;
-	int disabled = 0;
-	int quote = 0;
-	int rem = 0;
-
-	if (pa_nospace)
-	{
-		while (C && issplit(C))
-			pa_the_ptr++;
-		x = pa_the_ptr;
-		while (C && !issplit(C) && (C != pa_breakchar || !pa_breakchar || disabled))
-		{
-			if (pa_breakchar && C == pa_disable)
-				disabled = 1;
-			if (pa_breakchar && C == pa_enable)
-				disabled = 0;
-			if (pa_quote && C == '"')
-				quote = 1;
-			pa_the_ptr++;
-			while (quote && C && C != '"')
-			{
-				pa_the_ptr++;
-			}
-			if (pa_quote && C == '"')
-			{
-				pa_the_ptr++;
-			}
-			quote = 0;
-		}
-	} else
-	{
-		if (C == pa_breakchar && pa_breakchar)
-		{
-			x = pa_the_ptr++;
-			rem = 1;
-		} else
-		{
-			while (C && (C == ' ' || C == 9 || C == 13 || C == 10 || issplit(C)))
-				pa_the_ptr++;
-			x = pa_the_ptr;
-			while (C && C != ' ' && C != 9 && C != 13 && C != 10 && !issplit(C) &&
-			 (C != pa_breakchar || !pa_breakchar || disabled))
-			{
-				if (pa_breakchar && C == pa_disable)
-					disabled = 1;
-				if (pa_breakchar && C == pa_enable)
-					disabled = 0;
-				if (pa_quote && C == '"')
-				{
-					quote = 1;
-				pa_the_ptr++;
-				while (quote && C && C != '"')
-				{
-					pa_the_ptr++;
-				}
-				if (pa_quote && C == '"')
-				{
-					pa_the_ptr++;
-				}
-				}
-				else
-					pa_the_ptr++;
-				quote = 0;
-			}
-			pa_the_ptr++;
-			rem = 1;
-		}
-		if (x == pa_the_ptr && C == pa_breakchar && pa_breakchar)
-			pa_the_ptr++;
-	}
-	if (x < pa_the_str.size())
-	{
-		pa_ord = pa_the_str.substr(x,pa_the_ptr - x - rem);
-	}
-	else
-	{
-		pa_ord = "";
-	}
-	return pa_ord;
-}
-
-void Parse::getword(std::string&s)
-{
-	s = Parse::getword();
-}
-
-void Parse::getsplit(std::string&s)
-{
-	Parse::getsplit();
-	s = pa_ord;
-}
-
-void Parse::getword(std::string&s,std::string&fill,int l)
-{
-	Parse::getword();
-	s = "";
-	while (s.size() + pa_ord.size() < (size_t)l)
-		s += fill;
-	s += pa_ord;
-}
-
-std::string Parse::getrest()
-{
-	std::string s;
-	while (C && (C == ' ' || C == 9 || issplit(C)))
-		pa_the_ptr++;
-	s = (pa_the_ptr < pa_the_str.size()) ? pa_the_str.substr(pa_the_ptr) : "";
-	return s;
-}
-
-void Parse::getrest(std::string&s)
-{
-	while (C && (C == ' ' || C == 9 || issplit(C)))
-		pa_the_ptr++;
-	s = (pa_the_ptr < pa_the_str.size()) ? pa_the_str.substr(pa_the_ptr) : "";
-}
-
-long Parse::getvalue(void)
-{
-	Parse::getword();
-	return atol(pa_ord.c_str());
-}
-
-void Parse::setbreak(char c)
-{
-	pa_breakchar = c;
-}
-
-int Parse::getwordlen(void)
-{
-	size_t x,y = pa_the_ptr,len;
-
-	if (C == pa_breakchar && pa_breakchar)
-	{
-		x = pa_the_ptr++;
-	} else
-	{
-		while (C && (C == ' ' || C == 9 || C == 13 || C == 10 || issplit(C)))
-			pa_the_ptr++;
-		x = pa_the_ptr;
-		while (C && C != ' ' && C != 9 && C != 13 && C != 10 && !issplit(C) && (C != pa_breakchar || !pa_breakchar))
-			pa_the_ptr++;
-	}
-	if (x == pa_the_ptr && C == pa_breakchar && pa_breakchar)
-		pa_the_ptr++;
-	len = pa_the_ptr - x;
-	pa_the_ptr = y;
-	return (int)len;
-}
-
-int Parse::getrestlen(void)
-{
-	size_t y = pa_the_ptr;
-	size_t len;
-
-	while (C && (C == ' ' || C == 9 || issplit(C)))
-		pa_the_ptr++;
-	len = strlen(pa_the_str.c_str() + pa_the_ptr);
-	pa_the_ptr = y;
-	return (int)len;
-}
-
-void Parse::getline(void)
-{
-	size_t x;
-
-	x = pa_the_ptr;
-	while (C && C != 13 && C != 10)
-		pa_the_ptr++;
-	pa_ord = (x < pa_the_str.size()) ? pa_the_str.substr(x,pa_the_ptr - x) : "";
-	if (C == 13)
-		pa_the_ptr++;
-	if (C == 10)
-		pa_the_ptr++;
-}
-
-void Parse::getline(std::string&s)
-{
-	getline();
-	s = pa_ord;
-}
-
-/* end of implementation of class Parse */
-/***************************************************/
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-

common/SocketLib/Parse.h

@@ -1,95 +0,0 @@
-/** \file Parse.h - parse a string
- **
- **	Written: 1999-Feb-10 grymse@alhem.net
- **/
-
-/*
-Copyright (C) 1999-2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef _PARSE_H
-#define _PARSE_H
-
-#include <string>
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-/***************************************************/
-/* interface of class Parse */
-
-/** Splits a string whatever way you want.
-	\ingroup util */
-class Parse
-{
-public:
-	Parse();
-	Parse(const std::string&);
-	Parse(const std::string&,const std::string&);
-	Parse(const std::string&,const std::string&,short);
-	~Parse();
-	short issplit(char);
-	void getsplit(void);
-	void getsplit(std::string&);
-	std::string getword(void);
-	void getword(std::string&);
-	void getword(std::string&,std::string&,int);
-	std::string getrest();
-	void getrest(std::string&);
-	long getvalue(void);
-	void setbreak(char);
-	int getwordlen(void);
-	int getrestlen(void);
-	void enablebreak(char c) {
-		pa_enable = c;
-	}
-	void disablebreak(char c) {
-		pa_disable = c;
-	}
-	void getline(void);
-	void getline(std::string&);
-	size_t getptr(void) { return pa_the_ptr; }
-	void EnableQuote(bool b) { pa_quote = b; }
-
-private:
-	std::string pa_the_str;
-	std::string pa_splits;
-	std::string pa_ord;
-	size_t   pa_the_ptr;
-	char  pa_breakchar;
-	char  pa_enable;
-	char  pa_disable;
-	short pa_nospace;
-	bool  pa_quote;
-};
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _PARSE_H

common/SocketLib/README.eqemu

@@ -1,5 +0,0 @@
-EQEmu took this code from `C++ Sockets Library`
-http://www.alhem.net/Sockets/
-and integrated it into our world server. We did not care for the actual
-socket code (didnt work on windows) so we scrapped all of it, and just
-used the HTTP framework code.

common/SocketLib/README.macosx

@@ -1,5 +0,0 @@
-Find uuid.h here
-	http://www.die.net/doc/linux/include/uuid/uuid.h
-or here
-	http://www.thedna.net/uuid.h
-

common/SocketLib/Utility.cpp

@@ -1,167 +0,0 @@
-/** \file Utility.cpp
- **	\date  2004-02-13
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#include "Utility.h"
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-
-std::string Utility::base64(const std::string& str_in)
-{
-	std::string str;
-	Base64::encode(str_in, str, false); // , false == do not add cr/lf
-	return str;
-}
-
-
-std::string Utility::base64d(const std::string& str_in)
-{
-	std::string str;
-	Base64::decode(str_in, str);
-	return str;
-}
-
-
-std::string Utility::l2string(long l)
-{
-	std::string str;
-	char tmp[100];
-	sprintf(tmp,"%ld",l);
-	str = tmp;
-	return str;
-}
-
-
-std::string Utility::bigint2string(uint64_t l)
-{
-	std::string str;
-	uint64_t tmp = l;
-	while (tmp)
-	{
-		uint64_t a = tmp % 10;
-		str = (char)(a + 48) + str;
-		tmp /= 10;
-	}
-	if (!str.size())
-	{
-		str = "0";
-	}
-	return str;
-}
-
-
-uint64_t Utility::atoi64(const std::string& str) 
-{
-	uint64_t l = 0;
-	for (size_t i = 0; i < str.size(); i++)
-	{
-		l = l * 10 + str[i] - 48;
-	}
-	return l;
-}
-
-
-unsigned int Utility::hex2unsigned(const std::string& str)
-{
-	unsigned int r = 0;
-	for (size_t i = 0; i < str.size(); i++)
-	{
-		r = r * 16 + str[i] - 48 - ((str[i] >= 'A') ? 7 : 0) - ((str[i] >= 'a') ? 32 : 0);
-	}
-	return r;
-}
-
-
-/*
-* Encode string per RFC1738 URL encoding rules
-* tnx rstaveley
-*/
-std::string Utility::rfc1738_encode(const std::string& src)
-{
-static	char hex[] = "0123456789ABCDEF";
-	std::string dst;
-	for (size_t i = 0; i < src.size(); i++)
-	{
-		if (isalnum(src[i]))
-		{
-			dst += src[i];
-		}
-		else
-		if (src[i] == ' ')
-		{
-			dst += '+';
-		}
-		else
-		{
-			dst += '%';
-			dst += hex[src[i] / 16];
-			dst += hex[src[i] % 16];
-		}
-	}
-	return dst;
-} // rfc1738_encode
-
-
-/*
-* Decode string per RFC1738 URL encoding rules
-* tnx rstaveley
-*/
-std::string Utility::rfc1738_decode(const std::string& src)
-{
-	std::string dst;
-	for (size_t i = 0; i < src.size(); i++)
-	{
-		if (src[i] == '%' && isxdigit(src[i + 1]) && isxdigit(src[i + 2]))
-		{
-			char c1 = src[++i];
-			char c2 = src[++i];
-			c1 = c1 - 48 - ((c1 >= 'A') ? 7 : 0) - ((c1 >= 'a') ? 32 : 0);
-			c2 = c2 - 48 - ((c2 >= 'A') ? 7 : 0) - ((c2 >= 'a') ? 32 : 0);
-			dst += (char)(c1 * 16 + c2);
-		}
-		else
-		if (src[i] == '+')
-		{
-			dst += ' ';
-		}
-		else
-		{
-			dst += src[i];
-		}
-	}
-	return dst;
-} // rfc1738_decode
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-

common/SocketLib/Utility.h

@@ -1,70 +0,0 @@
-/** \file Utility.h
- **	\date  2004-02-13
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef _UTILITY_H
-#define _UTILITY_H
-
-#include <ctype.h>
-#ifdef _WIN32
-typedef unsigned __int64 uint64_t;
-#else
-#include <stdlib.h>
-#ifdef SOLARIS
-# include <sys/types.h>
-#else
-# include <stdint.h>
-#endif
-#endif
-#include "Base64.h"
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-/** Conversion utilities. 
-	\ingroup util */
-class Utility
-{
-public:
-	static std::string base64(const std::string& str_in);
-	static std::string base64d(const std::string& str_in);
-	static std::string l2string(long l);
-	static std::string bigint2string(uint64_t l);
-	static uint64_t atoi64(const std::string& str);
-	static unsigned int hex2unsigned(const std::string& str);
-	static std::string rfc1738_encode(const std::string& src);
-	static std::string rfc1738_decode(const std::string& src);
-};
-
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // _UTILITY_H

common/SocketLib/gpl.txt

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

common/SocketLib/socket_include.cpp

@@ -1,87 +0,0 @@
-/** \file socket_include.cpp
- **	\date  2004-11-28
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#include <stdio.h>
-
-// only to be included in win32 projects
-const char *StrError(int x) 
-{
-static	char tmp[100];
-	switch (x)
-	{
-	case 10004: return "Interrupted function call.";
-	case 10013: return "Permission denied.";
-	case 10014: return "Bad address.";
-	case 10022: return "Invalid argument.";
-	case 10024: return "Too many open files.";
-	case 10035: return "Resource temporarily unavailable.";
-	case 10036: return "Operation now in progress.";
-	case 10037: return "Operation already in progress.";
-	case 10038: return "Socket operation on nonsocket.";
-	case 10039: return "Destination address required.";
-	case 10040: return "Message too long.";
-	case 10041: return "Protocol wrong type for socket.";
-	case 10042: return "Bad protocol option.";
-	case 10043: return "Protocol not supported.";
-	case 10044: return "Socket type not supported.";
-	case 10045: return "Operation not supported.";
-	case 10046: return "Protocol family not supported.";
-	case 10047: return "Address family not supported by protocol family.";
-	case 10048: return "Address already in use.";
-	case 10049: return "Cannot assign requested address.";
-	case 10050: return "Network is down.";
-	case 10051: return "Network is unreachable.";
-	case 10052: return "Network dropped connection on reset.";
-	case 10053: return "Software caused connection abort.";
-	case 10054: return "Connection reset by peer.";
-	case 10055: return "No buffer space available.";
-	case 10056: return "Socket is already connected.";
-	case 10057: return "Socket is not connected.";
-	case 10058: return "Cannot send after socket shutdown.";
-	case 10060: return "Connection timed out.";
-	case 10061: return "Connection refused.";
-	case 10064: return "Host is down.";
-	case 10065: return "No route to host.";
-	case 10067: return "Too many processes.";
-	case 10091: return "Network subsystem is unavailable.";
-	case 10092: return "Winsock.dll version out of range.";
-	case 10093: return "Successful WSAStartup not yet performed.";
-	case 10101: return "Graceful shutdown in progress.";
-	case 10109: return "Class type not found.";
-	case 11001: return "Host not found.";
-	case 11002: return "Nonauthoritative host not found.";
-	case 11003: return "This is a nonrecoverable error.";
-	case 11004: return "Valid name, no data record of requested type.";
-
-	default:
-		break;
-	}
-	sprintf(tmp, "Winsock error code: %d", x);
-	return tmp;
-}

common/SocketLib/socket_include.h

@@ -1,218 +0,0 @@
-/** \file socket_include.h
- **	\date  2005-04-12
- **	\author grymse@alhem.net
-**/
-/*
-Copyright (C) 2004,2005  Anders Hedstrom
-
-This library is made available under the terms of the GNU GPL.
-
-If you would like to use this library in a closed-source application,
-a separate license agreement is available. For information about 
-the closed-source license agreement for the C++ sockets library,
-please visit http://www.alhem.net/Sockets/license.html and/or
-email license@alhem.net.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-#ifndef _SOCKET_INCLUDE_H
-#define _SOCKET_INCLUDE_H
-
-#if (defined(__unix__) || defined(unix)) && !defined(USG)
-#include <sys/param.h>
-#endif
-
-
-#ifndef _WIN32 
-// ----------------------------------------
-// common unix includes / defines
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-#define Errno errno
-#define StrError strerror
-
-// WIN32 adapt
-#define closesocket close
-#define INVALID_SOCKET -1
-#define SOCKET_ERROR -1
-typedef int SOCKET;
-
-#ifndef INADDR_NONE
-#define INADDR_NONE ((unsigned long) -1)
-#endif // INADDR_NONE
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#endif // !_WIN32
-
-
-// ----------------------------------------
-// Generic
-#ifndef SOL_IP
-#define SOL_IP IPPROTO_IP
-#endif
-
-
-// ----------------------------------------
-// OS specific adaptions
-
-#ifdef SOLARIS 
-// ----------------------------------------
-// Solaris
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-typedef unsigned short port_t;
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#define s6_addr16 _S6_un._S6_u8
-#define MSG_NOSIGNAL 0
-
-#elif defined __FreeBSD__
-// ----------------------------------------
-// FreeBSD
-# if __FreeBSD_version >= 400014
-#  define s6_addr16 __u6_addr.__u6_addr16
-#  if !defined(MSG_NOSIGNAL)
-#   define MSG_NOSIGNAL 0
-#  endif
-#  include <netinet/in.h>
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-typedef	in_addr_t ipaddr_t;
-typedef	in_port_t port_t;
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#  define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-#  define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
-# else
-#  error FreeBSD versions prior to 400014 does not support ipv6
-# endif
-
-#elif defined MACOSX 
-// ----------------------------------------
-// Mac OS X
-#include <string.h>
-#include <mach/port.h>
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-typedef unsigned long ipaddr_t;
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#define s6_addr16 __u6_addr.__u6_addr16
-#define MSG_NOSIGNAL 0 // oops - thanks Derek
-#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
-
-#elif defined _WIN32 
-// ----------------------------------------
-// Win32
-#pragma comment(lib, "wsock32.lib")
-#define strcasecmp _stricmp
-
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-typedef unsigned long ipaddr_t;
-typedef unsigned short port_t;
-typedef int socklen_t;
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#define MSG_NOSIGNAL 0
-#define SHUT_RDWR 2
-
-// 1.8.6: define FD_SETSIZE to something bigger than 64 if there are a lot of
-// simultaneous connections (must be done before including winsock.h)
-//#define FD_SETSIZE 1024
-#include <winsock.h>
-
-#define Errno WSAGetLastError()
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-const char *StrError(int x);
-
-// class WSAInitializer is a part of the Socket class (on win32)
-// as a static instance - so whenever an application uses a Socket,
-// winsock is initialized
-class WSAInitializer // Winsock Initializer
-{
-public:
-	WSAInitializer() {
-		if (WSAStartup(0x101,&m_wsadata)) 
-		{
-			exit(-1);
-		}
-	}
-	~WSAInitializer() {
-		WSACleanup();
-	}
-private:
-	WSADATA m_wsadata;
-};
-
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-#else 
-// ----------------------------------------
-// LINUX 
-#ifdef SOCKETS_NAMESPACE
-namespace SOCKETS_NAMESPACE {
-#endif
-
-typedef unsigned long ipaddr_t;
-typedef unsigned short port_t;
-#ifdef SOCKETS_NAMESPACE
-}
-#endif
-
-
-#endif
-
-#ifdef _THREADSAFE_SOCKETS
-#include "mutex.h"
-#include "Lock.h"
-#endif
-
-#endif // _SOCKET_INCLUDE_H

common/StackWalker/StackWalker.cpp

@@ -1,3 +1,20 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 /**********************************************************************
  * 
  * StackWalker.cpp
@@ -342,7 +359,7 @@ public:
     BOOL     Publics;                // contains public symbols
 };
 */
-typedef struct IMAGEHLP_MODULE64_V2 {
+struct IMAGEHLP_MODULE64_V2 {
     DWORD    SizeOfStruct;           // set to sizeof(IMAGEHLP_MODULE64)
     DWORD64  BaseOfImage;            // base load address of module
     DWORD    ImageSize;              // virtual size of the loaded module

common/StackWalker/StackWalker.h

@@ -1,3 +1,20 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 /**********************************************************************
  * 
  * StackWalker.h
@@ -14,7 +31,7 @@
 // so we need not to check the version (because we only support _MSC_VER >= 1100)!
 #pragma once
 
-#include <windows.h>
+#include "common/platform/win/include_windows.h"
 
 // special defines for VC5/6 (if no actual PSDK is installed):
 #if _MSC_VER < 1300
@@ -117,7 +134,7 @@ protected:
     CHAR loadedImageName[STACKWALK_MAX_NAMELEN];
   } CallstackEntry;
 
-  typedef enum CallstackEntryType {firstEntry, nextEntry, lastEntry};
+  enum CallstackEntryType {firstEntry, nextEntry, lastEntry};
 
   virtual void OnSymInit(LPCSTR szSearchPath, DWORD symOptions, LPCSTR szUserName);
   virtual void OnLoadModule(LPCSTR img, LPCSTR mod, DWORD64 baseAddr, DWORD size, DWORD result, LPCSTR symType, LPCSTR pdbName, ULONGLONG fileVersion);

common/additive_lagged_fibonacci_engine.h

@@ -1,28 +1,27 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-	Copyright (C) 2001-2021 EQEMu Development Team (http://eqemulator.net)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-
 #pragma once
 
+#include <algorithm>
 #include <cstdint>
+#include <iostream>
 #include <limits>
 #include <type_traits>
-#include <algorithm>
-#include <iostream>
 
 /*
  * This is an additive lagged fibonacci generator as seen in The Art of Computer Programming, Vol. 2

common/base_packet.cpp

@@ -1,64 +1,52 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-	Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
+#include "common/base_packet.h"
+#include "common/misc.h"
+#include "common/packet_dump.h"
 
-#include "global_define.h"
+BasePacket::BasePacket(const unsigned char* buf, size_t len)
-#include "base_packet.h"
-#include "misc.h"
-#include "packet_dump.h"
-
-BasePacket::BasePacket(const unsigned char *buf, uint32 len)
 {
-	pBuffer=nullptr;
-	size=0;
-	_wpos = 0;
-	_rpos = 0;
-	timestamp.tv_sec = 0;
 	if (len > 0) {
-		size=len;
+		size = static_cast<uint32>(len);
 		pBuffer = new unsigned char[len];
 		if (buf) {
 			memcpy(pBuffer, buf, len);
-		} else {
+		}
+		else {
 			memset(pBuffer, 0, len);
 		}
 	}
 }
 
-BasePacket::BasePacket(SerializeBuffer &buf)
+BasePacket::BasePacket(SerializeBuffer&& buf)
+	: pBuffer(std::exchange(buf.m_buffer, nullptr))
 {
-	pBuffer = buf.m_buffer;
+	// We are essentially taking ownership of this serialize buffer.
-	buf.m_buffer = nullptr;
+	size = static_cast<uint32>(std::exchange(buf.m_pos, 0));
-	size = buf.m_pos;
-	buf.m_pos = 0;
 	buf.m_capacity = 0;
-	_wpos = 0;
-	_rpos = 0;
-	timestamp.tv_sec = 0;
 }
 
 BasePacket::~BasePacket()
 {
-	if (pBuffer)
 	delete[] pBuffer;
 	pBuffer = nullptr;
 }
 
-
 void BasePacket::build_raw_header_dump(char *buffer, uint16 seq) const
 {
 	if (timestamp.tv_sec) {

common/base_packet.h

@@ -1,45 +1,48 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-	Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef BASEPACKET_H_
+#pragma once
-#define BASEPACKET_H_
 
-#include "types.h"
+#include "common/platform/inet.h"
-#include "serialize_buffer.h"
+#include "common/serialize_buffer.h"
-#include <stdio.h>
+#include "common/types.h"
-#include <string.h>
 
-#ifdef _WINDOWS
+#include <cstdio>
-	#include <time.h>
+
-	#include <winsock2.h>
+class BasePacket
-	#include <windows.h>
+{
-#else
+protected:
-	#include <sys/time.h>
+	BasePacket() = default;
-	#include <netinet/in.h>
+	BasePacket(const unsigned char* buf, size_t len);
-#endif
+	BasePacket(SerializeBuffer&& buf);
+
+	virtual ~BasePacket();
 
-class BasePacket {
 public:
-	unsigned char *pBuffer;
+	unsigned char* pBuffer = nullptr;
-	uint32 size, _wpos, _rpos;
+	uint32 size = 0;
-	uint32 src_ip,dst_ip;
+	uint32 _wpos = 0;
-	uint16 src_port,dst_port;
+	uint32 _rpos = 0;
-	uint32 priority;
+	uint32 src_ip = 0;
-	timeval timestamp;
+	uint32 dst_ip = 0;
+	uint16 src_port = 0;
+	uint16 dst_port = 0;
+	uint32 priority = 0;
+	timeval timestamp{};
 
 	virtual void build_raw_header_dump(char *buffer, uint16 seq=0xffff) const;
 	virtual void build_header_dump(char *buffer) const;
@@ -82,17 +85,8 @@ public:
 	uint32 GetReadPosition() { return _rpos; }
 	void SetWritePosition(uint32 Newwpos) { _wpos = Newwpos; }
 	void SetReadPosition(uint32 Newrpos) { _rpos = Newrpos; }
-
-protected:
-	virtual ~BasePacket();
-	BasePacket() { pBuffer=nullptr; size=0; _wpos = 0; _rpos = 0; }
-	BasePacket(const unsigned char *buf, const uint32 len);
-	BasePacket(SerializeBuffer &buf);
 };
 
 extern void DumpPacketHex(const BasePacket* app);
 extern void DumpPacketAscii(const BasePacket* app);
 extern void DumpPacketBin(const BasePacket* app);
-
-#endif /*BASEPACKET_H_*/
-

common/bazaar.cpp

@@ -1,7 +1,25 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "bazaar.h"
 
-#include "../../common/item_instance.h"
+#include "common/item_instance.h"
-#include "repositories/trader_repository.h"
+#include "common/repositories/trader_repository.h"
+
 #include <memory>
 
 std::vector<BazaarSearchResultsFromDB_Struct>
@@ -279,7 +297,8 @@ Bazaar::GetSearchResults(
 		trader_items_ids,
 		std::string(search.item_name),
 		field_criteria_items,
-		where_criteria_items
+		where_criteria_items,
+		search.max_results
 	);
 
 	if (item_results.empty()) {

common/bazaar.h

@@ -1,9 +1,26 @@
-#ifndef EQEMU_BAZAAR_H
+/*	EQEmu: EQEmulator
-#define EQEMU_BAZAAR_H
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "common/item_instance.h"
+#include "common/shareddb.h"
 
 #include <vector>
-#include "shareddb.h"
-#include "../../common/item_instance.h"
 
 class Bazaar {
 public:
@@ -11,6 +28,3 @@ public:
 	GetSearchResults(Database &content_db, Database &db, BazaarSearchCriteria_Struct search, unsigned int char_zone_id, int char_zone_instance_id);
 
 };
-
-
-#endif //EQEMU_BAZAAR_H

common/bodytypes.cpp

@@ -1,5 +1,21 @@
-#include "../common/global_define.h"
+/*	EQEmu: EQEmulator
-#include "../common/bodytypes.h"
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "bodytypes.h"
 
 std::string BodyType::GetName(uint8 body_type_id)
 {

common/bodytypes.h

@@ -1,24 +1,24 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef BODYTYPES_H
+#pragma once
-#define BODYTYPES_H
+
+#include "common/types.h"
 
-#include "types.h"
 #include <map>
 #include <string>
 
@@ -109,5 +109,3 @@ static std::map<uint8, std::string> body_type_names = {
 	{ BodyType::InvisibleMan,   "Invisible Man" },
 	{ BodyType::Special,        "Special" },
 };
-
-#endif

common/classes.cpp

@@ -1,24 +1,25 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemu.org)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include <fmt/format.h>
+#include "classes.h"
-#include "../common/global_define.h"
+
-#include "../common/classes.h"
+#include "common/data_verification.h"
-#include "data_verification.h"
+
+#include "fmt/format.h"
 
 const char *GetClassIDName(uint8 class_id, uint8 level)
 {

common/classes.h

@@ -1,27 +1,27 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemu.org)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef CLASSES_CH
+#pragma once
-#define CLASSES_CH
+
+#include "common/rulesys.h"
+#include "common/types.h"
 
-#include "../common/types.h"
-#include "../common/rulesys.h"
-#include <string>
 #include <map>
+#include <string>
 
 namespace Class {
 	constexpr uint8 None                      = 0;
@@ -156,5 +156,3 @@ bool IsChainClass(uint8 class_id);
 bool IsLeatherClass(uint8 class_id);
 bool IsClothClass(uint8 class_id);
 uint8 ClassArmorType(uint8 class_id);
-
-#endif

common/cli/argh.h

@@ -1,3 +1,20 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #pragma once
 
 #include <algorithm>

common/cli/eqemu_command_handler.cpp

@@ -1,36 +1,31 @@
-/**
+/*	EQEmu: EQEmulator
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
 
-#include <fmt/format.h>
+	Copyright (C) 2001-2026 EQEmu Development Team
-#include "eqemu_command_handler.h"
+
-#include "terminal_color.hpp"
+	This program is free software; you can redistribute it and/or modify
-#include "../platform.h"
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "common/cli/eqemu_command_handler.h"
+#include "common/cli/terminal_color.hpp"
+#include "common/platform.h"
+
+#include "fmt/format.h"
 
 namespace EQEmuCommand {
 
-	std::map<std::string, void (*)(
+	using CommandFunction = void(*)(int argc, char** argv, argh::parser& cmd, std::string& description);
-		int argc,
+
-		char **argv,
+	std::map<std::string, CommandFunction> function_map;
-		argh::parser &cmd,
-		std::string &description
-	)> function_map;
 
 	/**
 	 * @param cmd

common/cli/eqemu_command_handler.h

@@ -1,27 +1,27 @@
-/**
+/*	EQEmu: EQEmulator
- * EQEmulator: Everquest Server Emulator
+
- * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+	Copyright (C) 2001-2026 EQEmu Development Team
- *
+
- * This program is free software; you can redistribute it and/or modify
+	This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+	it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
- *
+	(at your option) any later version.
- * This program is distributed in the hope that it will be useful,
+
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
+	This program is distributed in the hope that it will be useful,
- * are required to give you total support for your newly bought product;
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+	GNU General Public License for more details.
- *
+
- * You should have received a copy of the GNU General Public License
+	You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
 */
+#pragma once
 
-#ifndef EQEMU_EQEMU_COMMAND_HANDLER_H
+#include "common/cli/argh.h"
-#define EQEMU_EQEMU_COMMAND_HANDLER_H
 
-#include "argh.h"
+#include <map>
+#include <string>
+#include <vector>
 
 namespace EQEmuCommand {
 
@@ -70,6 +70,3 @@ namespace EQEmuCommand {
 		char **argv
 	);
 };
-
-
-#endif //EQEMU_EQEMU_COMMAND_HANDLER_H

common/cli/terminal_color.hpp

@@ -1,3 +1,20 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 //!
 //! termcolor
 //! ~~~~~~~~~
@@ -34,7 +51,7 @@
 #   include <unistd.h>
 #elif defined(TERMCOLOR_OS_WINDOWS)
 #   include <io.h>
-#   include <windows.h>
+#   include "common/platform/win/include_windows.h"
 #endif
 
 

common/compression.cpp

@@ -1,7 +1,26 @@
-#include "global_define.h"
+/*	EQEmu: EQEmulator
-#include "types.h"
+
-#include <string.h>
+	Copyright (C) 2001-2026 EQEmu Development Team
-#include <zlib.h>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "compression.h"
+
+#include "common/types.h"
+
+#include "zlib.h"
+#include <cstring>
 
 namespace EQ
 {

common/compression.h

@@ -1,5 +1,24 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #pragma once
 
+#include "common/types.h"
+
 namespace EQ
 {
 	uint32 EstimateDeflateBuffer(uint32 len);

common/condition.cpp

@@ -1,147 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "condition.h"
-
-#ifdef _WINDOWS
-
-	Condition::Condition()
-	{
-		m_events[SignalEvent] = CreateEvent (nullptr, // security
-										FALSE, // is auto-reset event?
-										FALSE, // is signaled initially?
-										nullptr); // name
-		m_events[BroadcastEvent] = CreateEvent (nullptr, // security
-										TRUE, // is auto-reset event?
-										FALSE, // is signaled initially?
-										nullptr); // name
-		m_waiters = 0;
-		InitializeCriticalSection(&CSMutex);
-	}
-
-	Condition::~Condition()
-	{
-		DeleteCriticalSection(&CSMutex);
-		CloseHandle(m_events[SignalEvent]);
-		CloseHandle(m_events[BroadcastEvent]);
-	}
-
-	void Condition::Signal()
-	{
-		EnterCriticalSection(&CSMutex);
-		if(m_waiters > 0)
-			SetEvent(m_events[SignalEvent]);
-		LeaveCriticalSection(&CSMutex);
-	}
-
-	void Condition::SignalAll()
-	{
-		EnterCriticalSection(&CSMutex);
-		if(m_waiters > 0)
-			SetEvent(m_events[BroadcastEvent]);
-		LeaveCriticalSection(&CSMutex);
-	}
-
-	void Condition::Wait()
-	{
-		EnterCriticalSection(&CSMutex);
-
-		m_waiters++;
-
-
-		LeaveCriticalSection(&CSMutex);
-		int result = WaitForMultipleObjects (_eventCount, m_events, FALSE, INFINITE);
-		EnterCriticalSection(&CSMutex);
-
-		m_waiters--;
-
-		//see if we are the last person waiting on the condition, and there was a broadcast
-		//if so, we need to reset the broadcast event.
-		if(m_waiters == 0 && result == (WAIT_OBJECT_0+BroadcastEvent))
-			ResetEvent(m_events[BroadcastEvent]);
-
-		LeaveCriticalSection(&CSMutex);
-	}
-
-#else
-	#include <pthread.h>
-	#include <sys/time.h>
-	#include <errno.h>
-	
-	Condition::Condition()
-	{
-		pthread_cond_init(&cond,nullptr);
-		pthread_mutex_init(&mutex,nullptr);
-	}
-
-	void Condition::Signal()
-	{
-		pthread_mutex_lock(&mutex);
-		pthread_cond_signal(&cond);
-		pthread_mutex_unlock(&mutex);
-	}
-
-	void Condition::SignalAll()
-	{
-		pthread_mutex_lock(&mutex);
-		pthread_cond_broadcast(&cond);
-		pthread_mutex_unlock(&mutex);
-	}
-
-	void Condition::Wait()
-	{
-		pthread_mutex_lock(&mutex);
-		pthread_cond_wait(&cond,&mutex);
-		pthread_mutex_unlock(&mutex);
-	}
-
-	/*
-	I commented this specifically because I think it might be very
-	difficult to write a windows counterpart to it, so I would like
-	to discourage its use until we can confirm that it can be reasonably
-	implemented on windows.
-
-	bool Condition::TimedWait(unsigned long usec)
-	{
-	struct timeval now;
-	struct timespec timeout;
-	int retcode=0;
-		pthread_mutex_lock(&mutex);
-		gettimeofday(&now,nullptr);
-		now.tv_usec+=usec;
-		timeout.tv_sec = now.tv_sec + (now.tv_usec/1000000);
-		timeout.tv_nsec = (now.tv_usec%1000000) *1000;
-		//cout << "now=" << now.tv_sec << "."<<now.tv_usec << endl;
-		//cout << "timeout=" << timeout.tv_sec << "."<<timeout.tv_nsec << endl;
-		retcode=pthread_cond_timedwait(&cond,&mutex,&timeout);
-		pthread_mutex_unlock(&mutex);
-
-		return retcode!=ETIMEDOUT;
-	}
-	*/
-
-	Condition::~Condition()
-	{
-		pthread_mutex_lock(&mutex);
-		pthread_cond_destroy(&cond);
-		pthread_mutex_unlock(&mutex);
-		pthread_mutex_destroy(&mutex);
-	}
-	
-#endif
-

common/condition.h

@@ -1,57 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef __CONDITION_H
-#define __CONDITION_H
-
-#include "global_define.h"
-#include "mutex.h"
-#ifndef WIN32
-#include <pthread.h>
-#endif
-
-//Sombody, someday needs to figure out how to implement a condition
-//system on windows...
-
-
-class Condition {
-	private:
-#ifdef WIN32
-		enum {
-			SignalEvent = 0,
-			BroadcastEvent,
-			_eventCount
-		};
-
-		HANDLE m_events[_eventCount];
-		uint32 m_waiters;
-		CRITICAL_SECTION CSMutex;
-#else
-		pthread_cond_t cond;
-		pthread_mutex_t mutex;
-#endif
-	public:
-		Condition();
-		void Signal();
-		void SignalAll();
-		void Wait();
-//		bool TimedWait(unsigned long usec);
-		~Condition();
-};
-
-#endif
-

common/content/world_content_service.cpp

@@ -1,13 +1,30 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "world_content_service.h"
 
-#include <utility>
+#include "common/database.h"
-#include <glm/vec3.hpp>
+#include "common/eqemu_logsys.h"
-#include "../database.h"
+#include "common/repositories/instance_list_repository.h"
-#include "../rulesys.h"
+#include "common/rulesys.h"
-#include "../eqemu_logsys.h"
+#include "common/zone_store.h"
-#include "../repositories/instance_list_repository.h"
-#include "../zone_store.h"
 
+#include "glm/vec3.hpp"
+#include <utility>
 
 WorldContentService::WorldContentService()
 {
@@ -27,7 +44,7 @@ WorldContentService *WorldContentService::SetExpansionContext()
 	// pull expansion from rules
 	int expansion = RuleI(Expansion, CurrentExpansion);
 	if (expansion >= Expansion::Classic && expansion <= Expansion::MaxId) {
-		content_service.SetCurrentExpansion(expansion);
+		WorldContentService::Instance()->SetCurrentExpansion(expansion);
 	}
 
 	LogInfo(
@@ -41,12 +58,12 @@ WorldContentService *WorldContentService::SetExpansionContext()
 
 std::string WorldContentService::GetCurrentExpansionName()
 {
-	if (content_service.GetCurrentExpansion() == Expansion::EXPANSION_ALL) {
+	if (WorldContentService::Instance()->GetCurrentExpansion() == Expansion::EXPANSION_ALL) {
 		return "All Expansions";
 	}
 
 	if (current_expansion >= Expansion::Classic && current_expansion <= Expansion::MaxId) {
-		return Expansion::ExpansionName[content_service.GetCurrentExpansion()];
+		return Expansion::ExpansionName[WorldContentService::Instance()->GetCurrentExpansion()];
 	}
 
 	return "Unknown Expansion";
@@ -115,7 +132,7 @@ void WorldContentService::SetContentFlags(const std::vector<ContentFlagsReposito
 bool WorldContentService::IsContentFlagEnabled(const std::string &content_flag)
 {
 	for (auto &f: GetContentFlags()) {
-		if (f.flag_name == content_flag && f.enabled == true) {
+		if (f.flag_name == content_flag && f.enabled == 1) {
 			return true;
 		}
 	}
@@ -130,7 +147,7 @@ bool WorldContentService::IsContentFlagEnabled(const std::string &content_flag)
 bool WorldContentService::IsContentFlagDisabled(const std::string &content_flag)
 {
 	for (auto &f: GetContentFlags()) {
-		if (f.flag_name == content_flag && f.enabled == false) {
+		if (f.flag_name == content_flag && f.enabled == 0) {
 			return true;
 		}
 	}
@@ -185,7 +202,7 @@ void WorldContentService::ReloadContentFlags()
 
 	SetContentFlags(set_content_flags);
 	LoadStaticGlobalZoneInstances();
-	zone_store.LoadZones(*m_content_database);
+	ZoneStore::Instance()->LoadZones(*m_content_database);
 }
 
 Database *WorldContentService::GetDatabase() const
@@ -291,7 +308,7 @@ WorldContentService *WorldContentService::LoadStaticGlobalZoneInstances()
 //   instance_list table entry for lavastorm has version = 1, is_global = 1, never_expires = 1
 WorldContentService::FindZoneResult WorldContentService::FindZone(uint32 zone_id, uint32 instance_id)
 {
-	for (const auto &z: zone_store.GetZones()) {
+	for (const auto &z: ZoneStore::Instance()->GetZones()) {
 		for (auto &i: m_zone_static_instances) {
 			if (
 				z.zoneidnumber == zone_id &&

common/content/world_content_service.h

@@ -1,11 +1,29 @@
-#ifndef EQEMU_WORLD_CONTENT_SERVICE_H
+/*	EQEmu: EQEmulator
-#define EQEMU_WORLD_CONTENT_SERVICE_H
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "common/repositories/content_flags_repository.h"
+#include "common/repositories/instance_list_repository.h"
+#include "common/repositories/zone_repository.h"
 
 #include <string>
 #include <vector>
-#include "../repositories/content_flags_repository.h"
-#include "../repositories/zone_repository.h"
-#include "../repositories/instance_list_repository.h"
 
 class Database;
 
@@ -181,6 +199,12 @@ public:
 	FindZoneResult FindZone(uint32 zone_id, uint32 instance_id);
 	bool IsInPublicStaticInstance(uint32 instance_id);
 
+	static WorldContentService* Instance()
+	{
+		static WorldContentService instance;
+		return &instance;
+	}
+
 private:
 	int current_expansion{};
 	std::vector<ContentFlagsRepository::ContentFlags> content_flags;
@@ -193,7 +217,3 @@ private:
 	WorldContentService *LoadStaticGlobalZoneInstances();
 	std::vector<InstanceListRepository::InstanceList> m_zone_static_instances;
 };
-
-extern WorldContentService content_service;
-
-#endif //EQEMU_WORLD_CONTENT_SERVICE_H

common/crash.cpp

@@ -1,32 +1,47 @@
-#include "global_define.h"
+/*	EQEmu: EQEmulator
-#include "eqemu_logsys.h"
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "crash.h"
-#include "strings.h"
+
-#include "process/process.h"
+#include "common/eqemu_config.h"
-#include "http/httplib.h"
+#include "common/eqemu_logsys.h"
-#include "http/uri.h"
+#include "common/http/httplib.h"
-#include "json/json.h"
+#include "common/http/uri.h"
-#include "version.h"
+#include "common/json/json.h"
-#include "eqemu_config.h"
+#include "common/platform.h"
-#include "serverinfo.h"
+#include "common/process/process.h"
-#include "rulesys.h"
+#include "common/rulesys.h"
-#include "platform.h"
+#include "common/serverinfo.h"
+#include "common/strings.h"
+#include "common/version.h"
 
 #include <cstdio>
 #include <vector>
 
-#ifdef _WINDOWS
-#define popen _popen
-#endif
-
 void SendCrashReport(const std::string &crash_report)
 {
 	// can configure multiple endpoints if need be
 	std::vector<std::string> endpoints = {
-		"https://spire.akkadius.com/api/v1/analytics/server-crash-report",
+		"https://spire.eqemu.dev/api/v1/analytics/server-crash-report",
 //		"http://localhost:3010/api/v1/analytics/server-crash-report", // development
 	};
 
+	EQEmuLogSys* log = EQEmuLogSys::Instance();
+
 	auto      config = EQEmuConfig::get();
 	for (auto &e: endpoints) {
 		uri u(e);
@@ -68,12 +83,12 @@ void SendCrashReport(const std::string &crash_report)
 		p["cpus"]              = cpus.size();
 		p["origination_info"]  = "";
 
-		if (!LogSys.origination_info.zone_short_name.empty()) {
+		if (!log->origination_info.zone_short_name.empty()) {
 			p["origination_info"] = fmt::format(
 				"{} ({}) instance_id [{}]",
-				LogSys.origination_info.zone_short_name,
+				log->origination_info.zone_short_name,
-				LogSys.origination_info.zone_long_name,
+				log->origination_info.zone_long_name,
-				LogSys.origination_info.instance_id
+				log->origination_info.instance_id
 			);
 		}
 
@@ -222,8 +237,8 @@ void set_exception_handler() {
 }
 #else
 
-#include <stdio.h>
+#include <cstdio>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <sys/fcntl.h>
@@ -294,7 +309,7 @@ void print_trace()
 		SendCrashReport(crash_report);
 	}
 
-	LogSys.CloseFileLogs();
+	EQEmuLogSys::Instance()->CloseFileLogs();
 
 	exit(1);
 }

common/crash.h

@@ -1,6 +1,20 @@
-#ifndef __EQEMU_CRASH_H
+/*	EQEmu: EQEmulator
-#define __EQEMU_CRASH_H
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
 
 void set_exception_handler();
-
-#endif

common/crc16.cpp

@@ -1,4 +1,23 @@
-#include "crc32.h"
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "crc16.h"
+
+#include "common/crc32.h"
 
 uint16 CRC16(const unsigned char *buf, int size, int key)
 {
@@ -12,4 +31,3 @@ uint16 CRC16(const unsigned char *buf, int size, int key)
 	crc = CRC32::Update(buf, size, crc);
 	return CRC32::Finish(crc) & 0xffff;
 }
-

common/crc16.h

@@ -1,7 +1,22 @@
-#ifndef _CRC16_H
+/*	EQEmu: EQEmulator
-#define _CRC16_H
+
-#include "types.h"
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "common/types.h"
 
 uint16 CRC16(const unsigned char *buf, int size, int key);
-
-#endif

common/crc32.cpp

@@ -1,5 +1,23 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "crc32.h"
-#include <assert.h>
+
+#include <cassert>
 #include <memory.h>
 
 uint32 CRC32Table[256] =
@@ -107,6 +125,6 @@ uint32 CRC32::Update(const uint8* buf, uint32 bufsize, uint32 crc32var) {
 	return crc32var;
 }
 
-inline void CRC32::Calc(const uint8 byte, uint32& crc32var) {
+void CRC32::Calc(const uint8 byte, uint32& crc32var) {
 	crc32var = ((crc32var) >> 8) ^ CRC32Table[(byte) ^ ((crc32var) & 0x000000FF)];
 }

common/crc32.h

@@ -1,6 +1,23 @@
-#ifndef CRC32_H
+/*	EQEmu: EQEmulator
-#define CRC32_H
+
-#include "types.h"
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "common/types.h"
 
 class CRC32 {
 public:
@@ -17,4 +34,3 @@ public:
 private:
 	static inline void		Calc(const uint8 byte, uint32& crc32);
 };
-#endif

common/cron/croncpp.h

@@ -1,13 +1,30 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #pragma once
 
-#include <vector>
+#include <algorithm>
-#include <string>
-#include <sstream>
 #include <bitset>
 #include <cctype>
 #include <ctime>
 #include <iomanip>
-#include <algorithm>
+#include <sstream>
+#include <string>
+#include <vector>
 
 #if __cplusplus > 201402L
 #include <string_view>

common/data_bucket.cpp

@@ -1,19 +1,35 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "data_bucket.h"
-#include "zonedb.h"
+
-#include "mob.h"
+#include "common/data_bucket.h"
-#include "worldserver.h"
+#include "common/database.h"
-#include <ctime>
+#include "common/json/json.hpp"
+
 #include <cctype>
-#include "../common/json/json.hpp"
+#include <ctime>
 
 using json = nlohmann::json;
 
-extern WorldServer worldserver;
 const std::string                               NESTED_KEY_DELIMITER = ".";
-
 std::vector<DataBucketsRepository::DataBuckets> g_data_bucket_cache  = {};
 
-void DataBucket::SetData(const std::string &bucket_key, const std::string &bucket_value, std::string expires_time)
+void DataBucket::SetData(SharedDatabase* database, const std::string &bucket_key, const std::string &bucket_value, std::string expires_time)
 {
 	auto k = DataBucketKey{
 		.key = bucket_key,
@@ -21,18 +37,19 @@ void DataBucket::SetData(const std::string &bucket_key, const std::string &bucke
 		.expires = expires_time,
 	};
 
-	DataBucket::SetData(k);
+	DataBucket::SetData(database, k);
 }
 
-void DataBucket::SetData(const DataBucketKey &k_)
+void DataBucket::SetData(SharedDatabase *database, const DataBucketKey &k_)
 {
 	DataBucketKey k = k_; // copy the key so we can modify it
-	if (k.key.find(NESTED_KEY_DELIMITER) != std::string::npos) {
+	bool is_nested = k.key.find(NESTED_KEY_DELIMITER) != std::string::npos;
+	if (is_nested) {
 		k.key = Strings::Split(k.key, NESTED_KEY_DELIMITER).front();
 	}
 
 	auto b = DataBucketsRepository::NewEntity();
-	auto r = GetData(k, true);
+	auto r = GetData(database, k, true);
 	// if we have an entry, use it
 	if (r.id > 0) {
 		b = r;
@@ -63,6 +80,10 @@ void DataBucket::SetData(const DataBucketKey &k_)
 		if (isalpha(k.expires[0]) || isalpha(k.expires[k.expires.length() - 1])) {
 			expires_time_unix = static_cast<int64>(std::time(nullptr)) + Strings::TimeToSeconds(k.expires);
 		}
+		if (is_nested) {
+			LogDataBuckets("Nested keys can't expire; set expiration on the parent key");
+			expires_time_unix = 0;
+		}
 	}
 
 	b.expires = expires_time_unix;
@@ -75,26 +96,45 @@ void DataBucket::SetData(const DataBucketKey &k_)
 		std::string existing_value = r.id > 0 ? r.value : "{}";
 		json json_value = json::object();
 
+		// Check if the JSON is valid
+		if (Strings::IsValidJson(existing_value)) {
 			try {
 				json_value = json::parse(existing_value);
 			} catch (json::parse_error &e) {
-			LogError("Failed to parse JSON for key [{}]: {}", k_.key, e.what());
+				LogDataBuckets("Failed to parse JSON for key [{}] [{}]", k_.key, e.what());
 				json_value = json::object(); // Reset to an empty object on error
 			}
+		}
 
 		// Recursively merge new key-value pair into the JSON object
 		auto nested_keys = Strings::Split(k_.key, NESTED_KEY_DELIMITER);
+		auto top_key = nested_keys.front();
+		// remove the top-level key
+		nested_keys.erase(nested_keys.begin());
+
 		json *current = &json_value;
 
 		for (size_t i = 0; i < nested_keys.size(); ++i) {
 			const std::string &key_part = nested_keys[i];
+
 			if (i == nested_keys.size() - 1) {
+
+				LogDataBucketsDetail("Setting key [{}] key_part [{}]", k.key, key_part);
+
+				// If the key already exists and is an object or array, prevent overwriting to avoid data loss
+				if (current->contains(key_part) &&
+					((*current)[key_part].is_object() || (*current)[key_part].is_array())) {
+					LogDataBuckets("Attempted to overwrite an existing object or array at key [{}] - skipping", k_.key);
+					return;
+				}
+
 				// Set the value at the final key
 				(*current)[key_part] = k_.value;
 			} else {
 				// Traverse or create nested objects
 				if (!current->contains(key_part)) {
 					(*current)[key_part] = json::object();
+					LogDataBucketsDetail("Creating nested root key [{}] key_part [{}]", k.key, key_part);
 				} else if (!(*current)[key_part].is_object()) {
 					// If key exists but is not an object, reset to object to avoid conflicts
 					(*current)[key_part] = json::object();
@@ -105,7 +145,7 @@ void DataBucket::SetData(const DataBucketKey &k_)
 
 		// Serialize JSON back to string
 		b.value = json_value.dump();
-		b.key_ = nested_keys.front(); // Use the top-level key
+		b.key_ = top_key; // Use the top-level key
 	}
 
 	if (bucket_id) {
@@ -119,10 +159,10 @@ void DataBucket::SetData(const DataBucketKey &k_)
 			}
 		}
 
-		DataBucketsRepository::UpdateOne(database, b);
+		DataBucketsRepository::UpdateOne(*database, b);
 	}
 	else {
-		b = DataBucketsRepository::InsertOne(database, b);
+		b = DataBucketsRepository::InsertOne(*database, b);
 
 		// add to cache if it doesn't exist
 		if (CanCache(k) && !ExistsInCache(b)) {
@@ -132,9 +172,9 @@ void DataBucket::SetData(const DataBucketKey &k_)
 	}
 }
 
-std::string DataBucket::GetData(const std::string &bucket_key)
+std::string DataBucket::GetData(SharedDatabase* database, const std::string &bucket_key)
 {
-	return GetData(DataBucketKey{.key = bucket_key}).value;
+	return GetData(database, DataBucketKey{.key = bucket_key}).value;
 }
 
 DataBucketsRepository::DataBuckets DataBucket::ExtractNestedValue(
@@ -142,12 +182,20 @@ DataBucketsRepository::DataBuckets DataBucket::ExtractNestedValue(
 	const std::string &full_key)
 {
 	auto nested_keys = Strings::Split(full_key, NESTED_KEY_DELIMITER);
+	auto top_key = nested_keys.front();
+	nested_keys.erase(nested_keys.begin());
 	json json_value;
 
+	// Check if the JSON is valid
+	if (!Strings::IsValidJson(bucket.value)) {
+		LogDataBuckets("Invalid JSON for key [{}]", bucket.key_);
+		return DataBucketsRepository::NewEntity();
+	}
+
 	try {
 		json_value = json::parse(bucket.value); // Parse the JSON
 	} catch (json::parse_error &ex) {
-		LogError("Failed to parse JSON for key [{}]: {}", bucket.key_, ex.what());
+		LogDataBuckets("Failed to parse JSON for key [{}] [{}]", bucket.key_, ex.what());
 		return DataBucketsRepository::NewEntity(); // Return empty entity on parse error
 	}
 
@@ -176,7 +224,7 @@ DataBucketsRepository::DataBuckets DataBucket::ExtractNestedValue(
 // if the bucket doesn't exist, it will be added to the cache as a miss
 // if ignore_misses_cache is true, the bucket will not be added to the cache as a miss
 // the only place we should be ignoring the misses cache is on the initial read during SetData
-DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k_, bool ignore_misses_cache)
+DataBucketsRepository::DataBuckets DataBucket::GetData(SharedDatabase* database, const DataBucketKey &k_, bool ignore_misses_cache)
 {
 	DataBucketKey k = k_; // Copy the key so we can modify it
 
@@ -206,7 +254,7 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k_,
 			if (CheckBucketMatch(e, k)) {
 				if (e.expires > 0 && e.expires < std::time(nullptr)) {
 					LogDataBuckets("Attempted to read expired key [{}] removing from cache", e.key_);
-					DeleteData(k);
+					DeleteData(database, k);
 					return DataBucketsRepository::NewEntity();
 				}
 
@@ -223,7 +271,7 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k_,
 
 	// Fetch the value from the database
 	auto r = DataBucketsRepository::GetWhere(
-		database,
+		*database,
 		fmt::format(
 			" {} `key` = '{}' LIMIT 1",
 			DataBucket::GetScopedDbFilters(k),
@@ -272,7 +320,7 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k_,
 
 	// If the entry has expired, delete it
 	if (bucket.expires > 0 && bucket.expires < static_cast<long long>(std::time(nullptr))) {
-		DeleteData(k);
+		DeleteData(database, k);
 		return DataBucketsRepository::NewEntity();
 	}
 
@@ -299,46 +347,28 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k_,
 	return bucket;
 }
 
-std::string DataBucket::GetDataExpires(const std::string &bucket_key)
+std::string DataBucket::GetDataExpires(SharedDatabase* database, const std::string &bucket_key)
 {
-	return GetDataExpires(DataBucketKey{.key = bucket_key});
+	return GetDataExpires(database, DataBucketKey{.key = bucket_key});
 }
 
-std::string DataBucket::GetDataRemaining(const std::string &bucket_key)
+std::string DataBucket::GetDataRemaining(SharedDatabase* database, const std::string &bucket_key)
 {
-	return GetDataRemaining(DataBucketKey{.key = bucket_key});
+	return GetDataRemaining(database, DataBucketKey{.key = bucket_key});
 }
 
-bool DataBucket::DeleteData(const std::string &bucket_key)
+bool DataBucket::DeleteData(SharedDatabase* database, const std::string &bucket_key)
 {
-	return DeleteData(DataBucketKey{.key = bucket_key});
+	return DeleteData(database, DataBucketKey{.key = bucket_key});
 }
 
-// GetDataBuckets bulk loads all data buckets for a mob
+bool DataBucket::DeleteData(SharedDatabase* database, const DataBucketKey &k)
-bool DataBucket::GetDataBuckets(Mob *mob)
 {
-	const uint32 id = mob->GetMobTypeIdentifier();
+	bool is_nested_key = k.key.find(NESTED_KEY_DELIMITER) != std::string::npos;
 
-	if (!id) {
+	if (!is_nested_key) {
-		return false;
+		// Update cache
-	}
-
-	if (mob->IsBot()) {
-		BulkLoadEntitiesToCache(DataBucketLoadType::Bot, {id});
-	}
-	else if (mob->IsClient()) {
-		BulkLoadEntitiesToCache(DataBucketLoadType::Account, {id});
-		BulkLoadEntitiesToCache(DataBucketLoadType::Client, {id});
-	}
-
-	return true;
-}
-
-bool DataBucket::DeleteData(const DataBucketKey &k)
-{
 		if (CanCache(k)) {
-		size_t size_before = g_data_bucket_cache.size();
-
 			// delete from cache where contents match
 			g_data_bucket_cache.erase(
 				std::remove_if(
@@ -350,33 +380,103 @@ bool DataBucket::DeleteData(const DataBucketKey &k)
 				),
 				g_data_bucket_cache.end()
 			);
+		}
 
-		LogDataBuckets(
+		// Regular key deletion, no nesting involved
-			"Deleting bucket key [{}] bot_id [{}] account_id [{}] character_id [{}] npc_id [{}] bot_id [{}] zone_id [{}] instance_id [{}] cache size before [{}] after [{}]",
+		return DataBucketsRepository::DeleteWhere(
-			k.key,
+			*database,
-			k.bot_id,
+			fmt::format("{} `key` = '{}'", DataBucket::GetScopedDbFilters(k), k.key)
-			k.account_id,
+		);
-			k.character_id,
+	}
-			k.npc_id,
+
-			k.bot_id,
+	// If it's a nested key, retrieve the top-level JSON object
-			k.zone_id,
+	auto top_level_key = Strings::Split(k.key, NESTED_KEY_DELIMITER).front();
-			k.instance_id,
+	DataBucketKey top_level_k = k;
-			size_before,
+	top_level_k.key = top_level_key;
-			g_data_bucket_cache.size()
+
+	auto r = GetData(database, top_level_k);
+	if (r.id == 0 || r.value.empty() || !Strings::IsValidJson(r.value)) {
+		LogDataBuckets("Attempted to delete nested key [{}] but parent key [{}] does not exist or is invalid JSON", k.key, top_level_key);
+		return false;
+	}
+
+	json json_value;
+	try {
+		json_value = json::parse(r.value);
+	} catch (json::parse_error &ex) {
+		LogDataBuckets("Failed to parse JSON for key [{}] [{}]", top_level_key, ex.what());
+		return false;
+	}
+
+	// Recursively remove the nested key
+	auto nested_keys = Strings::Split(k.key, NESTED_KEY_DELIMITER);
+	auto top_key = nested_keys.front();
+	nested_keys.erase(nested_keys.begin());
+	json *current = &json_value;
+
+	for (size_t i = 0; i < nested_keys.size(); ++i) {
+		const std::string &key_part = nested_keys[i];
+
+		if (i == nested_keys.size() - 1) {
+			// Last key in the hierarchy - delete it
+			if (current->contains(key_part)) {
+				current->erase(key_part);
+				LogDataBuckets("Deleted nested key [{}] from [{}]", key_part, k.key);
+			} else {
+				LogDataBuckets("Key [{}] not found in JSON - nothing to delete", k.key);
+				return false;
+			}
+		} else {
+			if (!current->contains(key_part) || !(*current)[key_part].is_object()) {
+				LogDataBuckets("Parent key [{}] does not exist or is not an object", key_part);
+				return false;
+			}
+			current = &(*current)[key_part];
+		}
+	}
+
+	// If the JSON object is now empty, delete the top-level key
+	if (json_value.empty()) {
+		LogDataBuckets("Top-level key [{}] is now empty, deleting entire entry", top_level_key);
+
+		// delete cache
+		if (CanCache(k)) {
+			g_data_bucket_cache.erase(
+				std::remove_if(
+					g_data_bucket_cache.begin(),
+					g_data_bucket_cache.end(),
+					[&](DataBucketsRepository::DataBuckets &e) {
+						return CheckBucketMatch(e, top_level_k);
+					}
+				),
+				g_data_bucket_cache.end()
 			);
 		}
 
 		return DataBucketsRepository::DeleteWhere(
-		database,
+			*database,
-		fmt::format(
+			fmt::format("{} `key` = '{}'", DataBucket::GetScopedDbFilters(k), top_level_key)
-			"{} `key` = '{}'",
-			DataBucket::GetScopedDbFilters(k),
-			k.key
-		)
 		);
 	}
 
-std::string DataBucket::GetDataExpires(const DataBucketKey &k)
+	// Otherwise, update the existing JSON without the deleted key
+	r.value = json_value.dump();
+	DataBucketsRepository::UpdateOne(*database, r);
+
+	// Update cache
+	if (CanCache(k)) {
+		for (auto &e : g_data_bucket_cache) {
+			if (CheckBucketMatch(e, top_level_k)) {
+				e.value = r.value;
+				break;
+			}
+		}
+	}
+
+	return true;
+}
+
+std::string DataBucket::GetDataExpires(SharedDatabase* database, const DataBucketKey &k)
 {
 	LogDataBuckets(
 		"Getting bucket expiration key [{}] bot_id [{}] account_id [{}] character_id [{}] npc_id [{}]",
@@ -387,7 +487,7 @@ std::string DataBucket::GetDataExpires(const DataBucketKey &k)
 		k.npc_id
 	);
 
-	auto r = GetData(k);
+	auto r = GetData(database, k);
 	if (r.id == 0) {
 		return {};
 	}
@@ -395,7 +495,7 @@ std::string DataBucket::GetDataExpires(const DataBucketKey &k)
 	return std::to_string(r.expires);
 }
 
-std::string DataBucket::GetDataRemaining(const DataBucketKey &k)
+std::string DataBucket::GetDataRemaining(SharedDatabase* database, const DataBucketKey &k)
 {
 	LogDataBuckets(
 		"Getting bucket remaining key [{}] bot_id [{}] account_id [{}] character_id [{}] npc_id [{}] bot_id [{}] zone_id [{}] instance_id [{}]",
@@ -409,7 +509,7 @@ std::string DataBucket::GetDataRemaining(const DataBucketKey &k)
 		k.instance_id
 	);
 
-	auto r = GetData(k);
+	auto r = GetData(database, k);
 	if (r.id == 0) {
 		return "0";
 	}
@@ -475,10 +575,10 @@ bool DataBucket::CheckBucketMatch(const DataBucketsRepository::DataBuckets &dbe,
 	);
 }
 
-void DataBucket::LoadZoneCache(uint16 zone_id, uint16 instance_id)
+void DataBucket::LoadZoneCache(SharedDatabase* database, uint16 zone_id, uint16 instance_id)
 {
 	const auto &l = DataBucketsRepository::GetWhere(
-		database,
+		*database,
 		fmt::format(
 			"zone_id = {} AND instance_id = {} AND (`expires` > {} OR `expires` = 0)",
 			zone_id,
@@ -518,7 +618,7 @@ void DataBucket::LoadZoneCache(uint16 zone_id, uint16 instance_id)
 	);
 }
 
-void DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector<uint32> ids)
+void DataBucket::BulkLoadEntitiesToCache(SharedDatabase* database, DataBucketLoadType::Type t, std::vector<uint32> ids)
 {
 	if (ids.empty()) {
 		return;
@@ -563,7 +663,7 @@ void DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector
 	}
 
 	const auto &l = DataBucketsRepository::GetWhere(
-		database,
+		*database,
 		fmt::format(
 			"{} IN ({}) AND (`expires` > {} OR `expires` = 0)",
 			column,

common/data_bucket.h

@@ -0,0 +1,88 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "common/json/json_archive_single_line.h"
+#include "common/repositories/data_buckets_repository.h"
+#include "common/shareddb.h"
+#include "common/types.h"
+
+#include <string>
+
+struct DataBucketKey {
+	std::string key;
+	std::string value;
+	std::string expires;
+	uint64_t    account_id   = 0;
+	uint64_t    character_id = 0;
+	uint32_t    npc_id       = 0;
+	uint32_t    bot_id       = 0;
+	uint16_t    zone_id      = 0;
+	uint16_t    instance_id  = 0;
+};
+
+namespace DataBucketLoadType {
+	enum Type : uint8 {
+		Bot,
+		Account,
+		Client,
+		Zone,
+		MaxType
+	};
+
+	static const std::string Name[Type::MaxType] = {
+		"Bot",
+		"Account",
+		"Client",
+		"Zone"
+	};
+}
+
+class DataBucket {
+public:
+	// non-scoped bucket methods (for global buckets)
+	static void SetData(SharedDatabase *database, const std::string &bucket_key, const std::string &bucket_value, std::string expires_time = "");
+	static bool DeleteData(SharedDatabase *database, const std::string &bucket_key);
+	static std::string GetData(SharedDatabase *database, const std::string &bucket_key);
+	static std::string GetDataExpires(SharedDatabase *database, const std::string &bucket_key);
+	static std::string GetDataRemaining(SharedDatabase *database, const std::string &bucket_key);
+
+	// scoped bucket methods
+	static void SetData(SharedDatabase *database, const DataBucketKey &k_);
+	static bool DeleteData(SharedDatabase *database, const DataBucketKey &k);
+	static DataBucketsRepository::DataBuckets GetData(SharedDatabase *database, const DataBucketKey &k_, bool ignore_misses_cache = false);
+	static std::string GetDataExpires(SharedDatabase *database, const DataBucketKey &k);
+	static std::string GetDataRemaining(SharedDatabase *database, const DataBucketKey &k);
+	static std::string GetScopedDbFilters(const DataBucketKey &k);
+
+	// bucket repository versus key matching
+	static bool CheckBucketMatch(const DataBucketsRepository::DataBuckets &dbe, const DataBucketKey &k);
+	static bool ExistsInCache(const DataBucketsRepository::DataBuckets &entry);
+
+	static void LoadZoneCache(SharedDatabase* database, uint16 zone_id, uint16 instance_id);
+	static void BulkLoadEntitiesToCache(SharedDatabase* database, DataBucketLoadType::Type t, std::vector<uint32> ids);
+	static void DeleteCachedBuckets(DataBucketLoadType::Type type, uint32 id, uint32 secondary_id = 0);
+
+	static void DeleteFromMissesCache(DataBucketsRepository::DataBuckets e);
+	static void ClearCache();
+	static void DeleteFromCache(uint64 id, DataBucketLoadType::Type type);
+	static void DeleteZoneFromCache(uint16 zone_id, uint16 instance_id, DataBucketLoadType::Type type);
+	static bool CanCache(const DataBucketKey &key);
+	static DataBucketsRepository::DataBuckets
+	ExtractNestedValue(const DataBucketsRepository::DataBuckets &bucket, const std::string &full_key);
+};

common/data_verification.h

@@ -1,23 +1,20 @@
-/**
+/*	EQEmu: EQEmulator
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
 
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #pragma once
 
 #include <algorithm>

common/database.cpp

@@ -1,86 +1,62 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-	Copyright (C) 2001-2015 EQEMu Development Team (http://eqemulator.net)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
+#include "common/data_verification.h"
+#include "common/database_schema.h"
+#include "common/database.h"
+#include "common/eq_packet_structs.h"
+#include "common/events/player_event_logs.h"
+#include "common/extprofile.h"
+#include "common/http/httplib.h"
+#include "common/http/uri.h"
+#include "common/platform/win/include_windows.h"
+#include "common/repositories/account_repository.h"
+#include "common/repositories/adventure_stats_repository.h"
+#include "common/repositories/bot_data_repository.h"
+#include "common/repositories/buyer_repository.h"
+#include "common/repositories/character_bind_repository.h"
+#include "common/repositories/character_data_repository.h"
+#include "common/repositories/character_languages_repository.h"
+#include "common/repositories/character_leadership_abilities_repository.h"
+#include "common/repositories/character_parcels_repository.h"
+#include "common/repositories/character_pet_name_repository.h"
+#include "common/repositories/character_skills_repository.h"
+#include "common/repositories/data_buckets_repository.h"
+#include "common/repositories/group_id_repository.h"
+#include "common/repositories/group_leaders_repository.h"
+#include "common/repositories/guild_members_repository.h"
+#include "common/repositories/instance_list_repository.h"
+#include "common/repositories/inventory_snapshots_repository.h"
+#include "common/repositories/ip_exemptions_repository.h"
+#include "common/repositories/merchantlist_temp_repository.h"
+#include "common/repositories/name_filter_repository.h"
+#include "common/repositories/npc_types_repository.h"
+#include "common/repositories/raid_details_repository.h"
+#include "common/repositories/raid_members_repository.h"
+#include "common/repositories/reports_repository.h"
+#include "common/repositories/trader_repository.h"
+#include "common/repositories/variables_repository.h"
+#include "common/repositories/zone_repository.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
+#include "common/zone_store.h"
 
-#include "../common/global_define.h"
-#include "../common/rulesys.h"
-
-#include <ctype.h>
-#include <iomanip>
-#include <iostream>
 #include <map>
 #include <algorithm>
-#include <mysqld_error.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "../common/repositories/account_repository.h"
-#include "../common/repositories/adventure_stats_repository.h"
-#include "../common/repositories/character_bind_repository.h"
-#include "../common/repositories/character_data_repository.h"
-#include "../common/repositories/character_languages_repository.h"
-#include "../common/repositories/character_leadership_abilities_repository.h"
-#include "../common/repositories/character_parcels_repository.h"
-#include "../common/repositories/character_skills_repository.h"
-#include "../common/repositories/data_buckets_repository.h"
-#include "../common/repositories/group_id_repository.h"
-#include "../common/repositories/group_leaders_repository.h"
-#include "../common/repositories/guild_members_repository.h"
-#include "../common/repositories/instance_list_repository.h"
-#include "../common/repositories/inventory_snapshots_repository.h"
-#include "../common/repositories/ip_exemptions_repository.h"
-#include "../common/repositories/name_filter_repository.h"
-#include "../common/repositories/npc_types_repository.h"
-#include "../common/repositories/raid_details_repository.h"
-#include "../common/repositories/raid_members_repository.h"
-#include "../common/repositories/reports_repository.h"
-#include "../common/repositories/variables_repository.h"
-#include "../common/repositories/character_pet_name_repository.h"
-#include "../common/events/player_event_logs.h"
-
-// Disgrace: for windows compile
-#ifdef _WINDOWS
-#include <windows.h>
-#define snprintf	_snprintf
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
-#else
-#include "unix.h"
-#include <netinet/in.h>
-#include <sys/time.h>
-
-#endif
-
-#include "database.h"
-#include "data_verification.h"
-#include "eq_packet_structs.h"
-#include "extprofile.h"
-#include "strings.h"
-#include "database_schema.h"
-#include "http/httplib.h"
-#include "http/uri.h"
-
-#include "repositories/zone_repository.h"
-#include "zone_store.h"
-#include "repositories/merchantlist_temp_repository.h"
-#include "repositories/bot_data_repository.h"
-#include "repositories/trader_repository.h"
-#include "repositories/buyer_repository.h"
 
 extern Client client;
 
@@ -708,6 +684,20 @@ const std::string Database::GetNPCNameByID(uint32 npc_id)
 	return e.id ? e.name : std::string();
 }
 
+template<typename InputIterator, typename OutputIterator>
+inline auto CleanMobName(InputIterator first, InputIterator last, OutputIterator result)
+{
+	for (; first != last; ++first) {
+		if (*first == '_') {
+			*result = ' ';
+		}
+		else if (isalpha(*first) || *first == '`') {
+			*result = *first;
+		}
+	}
+	return result;
+}
+
 const std::string Database::GetCleanNPCNameByID(uint32 npc_id)
 {
 	const auto& e = NpcTypesRepository::FindOne(*this, npc_id);
@@ -738,7 +728,7 @@ bool Database::LoadVariables()
 		return true;
 	}
 
-	LockMutex lock(&Mvarcache);
+	std::scoped_lock lock(Mvarcache);
 
 	for (const auto& e : l) {
 		varcache.last_update = std::time(nullptr);
@@ -757,7 +747,7 @@ bool Database::LoadVariables()
 
 bool Database::GetVariable(const std::string& name, std::string& value)
 {
-	LockMutex lock(&Mvarcache);
+	std::scoped_lock lock(Mvarcache);
 
 	if (name.empty()) {
 		return false;
@@ -955,6 +945,29 @@ bool Database::UpdateName(const std::string& old_name, const std::string& new_na
 	return CharacterDataRepository::UpdateOne(*this, e);
 }
 
+bool Database::UpdateNameByID(const int character_id, const std::string& new_name)
+{
+	LogInfo("Renaming [{}] to [{}]", character_id, new_name);
+
+	auto l = CharacterDataRepository::GetWhere(
+		*this,
+		fmt::format(
+			"`id` = {}",
+			character_id
+		)
+	);
+
+	if (l.empty()) {
+		return false;
+	}
+
+	auto& e = l.front();
+
+	e.name = new_name;
+
+	return CharacterDataRepository::UpdateOne(*this, e);
+}
+
 bool Database::IsNameUsed(const std::string& name)
 {
 	if (RuleB(Bots, Enabled)) {
@@ -982,6 +995,20 @@ bool Database::IsNameUsed(const std::string& name)
 	return !character_data.empty();
 }
 
+// Players cannot have the same name as a pet vanity name, or memory corruption occurs.
+bool Database::IsPetNameUsed(const std::string& name)
+{
+	const auto& pet_name_data = CharacterPetNameRepository::GetWhere(
+		*this,
+		fmt::format(
+			"`name` = '{}'",
+			Strings::Escape(name)
+		)
+	);
+
+	return !pet_name_data.empty();
+}
+
 uint32 Database::GetServerType()
 {
 	const auto& l = VariablesRepository::GetWhere(*this, "`varname` = 'ServerType' LIMIT 1");
@@ -1058,11 +1085,11 @@ void Database::SetLFP(uint32 character_id, bool is_lfp)
 	CharacterDataRepository::UpdateOne(*this, e);
 }
 
-void Database::SetLoginFlags(uint32 character_id, bool is_lfp, bool is_lfg, uint8 first_logon)
+void Database::SetLoginFlags(uint32 character_id, bool is_lfp, bool is_lfg, uint8 ingame)
 {
 	auto e = CharacterDataRepository::FindOne(*this, character_id);
 
-	e.firstlogon = first_logon;
+	e.ingame = ingame;
 	e.lfg    = is_lfg ? 1 : 0;
 	e.lfp    = is_lfp ? 1 : 0;
 
@@ -1078,11 +1105,11 @@ void Database::SetLFG(uint32 character_id, bool is_lfg)
 	CharacterDataRepository::UpdateOne(*this, e);
 }
 
-void Database::SetFirstLogon(uint32 character_id, uint8 first_logon)
+void Database::SetIngame(uint32 character_id, uint8 ingame)
 {
 	auto e = CharacterDataRepository::FindOne(*this, character_id);
 
-	e.firstlogon = first_logon;
+	e.ingame = ingame;
 
 	CharacterDataRepository::UpdateOne(*this, e);
 }
@@ -1883,6 +1910,7 @@ bool Database::CopyCharacter(
 	std::vector<std::string> tables_to_zero_id = {
 		"keyring",
 		"data_buckets",
+		"character_evolving_items",
 		"character_instance_safereturns",
 		"character_expedition_lockouts",
 		"character_instance_lockouts",
@@ -1914,6 +1942,12 @@ bool Database::CopyCharacter(
 			)
 		);
 
+		if (!results.Success()) {
+			LogError("Transaction failed [{}] rolling back", results.ErrorMessage());
+			TransactionRollback();
+			return false;
+		}
+
 		std::vector<std::string> columns      = {};
 		int                      column_count = 0;
 
@@ -1932,6 +1966,12 @@ bool Database::CopyCharacter(
 			)
 		);
 
+		if (!results.Success()) {
+			LogError("Transaction failed [{}] rolling back", results.ErrorMessage());
+			TransactionRollback();
+			return false;
+		}
+
 		std::vector<std::vector<std::string>> new_rows;
 
 		for (auto row : results) {
@@ -1999,13 +2039,18 @@ bool Database::CopyCharacter(
 			LogInfo("Copying table [{}] rows [{}]", table_name, Strings::Commify(rows_copied));
 
 			if (!insert.ErrorMessage().empty()) {
+				LogError("Error copying table [{}] [{}]", table_name, insert.ErrorMessage());
 				TransactionRollback();
 				return false;
 			}
 		}
 	}
 
-	TransactionCommit();
+	auto r = TransactionCommit();
+	if (!r.Success()) {
+		LogError("Transaction failed [{}] rolling back", r.ErrorMessage());
+		return false;
+	}
 
 	LogInfo(
 		"Character [{}] copied to [{}] total rows [{}]",
@@ -2175,7 +2220,7 @@ void Database::PurgeCharacterParcels()
 		pel.event_data = ss.str();
 		pel.created_at = std::time(nullptr);
 
-		player_event_logs.AddToQueue(pel);
+		PlayerEventLogs::Instance()->AddToQueue(pel);
 
 		ss.str("");
 		ss.clear();

common/database.h

@@ -1,40 +1,35 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef EQEMU_DATABASE_H
+#pragma once
-#define EQEMU_DATABASE_H
+
+#include "common/dbcore.h"
+#include "common/eq_packet_structs.h"
+#include "common/eqemu_logsys.h"
+#include "common/types.h"
+
+#include <map>
+#include <mutex>
+#include <string>
+#include <vector>
 
 #define AUTHENTICATION_TIMEOUT    60
 #define INVALID_ID                0xFFFFFFFF
 
-#include "global_define.h"
-#include "eqemu_logsys.h"
-
-#include "types.h"
-#include "dbcore.h"
-#include "linked_list.h"
-#include "eq_packet_structs.h"
-
-#include <cmath>
-#include <string>
-#include <vector>
-#include <map>
-
-
 class MySQLRequestResult;
 class Client;
 
@@ -63,17 +58,6 @@ struct VarCache_Struct {
 
 class PTimerList;
 
-#ifdef _WINDOWS
-#if _MSC_VER > 1700 // greater than 2012 (2013+)
-#	define _ISNAN_(a) std::isnan(a)
-#else
-#	include <float.h>
-#	define _ISNAN_(a) _isnan(a)
-#endif
-#else
-#	define _ISNAN_(a) std::isnan(a)
-#endif
-
 #define SQL(...) #__VA_ARGS__
 
 class Database : public DBcore {
@@ -103,6 +87,7 @@ public:
 	bool ReserveName(uint32 account_id, const std::string& name);
 	bool SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp);
 	bool UpdateName(const std::string& old_name, const std::string& new_name);
+	bool UpdateNameByID(const int character_id, const std::string& new_name);
 	bool CopyCharacter(
 		const std::string& source_character_name,
 		const std::string& destination_character_name,
@@ -116,6 +101,7 @@ public:
 	bool CheckGMIPs(const std::string& login_ip, uint32 account_id);
 	bool CheckNameFilter(const std::string& name, bool surname = false);
 	bool IsNameUsed(const std::string& name);
+	bool IsPetNameUsed(const std::string& name);
 
 	uint32 GetAccountIDByChar(const std::string& name, uint32* character_id = 0);
 	uint32 GetAccountIDByChar(uint32 character_id);
@@ -139,6 +125,7 @@ public:
 	bool CheckInstanceExpired(uint16 instance_id);
 	bool CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version, uint32 duration);
 	bool GetUnusedInstanceID(uint16& instance_id);
+	bool TryGetUnusedInstanceID(uint16& instance_id);
 	bool IsGlobalInstance(uint16 instance_id);
 	bool RemoveClientFromInstance(uint16 instance_id, uint32 char_id);
 	bool RemoveClientsFromInstance(uint16 instance_id);
@@ -260,7 +247,7 @@ public:
 	bool SaveTime(int8 minute, int8 hour, int8 day, int8 month, int16 year);
 	void ClearMerchantTemp();
 	void ClearPTimers(uint32 character_id);
-	void SetFirstLogon(uint32 character_id, uint8 first_logon);
+	void SetIngame(uint32 character_id, uint8 ingame);
 	void SetLFG(uint32 character_id, bool is_lfg);
 	void SetLFP(uint32 character_id, bool is_lfp);
 	void SetLoginFlags(uint32 character_id, bool is_lfp, bool is_lfg, uint8 first_logon);
@@ -277,7 +264,7 @@ public:
 	uint64_t GetNextTableId(const std::string& table_name);
 
 private:
-	Mutex           Mvarcache;
+	std::mutex      Mvarcache;
 	VarCache_Struct varcache;
 
 	/* Groups, utility methods. */
@@ -289,5 +276,3 @@ private:
 	void ClearAllRaidDetails();
 	void ClearAllRaidLeaders();
 };
-
-#endif

common/database/database_dump_service.cpp

@@ -1,45 +1,34 @@
-/**
+/*	EQEmu: EQEmulator
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
-*/
 
-#include <string>
+	Copyright (C) 2001-2026 EQEmu Development Team
-#include <cstdio>
+
-#include <iterator>
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "database_dump_service.h"
-#include "../eqemu_logsys.h"
+
-#include "../strings.h"
+#include "common/database_schema.h"
-#include "../eqemu_config.h"
+#include "common/eqemu_config.h"
-#include "../database_schema.h"
+#include "common/eqemu_logsys.h"
-#include "../file.h"
+#include "common/file.h"
-#include "../process/process.h"
+#include "common/process/process.h"
-#include "../termcolor/rang.hpp"
+#include "common/strings.h"
+#include "common/termcolor/rang.hpp"
 
 #include <ctime>
+#include <iterator>
+#include <string>
 
-#if _WIN32
-#include <windows.h>
-#else
-
-#include <sys/time.h>
-#include <thread>
-
-#endif
 
 #define DATABASE_DUMP_PATH "backups/"
 
@@ -50,7 +39,7 @@ bool DatabaseDumpService::IsMySQLInstalled()
 {
 	std::string version_output = GetMySQLVersion();
 
-	return version_output.find("mysql") != std::string::npos && version_output.find("Ver") != std::string::npos;
+	return version_output.find("mysql") != std::string::npos && (version_output.find("Ver") != std::string::npos || version_output.find("from") != std::string::npos);
 }
 
 /**
@@ -204,7 +193,7 @@ void DatabaseDumpService::DatabaseDump()
 	}
 
 	if (IsDumpOutputToConsole()) {
-		LogSys.SilenceConsoleLogging();
+		EQEmuLogSys::Instance()->SilenceConsoleLogging();
 	}
 
 	LogInfo("MySQL installed [{}]", GetMySQLVersion());
@@ -324,7 +313,7 @@ void DatabaseDumpService::DatabaseDump()
 	}
 
 	if (!IsDumpOutputToConsole()) {
-		LogSys.LoadLogSettingsDefaults();
+		EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
 	}
 
 	if (!pipe_file.empty()) {

common/database/database_dump_service.h

@@ -1,26 +1,23 @@
-/**
+/*	EQEmu: EQEmulator
- * EQEmulator: Everquest Server Emulator
+
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
+	Copyright (C) 2001-2026 EQEmu Development Team
- *
+
- * This program is free software; you can redistribute it and/or modify
+	This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+	it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
- *
+	(at your option) any later version.
- * This program is distributed in the hope that it will be useful,
+
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
+	This program is distributed in the hope that it will be useful,
- * are required to give you total support for your newly bought product;
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+	GNU General Public License for more details.
- *
+
- * You should have received a copy of the GNU General Public License
+	You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
 */
+#pragma once
 
-#ifndef EQEMU_DATABASE_DUMP_SERVICE_H
+#include <string>
-#define EQEMU_DATABASE_DUMP_SERVICE_H
-
 
 class DatabaseDumpService {
 public:
@@ -65,7 +62,6 @@ private:
 	bool        dump_system_tables          = false;
 	bool        dump_content_tables         = false;
 	bool        dump_player_tables          = false;
-	bool        dump_query_server_tables    = false;
 	bool        dump_login_server_tables    = false;
 	bool        dump_with_no_data           = false;
 	bool        dump_table_lock             = false;
@@ -98,6 +94,3 @@ private:
 	void BuildCredentialsFile();
 	void RemoveCredentialsFile();
 };
-
-
-#endif //EQEMU_DATABASE_DUMP_SERVICE_H

common/database/database_update.cpp

@@ -1,20 +1,40 @@
-#include <filesystem>
+/*	EQEmu: EQEmulator
-#include "database_update.h"
+
-#include "../eqemu_logsys.h"
+	Copyright (C) 2001-2026 EQEmu Development Team
-#include "../database.h"
+
-#include "../strings.h"
+	This program is free software; you can redistribute it and/or modify
-#include "../rulesys.h"
+	it under the terms of the GNU General Public License as published by
-#include "../http/httplib.h"
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "database_update.h"
+
+#include "common/database.h"
+#include "common/database/database_dump_service.h"
+#include "common/database/database_update_manifest_bots.h"
+#include "common/database/database_update_manifest_custom.h"
+#include "common/database/database_update_manifest.h"
+#include "common/eqemu_logsys.h"
+#include "common/http/httplib.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
+
+#include <filesystem>
 
-#include "database_update_manifest.cpp"
-#include "database_update_manifest_bots.cpp"
-#include "database_dump_service.h"
 
 constexpr int BREAK_LENGTH = 70;
 
 DatabaseVersion DatabaseUpdate::GetDatabaseVersions()
 {
-	auto results = m_database->QueryDatabase("SELECT `version`, `bots_version` FROM `db_version` LIMIT 1");
+	auto results = m_database->QueryDatabase("SELECT `version`, `bots_version`, `custom_version` FROM `db_version` LIMIT 1");
 	if (!results.Success() || !results.RowCount()) {
 		LogError("Failed to read from [db_version] table!");
 		return DatabaseVersion{};
@@ -25,6 +45,7 @@ DatabaseVersion DatabaseUpdate::GetDatabaseVersions()
 	return DatabaseVersion{
 		.server_database_version = Strings::ToInt(r[0]),
 		.bots_database_version = Strings::ToInt(r[1]),
+		.custom_database_version = Strings::ToInt(r[2]),
 	};
 }
 
@@ -33,6 +54,7 @@ DatabaseVersion DatabaseUpdate::GetBinaryDatabaseVersions()
 	return DatabaseVersion{
 		.server_database_version = CURRENT_BINARY_DATABASE_VERSION,
 		.bots_database_version = (RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0),
+		.custom_database_version = CUSTOM_BINARY_DATABASE_VERSION,
 	};
 }
 
@@ -43,6 +65,7 @@ constexpr int LOOK_BACK_AMOUNT = 10;
 // this check will take action
 void DatabaseUpdate::CheckDbUpdates()
 {
+	InjectCustomVersionColumn();
 	InjectBotsVersionColumn();
 	auto v = GetDatabaseVersions();
 	auto b = GetBinaryDatabaseVersions();
@@ -59,6 +82,15 @@ void DatabaseUpdate::CheckDbUpdates()
 		m_database->QueryDatabase(fmt::format("UPDATE `db_version` SET `version` = {}", b.server_database_version));
 	}
 
+	if (UpdateManifest(manifest_entries_custom, v.custom_database_version, b.custom_database_version)) {
+		LogInfo(
+			"Updates ran successfully, setting database version to [{}] from [{}]",
+			b.custom_database_version,
+			v.custom_database_version
+		);
+		m_database->QueryDatabase(fmt::format("UPDATE `db_version` SET `custom_version` = {}", b.custom_database_version));
+	}
+
 	if (b.bots_database_version > 0) {
 		if (UpdateManifest(bot_manifest_entries, v.bots_database_version, b.bots_database_version)) {
 			LogInfo(
@@ -141,7 +173,7 @@ bool DatabaseUpdate::UpdateManifest(
 	std::vector<int> missing_migrations = {};
 	if (version_low != version_high) {
 
-		LogSys.DisableMySQLErrorLogs();
+		EQEmuLogSys::Instance()->DisableMySQLErrorLogs();
 		bool force_interactive = false;
 		for (int version = version_low + 1; version <= version_high; ++version) {
 			for (auto &e: entries) {
@@ -171,7 +203,7 @@ bool DatabaseUpdate::UpdateManifest(
 				}
 			}
 		}
-		LogSys.EnableMySQLErrorLogs();
+		EQEmuLogSys::Instance()->EnableMySQLErrorLogs();
 		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
 
 		if (!missing_migrations.empty() && m_skip_backup) {
@@ -344,6 +376,16 @@ bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 		);
 	}
 
+	if (b.custom_database_version > 0) {
+		LogInfo(
+			"{:>8} | database [{}] binary [{}] {}",
+			"Custom",
+			v.custom_database_version,
+			b.custom_database_version,
+			(v.custom_database_version == b.custom_database_version) ? "up to date" : "checking updates"
+		);
+	}
+
 	LogInfo("{:>8} | [server.auto_database_updates] [<green>true]", "Config");
 
 	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
@@ -353,7 +395,10 @@ bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 	// bots database version is optional, if not enabled then it is always up-to-date
 	bool bots_up_to_date   = RuleB(Bots, Enabled) ? v.bots_database_version >= b.bots_database_version : true;
 
-	return server_up_to_date && bots_up_to_date;
+	// custom database version is optional, if not enabled then it is always up-to-date
+	bool custom_up_to_date = v.custom_database_version >= b.custom_database_version;
+
+	return server_up_to_date && bots_up_to_date && custom_up_to_date;
 }
 
 // checks to see if there are pending updates
@@ -373,3 +418,12 @@ void DatabaseUpdate::InjectBotsVersionColumn()
 		m_database->QueryDatabase("ALTER TABLE db_version ADD bots_version int(11) DEFAULT '0' AFTER version");
 	}
 }
+
+void DatabaseUpdate::InjectCustomVersionColumn()
+{
+	auto results = m_database->QueryDatabase("SHOW COLUMNS FROM `db_version` LIKE 'custom_version'");
+	if (!results.Success() || results.RowCount() == 0) {
+		LogInfo("Adding custom_version column to db_version table");
+		m_database->QueryDatabase("ALTER TABLE `db_version` ADD COLUMN `custom_version` INT(11) UNSIGNED NOT NULL DEFAULT 0");
+	}
+}

common/database/database_update.h

@@ -1,7 +1,23 @@
-#ifndef EQEMU_DATABASE_UPDATE_H
+/*	EQEmu: EQEmulator
-#define EQEMU_DATABASE_UPDATE_H
 
-#include "../database.h"
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "common/database.h"
 
 struct ManifestEntry {
 	int         version{};     // database version of the migration
@@ -17,6 +33,7 @@ struct ManifestEntry {
 struct DatabaseVersion {
 	int server_database_version;
 	int bots_database_version;
+	int custom_database_version;
 };
 
 class DatabaseUpdate {
@@ -32,13 +49,18 @@ public:
 	DatabaseUpdate *SetContentDatabase(Database *db);
 	DatabaseUpdate *SetSkipBackup(bool skip);
 	bool HasPendingUpdates();
+
+	static DatabaseUpdate* Instance()
+	{
+		static DatabaseUpdate instance;
+		return &instance;
+	}
+
 private:
 	bool m_skip_backup = false;
 	Database *m_database;
 	Database *m_content_database;
 	static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
 	void InjectBotsVersionColumn();
-
+	void InjectCustomVersionColumn();
 };
-
-#endif //EQEMU_DATABASE_UPDATE_H

common/database/database_update_manifest.h

@@ -1,4 +1,25 @@
-#include "database_update.h"
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "common/database/database_update.h"
+
+#include <vector>
 
 std::vector<ManifestEntry> manifest_entries = {
 	ManifestEntry{
@@ -6792,7 +6813,7 @@ UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 341) + 5810)
 	},
 	ManifestEntry{
 		.version     = 9304,
-		.description = "2024_12_01_2024_update_guild_bank",
+		.description = "2024_12_01_update_guild_bank",
 		.check       = "SHOW COLUMNS FROM `guild_bank` LIKE 'augment_one_id'",
 		.condition   = "empty",
 		.match       = "",
@@ -6845,7 +6866,7 @@ RENAME TABLE `expedition_lockouts` TO `dynamic_zone_lockouts`;
 		.condition   = "empty",
 		.match = "",
 		.sql = R"(
--- ✅ Drop old indexes
+-- Drop old indexes if exists
 DROP INDEX IF EXISTS `keys` ON `data_buckets`;
 DROP INDEX IF EXISTS `idx_npc_expires` ON `data_buckets`;
 DROP INDEX IF EXISTS `idx_bot_expires` ON `data_buckets`;
@@ -6863,10 +6884,10 @@ ALTER TABLE `data_buckets`
 	MODIFY COLUMN `npc_id` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `character_id`,
 	MODIFY COLUMN `bot_id` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `npc_id`;
 
--- ✅ Create optimized unique index with `key` first
+-- Create optimized unique index with `key` first
 CREATE UNIQUE INDEX `keys` ON data_buckets (`key`, character_id, npc_id, bot_id, account_id, zone_id, instance_id);
 
--- ✅ Create indexes for just instance_id (instance deletion)
+-- Create indexes for just instance_id (instance deletion)
 CREATE INDEX idx_instance_id ON data_buckets (instance_id);
 )",
 		.content_schema_update = false
@@ -6914,7 +6935,7 @@ CREATE TABLE `zone_state_spawns` (
 	},
 	ManifestEntry{
 		.version = 9308,
-		.description = "2025_add_multivalue_support_to_evolving_subtype.sql",
+		.description = "2025_03_29_add_multivalue_support_to_evolving_subtype.sql",
 		.check = "SHOW COLUMNS FROM `items_evolving_details` LIKE 'sub_type'",
 		.condition = "missing",
 		.match = "varchar(200)",
@@ -6938,6 +6959,254 @@ CREATE TABLE `character_pet_name` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 )",
 	},
+	ManifestEntry{
+		.version = 9310,
+		.description = "2025_03_7_expand_horse_def.sql",
+		.check = "SHOW COLUMNS FROM `horses` LIKE 'helmtexture'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `horses`
+	ADD COLUMN `helmtexture` TINYINT(2) NOT NULL DEFAULT -1 AFTER `texture`;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9311,
+		.description = "2025_03_09_add_zone_state_is_zone_field.sql",
+		.check = "SHOW COLUMNS FROM `zone_state_spawns` LIKE 'is_zone'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `zone_state_spawns`
+	ADD COLUMN `is_zone` tinyint(11) NULL DEFAULT 0 AFTER `is_corpse`;
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9312,
+		.description = "2025_03_11_data_bucket_indexes.sql",
+		.check = "SHOW INDEX FROM data_buckets",
+		.condition = "missing",
+		.match = "idx_zone_instance_expires",
+		.sql = R"(
+DROP INDEX IF EXISTS `idx_zone_instance_expires` ON `data_buckets`;
+DROP INDEX IF EXISTS `idx_character_expires` ON `data_buckets`;
+DROP INDEX IF EXISTS `idx_bot_expires` ON `data_buckets`;
+ALTER TABLE data_buckets ADD INDEX idx_zone_instance_expires (zone_id, instance_id, expires);
+ALTER TABLE data_buckets ADD INDEX idx_character_expires (character_id, expires);
+ALTER TABLE data_buckets ADD INDEX idx_bot_expires (bot_id, expires);
+)",
+	.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9313,
+		.description = "2025_03_11_zone_state_spawns.sql",
+		.check = "SHOW INDEX FROM zone_state_spawns",
+		.condition = "missing",
+		.match = "idx_zone_instance",
+		.sql = R"(
+ALTER TABLE zone_state_spawns ADD INDEX idx_zone_instance (zone_id, instance_id);
+)",
+	.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9314,
+		.description = "2025_03_12_zone_state_spawns_one_time_truncate.sql",
+		.check = "SELECT * FROM db_version WHERE version >= 9314",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+TRUNCATE TABLE zone_state_spawns;
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9315,
+		.description = "2025_03_29_character_tribute_index.sql",
+		.check = "SHOW INDEX FROM character_tribute",
+		.condition = "missing",
+		.match = "idx_character_id",
+		.sql = R"(
+ALTER TABLE character_tribute ADD INDEX idx_character_id (character_id);
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9316,
+		.description = "2025_03_29_player_titlesets_index.sql",
+		.check = "SHOW INDEX FROM player_titlesets",
+		.condition = "missing",
+		.match = "idx_char_id",
+		.sql = R"(
+ALTER TABLE player_titlesets ADD INDEX idx_char_id (char_id);
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9317,
+		.description = "2025_03_29_respawn_times_instance_index.sql",
+		.check = "SHOW INDEX FROM respawn_times",
+		.condition = "missing",
+		.match = "idx_instance_id",
+		.sql = R"(
+ALTER TABLE respawn_times ADD INDEX idx_instance_id (instance_id);
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9318,
+		.description = "2025_03_29_zone_state_spawns_instance_index.sql",
+		.check = "SHOW INDEX FROM zone_state_spawns",
+		.condition = "missing",
+		.match = "idx_instance_id",
+		.sql = R"(
+ALTER TABLE zone_state_spawns ADD INDEX idx_instance_id (instance_id);
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9319,
+		.description = "2025_03_29_data_buckets_expires_index.sql",
+		.check = "SHOW INDEX FROM data_buckets",
+		.condition = "missing",
+		.match = "idx_expires",
+		.sql = R"(
+CREATE INDEX idx_expires ON data_buckets (expires);
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9320,
+		.description = "2025_03_23_add_respawn_times_expire_at.sql",
+		.check = "SHOW COLUMNS FROM `respawn_times` LIKE 'expire_at'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `respawn_times`
+ADD COLUMN `expire_at` int(11) UNSIGNED NULL DEFAULT 0 AFTER `duration`;
+
+UPDATE respawn_times set expire_at = `start` + `duration`; -- backfill existing data
+
+CREATE INDEX `idx_expire_at` ON `respawn_times` (`expire_at`);
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9321,
+		.description = "2025_03_30_instance_list_add_expire_at.sql",
+		.check = "SHOW COLUMNS FROM `instance_list` LIKE 'expire_at'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `instance_list`
+ADD COLUMN `expire_at` bigint(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `duration`;
+
+UPDATE instance_list set expire_at = `start_time` + `duration`; -- backfill existing data
+
+CREATE INDEX `idx_expire_at` ON `instance_list` (`expire_at`);
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9322,
+		.description = "2025_04_24_add_npc_tint_id.sql",
+		.check = "SHOW COLUMNS FROM `npc_types` LIKE 'npc_tint_id'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `npc_types`
+	ADD COLUMN `npc_tint_id` SMALLINT UNSIGNED NULL DEFAULT '0' AFTER `multiquest_enabled`;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9323,
+		.description = "2025_04_16_character_data_first_login.sql",
+		.check = "SHOW COLUMNS FROM `character_data` LIKE 'first_login'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `character_data`
+CHANGE COLUMN `firstlogon` `ingame` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `xtargets`,
+ADD COLUMN `first_login` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `xtargets`;
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9324,
+		.description = "2025_06_11_player_event_logs_table.sql",
+		.check = "SHOW CREATE TABLE `player_event_logs`",
+		.condition = "missing",
+		.match = "COMPRESS",
+		.sql = R"(
+ALTER TABLE player_event_logs ROW_FORMAT=COMPRESSED;
+CREATE INDEX idx_event_type_char_id ON player_event_logs (event_type_id, character_id);
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9325,
+		.description = "2025_06_10_character_corpses_entity_variables.sql",
+		.check = "SHOW COLUMNS FROM `character_corpses` LIKE 'entity_variables'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `character_corpses`
+ADD COLUMN `entity_variables` TEXT DEFAULT NULL AFTER `rezzable`;
+)",
+		.content_schema_update = false
+	},
+	ManifestEntry{
+		.version = 9326,
+		.description = "2025_07_27_add_indexes_npc_spawns_loot.sql",
+		.check = "SHOW INDEX FROM npc_types",
+		.condition = "missing",
+		.match = "idx_npc_types_loottable_id",
+		.sql = R"(
+ALTER TABLE npc_types
+    ADD INDEX idx_npc_types_loottable_id (loottable_id);
+
+ALTER TABLE spawnentry
+    ADD INDEX idx_spawnentry_spawngroup_id (spawngroupID),
+    ADD INDEX idx_spawnentry_npc_id (npcID);
+
+ALTER TABLE lootdrop_entries
+    ADD INDEX idx_lootdrop_entries_lootdrop_id (lootdrop_id),
+    ADD INDEX idx_lootdrop_entries_item_id (item_id);
+
+ALTER TABLE loottable_entries
+    ADD INDEX idx_loottable_entries_lootdrop_id (lootdrop_id),
+    ADD INDEX idx_loottable_entries_loottable_id (loottable_id);
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9327,
+		.description = "2025_08_13_character_stats_record_heal_amount.sql",
+		.check = "SHOW COLUMNS FROM `character_stats_record` LIKE 'heal_amount'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `character_stats_record`
+ADD COLUMN `heal_amount` int(11) NULL DEFAULT 0 AFTER `spell_damage`;
+)"
+	},
+	ManifestEntry{
+		.version = 9328,
+		.description = "2025_08_22_character_parcel_updates.sql",
+		.check = "SHOW COLUMNS FROM `character_parcels` LIKE 'evolve_amount'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `character_parcels`
+	ADD COLUMN `evolve_amount` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `quantity`;
+
+ALTER TABLE `character_parcels_containers`
+	ADD COLUMN `evolve_amount` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `quantity`;
+)",
+		.content_schema_update = false
+	},
 // -- template; copy/paste this when you need to create a new entry
 //	ManifestEntry{
 //		.version = 9228,

common/database/database_update_manifest_bots.h

@@ -1,4 +1,25 @@
-#include "database_update.h"
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "common/database/database_update.h"
+
+#include <vector>
 
 std::vector<ManifestEntry> bot_manifest_entries = {
 	ManifestEntry{
@@ -2122,6 +2143,37 @@ WHERE NOT EXISTS
 FROM spells_new
 WHERE bot_spells_entries.spell_id = spells_new.id);
 )",
+	},
+	ManifestEntry{
+		.version = 9055,
+		.description = "2026_02_8_move_expansion_bitmask.sql",
+		.check = "SHOW COLUMNS FROM `bot_data` LIKE 'expansion_bitmask'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `bot_data`
+	ADD COLUMN `expansion_bitmask` INT(11) NOT NULL DEFAULT '0' AFTER `corruption`;
+
+UPDATE bot_data bd
+SET bd.expansion_bitmask = COALESCE(
+    (SELECT bs.`value`
+     FROM bot_settings bs
+     WHERE bs.`setting_id` = 0
+     AND bs.`setting_type` = 0
+     AND bs.bot_id = bd.bot_id
+     ORDER BY bs.`value` DESC
+     LIMIT 1),
+
+    (SELECT rv.rule_value
+     FROM rule_values rv
+     WHERE rv.rule_name = 'Bots:BotExpansionSettings')
+);
+
+DELETE
+FROM bot_settings
+WHERE `setting_id` = 0
+AND `setting_type` = 0;
+)"
 		}
 // -- template; copy/paste this when you need to create a new entry
 //	ManifestEntry{

common/database/database_update_manifest_custom.h

@@ -0,0 +1,76 @@
+/*	EQEmu: EQEmulator
+
+	Copyright (C) 2001-2026 EQEmu Development Team
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "common/database/database_update.h"
+
+#include <vector>
+
+std::vector<ManifestEntry> manifest_entries_custom = {
+	ManifestEntry{
+		.version = 1,
+		.description = "2025_05_16_new_database_check_test",
+		.check = "SHOW TABLES LIKE 'new_table'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+CREATE TABLE `new_table`  (
+  `id` int NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`id`)
+);
+)",
+		.content_schema_update = false,
+	},
+// Used for testing
+//	ManifestEntry{
+//		.version = 9229,
+//		.description = "new_database_check_test",
+//		.check = "SHOW TABLES LIKE 'new_table'",
+//		.condition = "empty",
+//		.match = "",
+//		.sql = R"(
+//CREATE TABLE `new_table`  (
+//  `id` int NOT NULL AUTO_INCREMENT,
+//  PRIMARY KEY (`id`)
+//);
+//CREATE TABLE `new_table1`  (
+//  `id` int NOT NULL AUTO_INCREMENT,
+//  PRIMARY KEY (`id`)
+//);
+//CREATE TABLE `new_table2`  (
+//  `id` int NOT NULL AUTO_INCREMENT,
+//  PRIMARY KEY (`id`)
+//);
+//CREATE TABLE `new_table3`  (
+//  `id` int NOT NULL AUTO_INCREMENT,
+//  PRIMARY KEY (`id`)
+//);
+//)",
+//	}
+
+};
+
+// see struct definitions for what each field does
+// struct ManifestEntry {
+// 	int         version{};     // database version of the migration
+// 	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
+// 	std::string check{};       // query that checks against the condition
+// 	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
+// 	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
+// 	std::string sql{};         // the SQL DDL that gets ran when the condition is true
+// };

common/database_instances.cpp

@@ -1,54 +1,43 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
-Copyright (C) 2001-2015 EQEMu Development Team (http://eqemulator.net)
+
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-
-#include "../common/global_define.h"
-#include "../common/rulesys.h"
-#include "../common/strings.h"
-#include "../common/timer.h"
-#include "../common/repositories/character_corpses_repository.h"
-#include "../common/repositories/dynamic_zone_members_repository.h"
-#include "../common/repositories/dynamic_zones_repository.h"
-#include "../common/repositories/group_id_repository.h"
-#include "../common/repositories/instance_list_repository.h"
-#include "../common/repositories/instance_list_player_repository.h"
-#include "../common/repositories/raid_members_repository.h"
-#include "../common/repositories/respawn_times_repository.h"
-#include "../common/repositories/spawn_condition_values_repository.h"
-#include "repositories/spawn2_disabled_repository.h"
-#include "repositories/data_buckets_repository.h"
-
 #include "database.h"
 
-#include <iomanip>
+#include "common/platform/inet.h"
-#include <iostream>
+#include "common/platform/platform.h"
+#include "common/platform/win/include_windows.h"
+#include "common/repositories/character_corpses_repository.h"
+#include "common/repositories/data_buckets_repository.h"
+#include "common/repositories/dynamic_zone_members_repository.h"
+#include "common/repositories/dynamic_zones_repository.h"
+#include "common/repositories/group_id_repository.h"
+#include "common/repositories/instance_list_player_repository.h"
+#include "common/repositories/instance_list_repository.h"
+#include "common/repositories/raid_members_repository.h"
+#include "common/repositories/respawn_times_repository.h"
+#include "common/repositories/spawn_condition_values_repository.h"
+#include "common/repositories/spawn2_disabled_repository.h"
+#include "common/repositories/zone_state_spawns_repository.h"
+#include "common/rulesys.h"
+#include "common/strings.h"
+#include "common/timer.h"
+#include "common/unix.h"
+#include "zone/zonedb.h"
 
-// Disgrace: for windows compile
-#ifdef _WINDOWS
-#include <windows.h>
-#define snprintf	_snprintf
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
-#else
-#include "unix.h"
-#include "../zone/zonedb.h"
-#include <netinet/in.h>
-#include <sys/time.h>
-#endif
 
 
 bool Database::AddClientToInstance(uint16 instance_id, uint32 character_id)
@@ -128,11 +117,35 @@ bool Database::CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version
 	e.version = version;
 	e.start_time = std::time(nullptr);
 	e.duration = duration;
+	e.expire_at = e.start_time + duration;
 
-	return InstanceListRepository::InsertOne(*this, e).id;
+	RespawnTimesRepository::ClearInstanceTimers(*this, e.id);
+	InstanceListRepository::ReplaceOne(*this, e);
+	return instance_id > 0 && e.id;
 }
 
 bool Database::GetUnusedInstanceID(uint16 &instance_id)
+{
+	// attempt to get an unused instance id
+	for (int a = 0; a < 10; a++) {
+		uint16 attempted_id = 0;
+		if (TryGetUnusedInstanceID(attempted_id)) {
+			auto i = InstanceListRepository::NewEntity();
+			i.id    = attempted_id;
+			i.notes = "Prefetching";
+			auto n = InstanceListRepository::InsertOne(*this, i);
+			if (n.id > 0) {
+				instance_id = n.id;
+				return true;
+			}
+		}
+	}
+
+	instance_id = 0;
+	return false;
+}
+
+bool Database::TryGetUnusedInstanceID(uint16 &instance_id)
 {
 	uint32 max_reserved_instance_id = RuleI(Instances, ReservedInstances);
 	uint32 max_instance_id          = 32000;
@@ -480,6 +493,9 @@ void Database::DeleteInstance(uint16 instance_id)
 	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
 	CharacterCorpsesRepository::BuryInstance(*this, instance_id);
 	DataBucketsRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
+	if (RuleB(Zone, StateSavingOnShutdown)) {
+		ZoneStateSpawnsRepository::DeleteWhere(*this, fmt::format("`instance_id` = {}", instance_id));
+	}
 }
 
 void Database::FlagInstanceByGroupLeader(uint32 zone_id, int16 version, uint32 character_id, uint32 group_id)
@@ -534,14 +550,12 @@ void Database::GetCharactersInInstance(uint16 instance_id, std::list<uint32> &ch
 
 void Database::PurgeExpiredInstances()
 {
-	/**
-	 * Delay purging by a day so that we can continue using adjacent free instance id's
-	 * from the table without risking the chance we immediately re-allocate a zone that freshly expired but
-	 * has not been fully de-allocated
-	 */
 	auto l = InstanceListRepository::GetWhere(
 		*this,
-		"(start_time + duration) <= (UNIX_TIMESTAMP() - 86400) AND never_expires = 0"
+		fmt::format(
+			"expire_at <= (UNIX_TIMESTAMP() - {}) and expire_at != 0 AND never_expires = 0",
+			RuleI(Instances, ExpireOffsetTimeSeconds)
+		)
 	);
 	if (l.empty()) {
 		return;
@@ -552,17 +566,24 @@ void Database::PurgeExpiredInstances()
 		instance_ids.emplace_back(std::to_string(e.id));
 	}
 
-	const auto imploded_instance_ids = Strings::Implode(",", instance_ids);
+	const auto ids = Strings::Implode(",", instance_ids);
 
-	InstanceListRepository::DeleteWhere(*this, fmt::format("id IN ({})", imploded_instance_ids));
+	TransactionBegin();
-	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id IN ({})", imploded_instance_ids));
+	InstanceListRepository::DeleteWhere(*this, fmt::format("id IN ({})", ids));
-	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
+	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id IN ({})", ids));
-	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
+	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
-	CharacterCorpsesRepository::BuryInstances(*this, imploded_instance_ids);
+	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
-	DynamicZoneMembersRepository::DeleteByManyInstances(*this, imploded_instance_ids);
+	CharacterCorpsesRepository::BuryInstances(*this, ids);
-	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
+	DynamicZoneMembersRepository::DeleteByManyInstances(*this, ids);
-	Spawn2DisabledRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
+	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
-	DataBucketsRepository::DeleteWhere(*this, fmt::format("instance_id != 0 and instance_id IN ({})", imploded_instance_ids));
+	Spawn2DisabledRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
+	DataBucketsRepository::DeleteWhere(*this, fmt::format("instance_id != 0 and instance_id IN ({})", ids));
+	if (RuleB(Zone, StateSavingOnShutdown)) {
+		ZoneStateSpawnsRepository::DeleteWhere(*this, fmt::format("`instance_id` IN ({})", ids));
+	}
+	TransactionCommit();
+
+	LogInfo("Purged [{}] expired instances", l.size());
 }
 
 void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)
@@ -574,6 +595,7 @@ void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)
 
 	i.start_time = std::time(nullptr);
 	i.duration = new_duration;
+	i.expire_at = i.start_time + i.duration;
 
 	InstanceListRepository::UpdateOne(*this, i);
 }

common/database_schema.h

@@ -1,25 +1,21 @@
-/**
+/*	EQEmu: EQEmulator
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
 
-#ifndef EQEMU_DATABASE_SCHEMA_H
+	Copyright (C) 2001-2026 EQEmu Development Team
-#define EQEMU_DATABASE_SCHEMA_H
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
 
 #include <vector>
 #include <map>
@@ -80,7 +76,7 @@ namespace DatabaseSchema {
 			{"guild_members",                  "char_id"},
 			{"guilds",                         "id"},
 			{"instance_list_player",           "id"},
-			{"inventory",                      "charid"},
+			{"inventory",                      "character_id"},
 			{"inventory_snapshots",            "charid"},
 			{"keyring",                        "char_id"},
 			{"mail",                           "charid"},
@@ -438,5 +434,3 @@ namespace DatabaseSchema {
 	}
 
 }
-
-#endif //EQEMU_DATABASE_SCHEMA_H

common/dbcore.cpp

@@ -1,31 +1,30 @@
-#ifdef _WINDOWS
+/*	EQEmu: EQEmulator
-#include <winsock2.h>
-#endif
 
-#include "misc_functions.h"
+	Copyright (C) 2001-2026 EQEmu Development Team
-#include "eqemu_logsys.h"
-#include "timer.h"
 
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "dbcore.h"
-#include "mysql_stmt.h"
 
-#include <fstream>
+#include "common/eqemu_logsys.h"
-#include <iostream>
+#include "common/misc_functions.h"
-#include <mysqld_error.h>
+#include "common/mysql_stmt.h"
-#include <string.h>
+#include "common/strings.h"
-#include "strings.h"
+#include "common/timer.h"
+#include "common/types.h"
 
-#ifdef _WINDOWS
+#include "mysqld_error.h"
-#define snprintf	_snprintf
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
-#include <process.h>
-#else
-
-#include "unix.h"
-#include <pthread.h>
-
-#endif
 
 #ifdef _EQDEBUG
 #define DEBUG_MYSQL_QUERIES 0
@@ -34,17 +33,9 @@
 #endif
 
 DBcore::DBcore()
+	: mysql(mysql_init(nullptr))
+	, m_mutex(std::make_shared<Mutex>())
 {
-	mysql      = mysql_init(nullptr);
-	mysqlOwner = true;
-	pHost      = nullptr;
-	pUser      = nullptr;
-	pPassword  = nullptr;
-	pDatabase  = nullptr;
-	pCompress  = false;
-	pSSL       = false;
-	pStatus    = Closed;
-	m_mutex    = new Mutex;
 }
 
 DBcore::~DBcore()
@@ -57,20 +48,17 @@ DBcore::~DBcore()
 	if (mysqlOwner) {
 		mysql_close(mysql);
 	}
-
-	safe_delete_array(pHost);
-	safe_delete_array(pUser);
-	safe_delete_array(pPassword);
-	safe_delete_array(pDatabase);
 }
 
 // Sends the MySQL server a keepalive
 void DBcore::ping()
 {
-	if (!m_mutex->trylock()) {
+	if (!m_mutex->try_lock())
+	{
 		// well, if's it's locked, someone's using it. If someone's using it, it doesnt need a keepalive
 		return;
 	}
+
 	mysql_ping(mysql);
 	m_mutex->unlock();
 }
@@ -93,7 +81,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 	BenchTimer timer;
 	timer.reset();
 
-	LockMutex lock(m_mutex);
+	std::scoped_lock lock(*m_mutex);
 
 	// Reconnect if we are not connected before hand.
 	if (pStatus != Connected) {
@@ -160,7 +148,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		(uint32) mysql_insert_id(mysql)
 	);
 
-	if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
+	if (EQEmuLogSys::Instance()->log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
 		if ((strncasecmp(query, "select", 6) == 0)) {
 			LogMySQLQuery(
 				"{0} -- ({1} row{2} returned) ({3}s)",
@@ -189,9 +177,9 @@ void DBcore::TransactionBegin()
 	QueryDatabase("START TRANSACTION");
 }
 
-void DBcore::TransactionCommit()
+MySQLRequestResult DBcore::TransactionCommit()
 {
-	QueryDatabase("COMMIT");
+	return QueryDatabase("COMMIT");
 }
 
 void DBcore::TransactionRollback()
@@ -218,15 +206,12 @@ bool DBcore::Open(
 	bool iSSL
 )
 {
-	LockMutex lock(m_mutex);
+	std::scoped_lock lock(*m_mutex);
-	safe_delete_array(pHost);
+
-	safe_delete_array(pUser);
+	m_host = iHost;
-	safe_delete_array(pPassword);
+	m_user = iUser;
-	safe_delete_array(pDatabase);
+	m_password = iPassword;
-	pHost     = strcpy(new char[strlen(iHost) + 1], iHost);
+	m_database = iDatabase;
-	pUser     = strcpy(new char[strlen(iUser) + 1], iUser);
-	pPassword = strcpy(new char[strlen(iPassword) + 1], iPassword);
-	pDatabase = strcpy(new char[strlen(iDatabase) + 1], iDatabase);
 	pCompress = iCompress;
 	pPort     = iPort;
 	pSSL      = iSSL;
@@ -235,10 +220,12 @@ bool DBcore::Open(
 
 bool DBcore::Open(uint32 *errnum, char *errbuf)
 {
+	// Expects m_mutex to already be locked.
+
 	if (errbuf) {
 		errbuf[0] = 0;
 	}
-	LockMutex lock(m_mutex);
+
 	if (GetStatus() == Connected) {
 		return true;
 	}
@@ -246,7 +233,7 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 		mysql_close(mysql);
 		mysql_init(mysql);        // Initialize structure again
 	}
-	if (!pHost) {
+	if (m_host.empty()) {
 		return false;
 	}
 	/*
@@ -258,14 +245,21 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 	if (pCompress) {
 		flags |= CLIENT_COMPRESS;
 	}
+
+	//todo: we need to revisit this ssl handling later
+	//the whole connect code is ancient and tls is starting to come as a default requirement for many db setups
 	if (pSSL) {
 		flags |= CLIENT_SSL;
 	}
-	if (mysql_real_connect(mysql, pHost, pUser, pPassword, pDatabase, pPort, 0, flags)) {
+	else {
+		int off = 0;
+		mysql_options(mysql, MYSQL_OPT_SSL_ENFORCE, &off);
+		mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &off);
+	}
+	if (mysql_real_connect(mysql, m_host.c_str(), m_user.c_str(), m_password.c_str(), m_database.c_str(), pPort, nullptr, flags)) {
 		pStatus = Connected;
 
-		std::string connected_origin_host = pHost;
+		SetOriginHost(m_host);
-		SetOriginHost(connected_origin_host);
 
 		return true;
 	}
@@ -286,9 +280,9 @@ const std::string &DBcore::GetOriginHost() const
 	return origin_host;
 }
 
-void DBcore::SetOriginHost(const std::string &origin_host)
+void DBcore::SetOriginHost(const std::string& originHost)
 {
-	DBcore::origin_host = origin_host;
+	DBcore::origin_host = originHost;
 }
 
 std::string DBcore::Escape(const std::string& s)
@@ -300,12 +294,8 @@ std::string DBcore::Escape(const std::string& s)
 	return temp.data();
 }
 
-void DBcore::SetMutex(Mutex *mutex)
+void DBcore::SetMutex(const std::shared_ptr<Mutex>& mutex)
 {
-	if (m_mutex && m_mutex != mutex) {
-		safe_delete(m_mutex);
-	}
-
 	DBcore::m_mutex = mutex;
 }
 
@@ -319,7 +309,7 @@ MySQLRequestResult DBcore::QueryDatabaseMulti(const std::string &query)
 	BenchTimer timer;
 	timer.reset();
 
-	LockMutex lock(m_mutex);
+	std::scoped_lock lock(*m_mutex);
 
 	// Reconnect if we are not connected before hand.
 	if (pStatus != Connected) {
@@ -442,5 +432,5 @@ MySQLRequestResult DBcore::QueryDatabaseMulti(const std::string &query)
 
 mysql::PreparedStmt DBcore::Prepare(std::string query)
 {
-	return mysql::PreparedStmt(*mysql, std::move(query), m_mutex);
+	return mysql::PreparedStmt(*mysql, std::move(query), *m_mutex);
 }

common/dbcore.h

@@ -1,17 +1,27 @@
-#ifndef DBCORE_H
+/*	EQEmu: EQEmulator
-#define DBCORE_H
 
-#ifdef _WINDOWS
+	Copyright (C) 2001-2026 EQEmu Development Team
-#include <winsock2.h>
-#include <windows.h>
-#endif
 
-#include "../common/mutex.h"
+	This program is free software; you can redistribute it and/or modify
-#include "../common/mysql_request_result.h"
+	it under the terms of the GNU General Public License as published by
-#include "../common/types.h"
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
-#include <mysql.h>
+	This program is distributed in the hope that it will be useful,
-#include <string.h>
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "common/mysql_request_result.h"
+#include "common/types.h"
+
+#include "mysql.h"
+#include <memory>
 #include <mutex>
 
 #define CR_SERVER_GONE_ERROR    2006
@@ -19,12 +29,15 @@
 
 namespace mysql { class PreparedStmt; }
 
-class DBcore {
+class DBcore
+{
 public:
 	enum eStatus {
 		Closed, Connected, Error
 	};
 
+	using Mutex = std::recursive_mutex;
+
 	DBcore();
 	~DBcore();
 	eStatus GetStatus() { return pStatus; }
@@ -32,7 +45,7 @@ public:
 	MySQLRequestResult QueryDatabase(const std::string& query, bool retryOnFailureOnce = true);
 	MySQLRequestResult QueryDatabaseMulti(const std::string &query);
 	void TransactionBegin();
-	void TransactionCommit();
+	MySQLRequestResult TransactionCommit();
 	void TransactionRollback();
 	std::string Escape(const std::string& s);
 	uint32 DoEscapeString(char *tobuf, const char *frombuf, uint32 fromlen);
@@ -48,7 +61,7 @@ public:
 		mysql      = o.mysql;
 		mysqlOwner = false;
 	}
-	void SetMutex(Mutex *mutex);
+	void SetMutex(const std::shared_ptr<Mutex>& mutex);
 
 	// only safe on connections shared with other threads if results buffered
 	// unsafe to use off main thread due to internal server logging
@@ -71,22 +84,21 @@ protected:
 private:
 	bool Open(uint32 *errnum = nullptr, char *errbuf = nullptr);
 
-	MYSQL*  mysql;
+	MYSQL*  mysql = nullptr;
-	bool    mysqlOwner;
+	bool    mysqlOwner = true;
-	Mutex   *m_mutex;
+	eStatus pStatus = Closed;
-	eStatus pStatus;
 
-	std::mutex m_query_lock{};
+	std::shared_ptr<Mutex> m_mutex;
 
 	std::string origin_host;
 
-	char   *pHost;
+	std::string m_host;
-	char   *pUser;
+	std::string m_user;
-	char   *pPassword;
+	std::string m_password;
-	char   *pDatabase;
+	std::string m_database;
-	bool   pCompress;
+	bool   pCompress = false;
-	uint32 pPort;
+	uint32 pPort = 0;
-	bool   pSSL;
+	bool   pSSL = false;
 
 	// allows multiple queries to be executed within the same query
 	// do not use this under normal operation
@@ -102,6 +114,3 @@ private:
 		mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
 	}
 };
-
-
-#endif

common/deity.cpp

@@ -1,22 +1,20 @@
-/*	EQEMu: Everquest Server Emulator
+/*	EQEmu: EQEmulator
 
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
+	Copyright (C) 2001-2026 EQEmu Development Team
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 3 of the License, or
+	(at your option) any later version.
 
 	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	are required to give you total support for your newly bought product;
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	GNU General Public License for more details.
-	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-
 #include "deity.h"
 
 uint32 Deity::GetBitmask(uint32 deity_id)