669 lines
27 KiB
C++
669 lines
27 KiB
C++
#include "OverteClient.hpp"
|
|
#include "NLPacketCodec.hpp"
|
|
|
|
#include <chrono>
|
|
#include <cmath>
|
|
#include <iostream>
|
|
#include <random>
|
|
#include <sstream>
|
|
#include <iomanip>
|
|
#include <glm/gtc/matrix_transform.hpp>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <netdb.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <cstring>
|
|
|
|
using namespace std::chrono_literals;
|
|
using namespace Overte;
|
|
|
|
// Generate a simple UUID-like string for session identification
|
|
static std::string generateUUID() {
|
|
std::random_device rd;
|
|
std::mt19937 gen(rd());
|
|
std::uniform_int_distribution<> dis(0, 255);
|
|
|
|
std::stringstream ss;
|
|
ss << std::hex << std::setfill('0');
|
|
for (int i = 0; i < 16; ++i) {
|
|
if (i == 4 || i == 6 || i == 8 || i == 10) ss << '-';
|
|
ss << std::setw(2) << dis(gen);
|
|
}
|
|
return ss.str();
|
|
}
|
|
|
|
bool OverteClient::connect() {
|
|
// Generate session UUID
|
|
m_sessionUUID = generateUUID();
|
|
std::cout << "[OverteClient] Session UUID: " << m_sessionUUID << std::endl;
|
|
|
|
// Check for authentication credentials from environment
|
|
const char* usernameEnv = std::getenv("OVERTE_USERNAME");
|
|
if (usernameEnv) m_username = usernameEnv;
|
|
|
|
if (!m_username.empty()) {
|
|
std::cout << "[OverteClient] Username present (signature auth not yet implemented)" << std::endl;
|
|
}
|
|
|
|
// Parse ws://host:port
|
|
std::string url = m_domainUrl;
|
|
if (url.empty()) url = "ws://127.0.0.1:40102";
|
|
if (url.rfind("ws://", 0) == 0) url = url.substr(5);
|
|
auto colon = url.find(':');
|
|
m_host = colon == std::string::npos ? url : url.substr(0, colon);
|
|
m_port = colon == std::string::npos ? 40102 : std::stoi(url.substr(colon + 1));
|
|
|
|
// Check for environment override for UDP port (domain server UDP port)
|
|
const char* portEnv = std::getenv("OVERTE_UDP_PORT");
|
|
int udpPort = portEnv ? std::atoi(portEnv) : 40104; // Default to 40104 for Overte domain UDP
|
|
|
|
std::cout << "[OverteClient] Connecting to domain at " << m_host
|
|
<< " (HTTP:" << m_port << ", UDP:" << udpPort << ")" << std::endl;
|
|
|
|
// Resolve host:port
|
|
addrinfo hints{}; hints.ai_socktype = SOCK_STREAM; hints.ai_family = AF_UNSPEC;
|
|
addrinfo* res = nullptr;
|
|
int gai = ::getaddrinfo(m_host.c_str(), std::to_string(m_port).c_str(), &hints, &res);
|
|
if (gai != 0) {
|
|
std::cerr << "[OverteClient] getaddrinfo failed for " << m_host << ":" << m_port << " - " << gai_strerror(gai) << std::endl;
|
|
} else {
|
|
// Attempt TCP reachability for diagnostics
|
|
int fd = -1; addrinfo* rp = res;
|
|
for (; rp; rp = rp->ai_next) {
|
|
fd = ::socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
|
|
if (fd == -1) continue;
|
|
::fcntl(fd, F_SETFL, O_NONBLOCK);
|
|
int c = ::connect(fd, rp->ai_addr, rp->ai_addrlen);
|
|
if (c == 0 || (c == -1 && errno == EINPROGRESS)) {
|
|
std::cout << "[OverteClient] TCP reachable (non-blocking) to " << m_host << ":" << m_port << std::endl;
|
|
::close(fd); fd = -1; break;
|
|
}
|
|
::close(fd); fd = -1;
|
|
}
|
|
::freeaddrinfo(res);
|
|
if (fd == -1) {
|
|
// Not necessarily fatal; mixers are UDP. Continue with UDP.
|
|
}
|
|
}
|
|
|
|
// Setup UDP to target (domain server UDP port)
|
|
addrinfo uhints{}; uhints.ai_socktype = SOCK_DGRAM; uhints.ai_family = AF_UNSPEC;
|
|
addrinfo* ures = nullptr;
|
|
int ugai = ::getaddrinfo(m_host.c_str(), std::to_string(udpPort).c_str(), &uhints, &ures);
|
|
if (ugai != 0) {
|
|
std::cerr << "[OverteClient] UDP resolve failed: " << gai_strerror(ugai) << std::endl;
|
|
} else {
|
|
for (addrinfo* rp = ures; rp; rp = rp->ai_next) {
|
|
m_udpFd = ::socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
|
|
if (m_udpFd == -1) continue;
|
|
::fcntl(m_udpFd, F_SETFL, O_NONBLOCK);
|
|
std::memcpy(&m_udpAddr, rp->ai_addr, rp->ai_addrlen);
|
|
m_udpAddrLen = rp->ai_addrlen;
|
|
m_udpReady = true;
|
|
std::cout << "[OverteClient] UDP socket ready for " << m_host << ":" << udpPort << std::endl;
|
|
break;
|
|
}
|
|
::freeaddrinfo(ures);
|
|
}
|
|
|
|
// Simulate successful connections to mixers.
|
|
m_connected = connectAvatarMixer() && connectEntityServer() && connectAudioMixer();
|
|
if (!m_connected) {
|
|
std::cerr << "OverteClient: failed to connect one or more mixers" << std::endl;
|
|
return false;
|
|
}
|
|
|
|
// Send domain connect request to initiate handshake
|
|
// Start with domain list request - simpler packet
|
|
std::cout << "[OverteClient] Initiating domain handshake..." << std::endl;
|
|
sendDomainConnectRequest();
|
|
sendDomainListRequest();
|
|
|
|
m_useSimulation = (std::getenv("STARWORLD_SIMULATE") != nullptr);
|
|
if (m_useSimulation) {
|
|
// Seed a couple of demo entities.
|
|
OverteEntity a{ m_nextEntityId++, "CubeA", glm::mat4(1.0f) };
|
|
OverteEntity b{ m_nextEntityId++, "CubeB", glm::mat4(1.0f) };
|
|
m_entities.emplace(a.id, a);
|
|
m_entities.emplace(b.id, b);
|
|
m_updateQueue.push_back(a.id);
|
|
m_updateQueue.push_back(b.id);
|
|
std::cout << "[OverteClient] Simulation mode enabled (STARWORLD_SIMULATE=1)" << std::endl;
|
|
} else {
|
|
std::cout << "[OverteClient] Waiting for entity packets from Overte server..." << std::endl;
|
|
std::cout << "[OverteClient] Tip: Set STARWORLD_SIMULATE=1 to enable demo entities" << std::endl;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool OverteClient::connectAvatarMixer() {
|
|
// For now, consider UDP socket readiness as mixer connectivity proxy.
|
|
m_avatarMixer = m_udpReady;
|
|
return true;
|
|
}
|
|
|
|
bool OverteClient::connectEntityServer() {
|
|
// Entity server connection will be established after DomainList reply
|
|
// For now, create socket and bind to receive packets
|
|
m_entityFd = ::socket(AF_INET, SOCK_DGRAM, 0);
|
|
if (m_entityFd == -1) {
|
|
std::cerr << "[OverteClient] Failed to create EntityServer socket: " << std::strerror(errno) << std::endl;
|
|
return false;
|
|
}
|
|
|
|
// Make non-blocking
|
|
::fcntl(m_entityFd, F_SETFL, O_NONBLOCK);
|
|
|
|
// Bind to ephemeral port (let OS choose) for receiving entity packets
|
|
sockaddr_in bindAddr{};
|
|
bindAddr.sin_family = AF_INET;
|
|
bindAddr.sin_addr.s_addr = INADDR_ANY;
|
|
bindAddr.sin_port = 0; // Let OS assign port
|
|
|
|
if (::bind(m_entityFd, reinterpret_cast<sockaddr*>(&bindAddr), sizeof(bindAddr)) == -1) {
|
|
std::cerr << "[OverteClient] Failed to bind EntityServer socket: " << std::strerror(errno) << std::endl;
|
|
::close(m_entityFd);
|
|
m_entityFd = -1;
|
|
return false;
|
|
}
|
|
|
|
// Get the assigned port
|
|
socklen_t addrLen = sizeof(bindAddr);
|
|
if (::getsockname(m_entityFd, reinterpret_cast<sockaddr*>(&bindAddr), &addrLen) == 0) {
|
|
std::cout << "[OverteClient] EntityServer socket bound to port " << ntohs(bindAddr.sin_port) << std::endl;
|
|
}
|
|
|
|
m_entityServer = true;
|
|
return true;
|
|
}
|
|
|
|
bool OverteClient::connectAudioMixer() {
|
|
// TODO: Connect AudioMixer for voice chat.
|
|
m_audioMixer = true;
|
|
return true;
|
|
}
|
|
|
|
void OverteClient::poll() {
|
|
if (!m_connected) return;
|
|
|
|
// Poll domain UDP socket for domain-level packets
|
|
if (m_udpReady && m_udpFd != -1) {
|
|
char buf[1500];
|
|
sockaddr_storage from{}; socklen_t fromlen = sizeof(from);
|
|
ssize_t r = ::recvfrom(m_udpFd, buf, sizeof(buf), 0, reinterpret_cast<sockaddr*>(&from), &fromlen);
|
|
if (r > 0) {
|
|
std::cout << "[OverteClient] <<< Received domain packet (" << r << " bytes)" << std::endl;
|
|
// Hex dump first 32 bytes for debugging
|
|
std::cout << "[OverteClient] Hex: ";
|
|
for (int i = 0; i < std::min(32, (int)r); ++i) {
|
|
printf("%02x ", (unsigned char)buf[i]);
|
|
}
|
|
std::cout << std::endl;
|
|
parseDomainPacket(buf, static_cast<size_t>(r));
|
|
} else if (r < 0 && errno != EWOULDBLOCK && errno != EAGAIN) {
|
|
// Only log errors that aren't "would block"
|
|
static int errorCount = 0;
|
|
if (++errorCount <= 3) {
|
|
std::cerr << "[OverteClient] UDP recv error: " << strerror(errno) << std::endl;
|
|
}
|
|
}
|
|
|
|
// Send periodic ping to domain to keep connection alive
|
|
static auto lastPing = std::chrono::steady_clock::now();
|
|
static auto lastDomainList = std::chrono::steady_clock::now();
|
|
auto now = std::chrono::steady_clock::now();
|
|
|
|
if (std::chrono::duration_cast<std::chrono::seconds>(now - lastPing).count() >= 1) {
|
|
sendPing(m_udpFd, m_udpAddr, m_udpAddrLen);
|
|
lastPing = now;
|
|
}
|
|
|
|
// Request domain list periodically if not connected
|
|
if (!m_domainConnected && std::chrono::duration_cast<std::chrono::seconds>(now - lastDomainList).count() >= 3) {
|
|
std::cout << "[OverteClient] Retrying domain handshake..." << std::endl;
|
|
sendDomainConnectRequest();
|
|
sendDomainListRequest();
|
|
lastDomainList = now;
|
|
}
|
|
}
|
|
|
|
// Parse entity server packets
|
|
parseNetworkPackets();
|
|
|
|
if (m_useSimulation) {
|
|
// Simulate entity transforms changing slightly over time.
|
|
static auto t0 = std::chrono::steady_clock::now();
|
|
const float t = std::chrono::duration<float>(std::chrono::steady_clock::now() - t0).count();
|
|
for (auto& [id, e] : m_entities) {
|
|
const float r = 0.25f + 0.05f * static_cast<float>(id);
|
|
const float x = std::cos(t * 0.5f + static_cast<float>(id)) * r;
|
|
const float z = std::sin(t * 0.5f + static_cast<float>(id)) * r;
|
|
e.transform = glm::translate(glm::mat4(1.0f), glm::vec3{x, 1.25f, z});
|
|
m_updateQueue.push_back(id);
|
|
}
|
|
}
|
|
}
|
|
|
|
void OverteClient::parseNetworkPackets() {
|
|
// Read from EntityServer socket
|
|
if (m_entityServerReady && m_entityFd != -1) {
|
|
char buf[1500];
|
|
sockaddr_storage from{}; socklen_t fromlen = sizeof(from);
|
|
ssize_t r = ::recvfrom(m_entityFd, buf, sizeof(buf), 0, reinterpret_cast<sockaddr*>(&from), &fromlen);
|
|
if (r > 0) {
|
|
std::cout << "[OverteClient] EntityServer packet received (" << r << " bytes, type=0x"
|
|
<< std::hex << (int)(unsigned char)buf[0] << std::dec << ")" << std::endl;
|
|
parseEntityPacket(buf, static_cast<size_t>(r));
|
|
}
|
|
}
|
|
}
|
|
|
|
void OverteClient::parseDomainPacket(const char* data, size_t len) {
|
|
if (len < 6) return; // NLPacket header is minimum 6 bytes
|
|
|
|
// Parse NLPacket header
|
|
NLPacket::Header header;
|
|
const uint8_t* udata = reinterpret_cast<const uint8_t*>(data);
|
|
if (!NLPacket::parseHeader(udata, len, header)) {
|
|
std::cerr << "[OverteClient] Failed to parse NLPacket header" << std::endl;
|
|
return;
|
|
}
|
|
|
|
PacketType packetType = NLPacket::getType(udata, len);
|
|
std::cout << "[OverteClient] Domain packet type: " << static_cast<int>(packetType)
|
|
<< " (0x" << std::hex << static_cast<int>(packetType) << std::dec << ")"
|
|
<< " version: " << (int)header.version << std::endl;
|
|
|
|
// Payload starts after header (6 bytes base, +2 if has source ID)
|
|
const char* payload = data + 6; // Assuming no source ID for now
|
|
size_t payloadLen = len - 6;
|
|
|
|
switch (packetType) {
|
|
case PacketType::DomainList:
|
|
handleDomainListReply(payload, payloadLen);
|
|
break;
|
|
|
|
case PacketType::DomainConnectionDenied:
|
|
handleDomainConnectionDenied(payload, payloadLen);
|
|
break;
|
|
|
|
case PacketType::DomainServerRequireDTLS:
|
|
std::cout << "[OverteClient] Domain server requires DTLS (not yet implemented)" << std::endl;
|
|
break;
|
|
|
|
case PacketType::PingReply:
|
|
// Keep-alive ping reply
|
|
std::cout << "[OverteClient] Ping reply received" << std::endl;
|
|
break;
|
|
|
|
default:
|
|
std::cout << "[OverteClient] Unknown domain packet type: " << static_cast<int>(packetType) << std::endl;
|
|
break;
|
|
}
|
|
}
|
|
|
|
void OverteClient::parseEntityPacket(const char* data, size_t len) {
|
|
// Overte packet structure (simplified):
|
|
// - Byte 0: PacketType
|
|
// - Following bytes: payload (varies by type)
|
|
|
|
if (len < 1) return;
|
|
|
|
unsigned char packetType = static_cast<unsigned char>(data[0]);
|
|
|
|
// Entity packet types
|
|
const unsigned char PACKET_TYPE_ENTITY_ADD = 0x10;
|
|
const unsigned char PACKET_TYPE_ENTITY_EDIT = 0x11;
|
|
const unsigned char PACKET_TYPE_ENTITY_ERASE = 0x12;
|
|
const unsigned char PACKET_TYPE_ENTITY_QUERY = 0x15;
|
|
const unsigned char PACKET_TYPE_OCTREE_STATS = 0x16;
|
|
const unsigned char PACKET_TYPE_ENTITY_DATA = 0x41; // Bulk entity data response
|
|
|
|
switch (packetType) {
|
|
case PACKET_TYPE_ENTITY_DATA:
|
|
case PACKET_TYPE_ENTITY_ADD: {
|
|
// EntityAdd/EntityData packet structure (simplified):
|
|
// u64 entityID, string name, vec3 position, quat rotation, vec3 dimensions, ...
|
|
if (len < 9) break; // need at least 1+8 bytes
|
|
|
|
std::uint64_t entityId;
|
|
std::memcpy(&entityId, data + 1, 8);
|
|
|
|
// Parse name (null-terminated string after ID)
|
|
size_t offset = 9;
|
|
std::string name;
|
|
while (offset < len && data[offset] != '\0') {
|
|
name += data[offset++];
|
|
}
|
|
if (name.empty()) name = "Entity_" + std::to_string(entityId);
|
|
|
|
// TODO: Parse full entity properties (position, rotation, dimensions)
|
|
// For now, create entity with a visible position spread out in front of user
|
|
// Position entities in a grid pattern for visibility
|
|
float spacing = 0.5f;
|
|
int index = static_cast<int>(entityId % 10);
|
|
float x = (index % 3) * spacing - spacing; // -0.5, 0, 0.5
|
|
float y = 1.5f; // Eye level
|
|
float z = -2.0f - (index / 3) * spacing; // Start 2m in front, spread back
|
|
|
|
glm::vec3 position(x, y, z);
|
|
glm::mat4 transform = glm::translate(glm::mat4(1.0f), position);
|
|
|
|
OverteEntity entity{entityId, name, transform};
|
|
m_entities[entityId] = entity;
|
|
m_updateQueue.push_back(entityId);
|
|
|
|
std::cout << "[OverteClient] Entity added: " << name << " (id=" << entityId
|
|
<< ") at pos(" << x << ", " << y << ", " << z << ")" << std::endl;
|
|
break;
|
|
}
|
|
|
|
case PACKET_TYPE_ENTITY_EDIT: {
|
|
// EntityEdit packet: u64 entityID, property flags, property data...
|
|
if (len < 9) break;
|
|
|
|
std::uint64_t entityId;
|
|
std::memcpy(&entityId, data + 1, 8);
|
|
|
|
auto it = m_entities.find(entityId);
|
|
if (it != m_entities.end()) {
|
|
// TODO: parse property flags and update transform
|
|
// For now, mark as updated
|
|
m_updateQueue.push_back(entityId);
|
|
std::cout << "[OverteClient] Entity edited: id=" << entityId << std::endl;
|
|
}
|
|
break;
|
|
}
|
|
|
|
case PACKET_TYPE_ENTITY_ERASE: {
|
|
// EntityErase packet: u64 entityID
|
|
if (len < 9) break;
|
|
|
|
std::uint64_t entityId;
|
|
std::memcpy(&entityId, data + 1, 8);
|
|
|
|
auto it = m_entities.find(entityId);
|
|
if (it != m_entities.end()) {
|
|
m_entities.erase(it);
|
|
m_deleteQueue.push_back(entityId);
|
|
std::cout << "[OverteClient] Entity erased: id=" << entityId << std::endl;
|
|
}
|
|
break;
|
|
}
|
|
|
|
case PACKET_TYPE_OCTREE_STATS:
|
|
std::cout << "[OverteClient] Received octree stats" << std::endl;
|
|
break;
|
|
|
|
default:
|
|
std::cout << "[OverteClient] Unknown entity packet type: 0x" << std::hex << (int)packetType << std::dec << std::endl;
|
|
break;
|
|
}
|
|
}
|
|
|
|
void OverteClient::handleDomainListReply(const char* data, size_t len) {
|
|
// DomainList packet contains mixer endpoints
|
|
// Format: [NumNodes:u8] followed by sequence of:
|
|
// [NodeType:u8][UUID:16bytes][PublicSocket:sockaddr][LocalSocket:sockaddr]
|
|
std::cout << "[OverteClient] DomainList reply received (" << len << " bytes)" << std::endl;
|
|
|
|
if (len < 1) return;
|
|
|
|
unsigned char numNodes = static_cast<unsigned char>(data[0]);
|
|
std::cout << "[OverteClient] Number of assignment clients: " << (int)numNodes << std::endl;
|
|
|
|
size_t offset = 1;
|
|
|
|
for (int i = 0; i < numNodes && offset < len; ++i) {
|
|
// Read NodeType
|
|
if (offset + 1 > len) break;
|
|
unsigned char nodeType = static_cast<unsigned char>(data[offset++]);
|
|
|
|
// Skip UUID (16 bytes)
|
|
if (offset + 16 > len) break;
|
|
offset += 16;
|
|
|
|
// Read public socket address
|
|
if (offset + sizeof(sockaddr_in) > len) break;
|
|
|
|
sockaddr_in publicAddr;
|
|
std::memcpy(&publicAddr, data + offset, sizeof(sockaddr_in));
|
|
offset += sizeof(sockaddr_in);
|
|
|
|
// Skip local socket (same size)
|
|
if (offset + sizeof(sockaddr_in) > len) break;
|
|
offset += sizeof(sockaddr_in);
|
|
|
|
// NodeType values from Overte:
|
|
// 0 = DomainServer, 1 = EntityServer, 2 = Agent, 3 = AudioMixer,
|
|
// 4 = AvatarMixer, 5 = AssetServer, 6 = MessagesMixer, 7 = EntityScriptServer
|
|
const unsigned char NODE_TYPE_ENTITY_SERVER = 1;
|
|
const unsigned char NODE_TYPE_AVATAR_MIXER = 4;
|
|
const unsigned char NODE_TYPE_AUDIO_MIXER = 3;
|
|
|
|
char addrStr[INET_ADDRSTRLEN];
|
|
inet_ntop(AF_INET, &publicAddr.sin_addr, addrStr, sizeof(addrStr));
|
|
int port = ntohs(publicAddr.sin_port);
|
|
|
|
const char* nodeTypeName = "Unknown";
|
|
switch (nodeType) {
|
|
case 0: nodeTypeName = "DomainServer"; break;
|
|
case NODE_TYPE_ENTITY_SERVER: nodeTypeName = "EntityServer"; break;
|
|
case 2: nodeTypeName = "Agent"; break;
|
|
case NODE_TYPE_AUDIO_MIXER: nodeTypeName = "AudioMixer"; break;
|
|
case NODE_TYPE_AVATAR_MIXER: nodeTypeName = "AvatarMixer"; break;
|
|
case 5: nodeTypeName = "AssetServer"; break;
|
|
case 6: nodeTypeName = "MessagesMixer"; break;
|
|
case 7: nodeTypeName = "EntityScriptServer"; break;
|
|
}
|
|
|
|
std::cout << "[OverteClient] Assignment: " << nodeTypeName
|
|
<< " at " << addrStr << ":" << port << std::endl;
|
|
|
|
if (nodeType == NODE_TYPE_ENTITY_SERVER) {
|
|
// Update EntityServer connection to use discovered address
|
|
std::cout << "[OverteClient] Connecting to EntityServer at " << addrStr << ":" << port << std::endl;
|
|
|
|
// Update target address for EntityServer
|
|
sockaddr_in* entityAddr = reinterpret_cast<sockaddr_in*>(&m_entityAddr);
|
|
entityAddr->sin_family = AF_INET;
|
|
entityAddr->sin_port = publicAddr.sin_port;
|
|
entityAddr->sin_addr = publicAddr.sin_addr;
|
|
m_entityAddrLen = sizeof(sockaddr_in);
|
|
|
|
m_entityServerReady = true;
|
|
|
|
// Send EntityQuery to request all entities
|
|
sendEntityQuery();
|
|
}
|
|
}
|
|
}
|
|
|
|
void OverteClient::handleDomainConnectionDenied(const char* data, size_t len) {
|
|
std::cerr << "[OverteClient] Domain connection DENIED!" << std::endl;
|
|
|
|
// Parse reason if available
|
|
if (len > 0) {
|
|
std::string reason(data, len);
|
|
std::cerr << "[OverteClient] Reason: " << reason << std::endl;
|
|
}
|
|
|
|
m_domainConnected = false;
|
|
}
|
|
|
|
void OverteClient::sendDomainConnectRequest() {
|
|
if (!m_udpReady || m_udpFd == -1) return;
|
|
|
|
// Create NLPacket with DomainConnectRequest type and correct version
|
|
NLPacket packet(PacketType::DomainConnectRequest, PacketVersions::DomainConnectRequest_SocketTypes, true);
|
|
packet.setSequenceNumber(m_sequenceNumber++);
|
|
|
|
// 1. Write connect UUID (16 bytes)
|
|
// Parse session UUID and write as 16 bytes
|
|
// Format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
|
|
uint8_t uuidBytes[16] = {0};
|
|
if (m_sessionUUID.length() >= 36) {
|
|
// Parse UUID hex string to bytes
|
|
int byteIdx = 0;
|
|
for (size_t i = 0; i < m_sessionUUID.length() && byteIdx < 16; i++) {
|
|
char c = m_sessionUUID[i];
|
|
if (c == '-') continue;
|
|
|
|
uint8_t nibble = 0;
|
|
if (c >= '0' && c <= '9') nibble = c - '0';
|
|
else if (c >= 'a' && c <= 'f') nibble = c - 'a' + 10;
|
|
else if (c >= 'A' && c <= 'F') nibble = c - 'A' + 10;
|
|
|
|
if (i % 2 == 0 || (i > 0 && m_sessionUUID[i-1] == '-')) {
|
|
uuidBytes[byteIdx] = nibble << 4;
|
|
} else {
|
|
uuidBytes[byteIdx] |= nibble;
|
|
byteIdx++;
|
|
}
|
|
}
|
|
}
|
|
packet.write(uuidBytes, 16);
|
|
|
|
// 2. Write protocol version signature (MD5 hash) with length prefix
|
|
auto protocolSig = NLPacket::computeProtocolVersionSignature();
|
|
packet.writeUInt32(static_cast<uint32_t>(protocolSig.size())); // Length prefix
|
|
packet.write(protocolSig.data(), protocolSig.size());
|
|
|
|
// 3. Write hardware address (MAC address as QString format)
|
|
// QString format: uint32 length + UTF-16 chars
|
|
// We'll use a fake MAC address
|
|
std::string macAddr = "00:00:00:00:00:00";
|
|
packet.writeUInt32(static_cast<uint32_t>(macAddr.size()));
|
|
for (char c : macAddr) {
|
|
packet.writeUInt16(static_cast<uint16_t>(c)); // UTF-16 encoding
|
|
}
|
|
|
|
// 4. Write machine fingerprint (QString format)
|
|
std::string fingerprint = m_sessionUUID;
|
|
packet.writeUInt32(static_cast<uint32_t>(fingerprint.size()));
|
|
for (char c : fingerprint) {
|
|
packet.writeUInt16(static_cast<uint16_t>(c));
|
|
}
|
|
|
|
// 5. Write compressed system info (QByteArray format)
|
|
// QByteArray format: uint32 length + data
|
|
// Minimal JSON system info
|
|
std::string systemInfo = "{\"computer\":{\"OS\":\"Linux\"},\"cpus\":[{\"model\":\"Stardust\"}]}";
|
|
packet.writeUInt32(static_cast<uint32_t>(systemInfo.size()));
|
|
packet.write(systemInfo.data(), systemInfo.size());
|
|
|
|
// 6. Write local socket type (SocketType enum: Public=0, Local=1, Stun=2)
|
|
packet.writeUInt8(0); // Public socket
|
|
|
|
// 7. Write public socket type
|
|
packet.writeUInt8(0); // Public socket
|
|
|
|
const auto& data = packet.getData();
|
|
ssize_t s = ::sendto(m_udpFd, data.data(), data.size(), 0,
|
|
reinterpret_cast<sockaddr*>(&m_udpAddr), m_udpAddrLen);
|
|
if (s > 0) {
|
|
std::cout << "[OverteClient] DomainConnectRequest sent (" << s << " bytes, seq=" << (m_sequenceNumber-1) << ")" << std::endl;
|
|
std::cout << "[OverteClient] Session UUID: " << m_sessionUUID << std::endl;
|
|
std::cout << "[OverteClient] Protocol signature: " << protocolSig.size() << " bytes (MD5)" << std::endl;
|
|
// Note: username is not sent in this packet; Overte uses signature-based auth.
|
|
// Hex dump first 48 bytes
|
|
std::cout << "[OverteClient] >>> NLPacket Hex: ";
|
|
for (size_t i = 0; i < std::min(size_t(48), data.size()); ++i) {
|
|
printf("%02x ", data[i]);
|
|
}
|
|
std::cout << std::endl;
|
|
} else {
|
|
std::cerr << "[OverteClient] Failed to send domain connect request: " << strerror(errno) << std::endl;
|
|
}
|
|
}
|
|
|
|
void OverteClient::sendDomainListRequest() {
|
|
// Send DomainList request packet using NLPacket format
|
|
if (!m_udpReady || m_udpFd == -1) return;
|
|
|
|
// Create NLPacket with DomainListRequest type and correct version
|
|
NLPacket packet(PacketType::DomainListRequest, PacketVersions::DomainListRequest_SocketTypes, true);
|
|
packet.setSequenceNumber(m_sequenceNumber++);
|
|
|
|
// DomainListRequest has no payload, just the header
|
|
|
|
const auto& data = packet.getData();
|
|
ssize_t s = ::sendto(m_udpFd, data.data(), data.size(), 0,
|
|
reinterpret_cast<sockaddr*>(&m_udpAddr), m_udpAddrLen);
|
|
if (s > 0) {
|
|
std::cout << "[OverteClient] DomainListRequest sent (seq=" << (m_sequenceNumber-1) << ")" << std::endl;
|
|
} else {
|
|
std::cerr << "[OverteClient] Failed to send domain list request: " << strerror(errno) << std::endl;
|
|
}
|
|
}
|
|
|
|
void OverteClient::sendPing(int fd, const sockaddr_storage& addr, socklen_t addrLen) {
|
|
// Create NLPacket for Ping with correct version
|
|
NLPacket packet(PacketType::Ping, PacketVersions::Ping_IncludeConnectionID, false);
|
|
packet.setSequenceNumber(m_sequenceNumber++);
|
|
|
|
// Add timestamp (microseconds since epoch)
|
|
auto now = std::chrono::system_clock::now();
|
|
auto micros = std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch()).count();
|
|
packet.writeUInt64(micros);
|
|
|
|
// Ping type (0 = local, 1 = public)
|
|
packet.writeUInt8(0);
|
|
|
|
const auto& data = packet.getData();
|
|
ssize_t s = ::sendto(fd, data.data(), data.size(), 0,
|
|
reinterpret_cast<const sockaddr*>(&addr), addrLen);
|
|
if (s < 0 && errno != EWOULDBLOCK && errno != EAGAIN) {
|
|
std::cerr << "[OverteClient] Ping send failed: " << strerror(errno) << std::endl;
|
|
}
|
|
}
|
|
|
|
void OverteClient::sendEntityQuery() {
|
|
if (m_entityFd < 0 || !m_entityServerReady) return;
|
|
|
|
const unsigned char PACKET_TYPE_ENTITY_QUERY = 0x15;
|
|
|
|
// EntityQuery packet structure (simplified):
|
|
// [PacketType:u8][ConicalViews:bool][CameraFrustum if ConicalViews=true]
|
|
// For simplicity, send with ConicalViews=false to request all entities
|
|
|
|
std::vector<char> packet;
|
|
packet.push_back(static_cast<char>(PACKET_TYPE_ENTITY_QUERY));
|
|
packet.push_back(0); // ConicalViews = false
|
|
|
|
// With ConicalViews=false, we're requesting all entities
|
|
// Additional octree query parameters can be added here
|
|
|
|
ssize_t sent = sendto(m_entityFd, packet.data(), packet.size(), 0,
|
|
reinterpret_cast<const sockaddr*>(&m_entityAddr), m_entityAddrLen);
|
|
|
|
if (sent > 0) {
|
|
std::cout << "[OverteClient] Sent EntityQuery to EntityServer" << std::endl;
|
|
} else {
|
|
std::cerr << "[OverteClient] Failed to send EntityQuery: " << strerror(errno) << std::endl;
|
|
}
|
|
}
|
|
|
|
void OverteClient::sendMovementInput(const glm::vec3& linearVelocity) {
|
|
(void)linearVelocity; // TODO: send to avatar mixer
|
|
}
|
|
|
|
std::vector<OverteEntity> OverteClient::consumeUpdatedEntities() {
|
|
std::vector<OverteEntity> out;
|
|
out.reserve(m_updateQueue.size());
|
|
for (auto id : m_updateQueue) {
|
|
auto it = m_entities.find(id);
|
|
if (it != m_entities.end()) out.push_back(it->second);
|
|
}
|
|
m_updateQueue.clear();
|
|
return out;
|
|
}
|
|
|
|
std::vector<std::uint64_t> OverteClient::consumeDeletedEntities() {
|
|
std::vector<std::uint64_t> out;
|
|
out.swap(m_deleteQueue); // efficient clear
|
|
return out;
|
|
}
|