Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

This should help, as well as fix another annoyance: bind to an ephemeral port,

Browse source 
rather than a fixed one.
This commit is contained in:
Andrzej Kapolka 2013-06-12 15:52:29 -07:00
parent f197b4cd62
commit e4ed9162b9
5 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -169,7 +169,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
_window->setWindowTitle("Interface"); _window->setWindowTitle("Interface");
printLog("Interface Startup:\n"); printLog("Interface Startup:\n");
unsigned int listenPort = AGENT_SOCKET_LISTEN_PORT; unsigned int listenPort = 0; // bind to an ephemeral port by default
const char** constArgv = const_cast<const char**>(argv); const char** constArgv = const_cast<const char**>(argv);
const char* portStr = getCmdOption(argc, constArgv, "--listenPort"); const char* portStr = getCmdOption(argc, constArgv, "--listenPort");
if (portStr) { if (portStr) {
@ -827,8 +827,6 @@ void Application::terminate() {
static void sendAvatarVoxelURLMessage(const QUrl& url) { static void sendAvatarVoxelURLMessage(const QUrl& url) {
uint16_t ownerID = AgentList::getInstance()->getOwnerID(); uint16_t ownerID = AgentList::getInstance()->getOwnerID();
qDebug() << "me" << ownerID << url;
if (ownerID == UNKNOWN_AGENT_ID) { if (ownerID == UNKNOWN_AGENT_ID) {
return; // we don't yet know who we are return; // we don't yet know who we are
} }
@ -850,8 +848,6 @@ static void processAvatarVoxelURLMessage(unsigned char *packetData, size_t dataB
packetData += sizeof(agentID); packetData += sizeof(agentID);
dataBytes -= sizeof(agentID); dataBytes -= sizeof(agentID);
qDebug() << "them" << agentID << QUrl::fromEncoded(QByteArray((char*)packetData, dataBytes));
// make sure the agent exists // make sure the agent exists
Agent* agent = AgentList::getInstance()->agentWithID(agentID); Agent* agent = AgentList::getInstance()->agentWithID(agentID);
if (!agent || !agent->getLinkedData()) { if (!agent || !agent->getLinkedData()) {

3
libraries/shared/src/AgentList.cpp
View file

@ -62,7 +62,6 @@ AgentList::AgentList(char newOwnerType, unsigned int newSocketListenPort) :
_agentSocket(newSocketListenPort), _agentSocket(newSocketListenPort),
_ownerType(newOwnerType), _ownerType(newOwnerType),
_agentTypesOfInterest(NULL), _agentTypesOfInterest(NULL),
_socketListenPort(newSocketListenPort),
_ownerID(UNKNOWN_AGENT_ID), _ownerID(UNKNOWN_AGENT_ID),
_lastAgentID(0) { _lastAgentID(0) {
pthread_mutex_init(&mutex, 0); pthread_mutex_init(&mutex, 0);
@ -224,7 +223,7 @@ void AgentList::sendDomainServerCheckIn() {
packetPosition += packSocket(checkInPacket + sizeof(PACKET_HEADER) + sizeof(AGENT_TYPE), packetPosition += packSocket(checkInPacket + sizeof(PACKET_HEADER) + sizeof(AGENT_TYPE),
getLocalAddress(), getLocalAddress(),
htons(_socketListenPort)); htons(_agentSocket.getListeningPort()));
// add the number of bytes for agent types of interest // add the number of bytes for agent types of interest
*(packetPosition++) = numBytesAgentsOfInterest; *(packetPosition++) = numBytesAgentsOfInterest;

2
libraries/shared/src/AgentList.h
View file

@ -58,7 +58,7 @@ public:
UDPSocket* getAgentSocket() { return &_agentSocket; } UDPSocket* getAgentSocket() { return &_agentSocket; }
unsigned int getSocketListenPort() const { return _socketListenPort; }; unsigned int getSocketListenPort() const { return _agentSocket.getListeningPort(); };
void(*linkedDataCreateCallback)(Agent *); void(*linkedDataCreateCallback)(Agent *);

9
libraries/shared/src/UDPSocket.cpp
View file

@ -117,7 +117,7 @@ unsigned short loadBufferWithSocketInfo(char* addressBuffer, sockaddr* socket) {
} }
} }
UDPSocket::UDPSocket(int listeningPort) : blocking(true) { UDPSocket::UDPSocket(int listeningPort) : blocking(true), listeningPort(listeningPort) {
init(); init();
// create the socket // create the socket
handle = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); handle = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@ -140,6 +140,13 @@ UDPSocket::UDPSocket(int listeningPort) : blocking(true) {
return; return;
} }
// if we requested an ephemeral port, get the actual port
if (listeningPort == 0) {
socklen_t addressLength = sizeof(sockaddr_in);
getsockname(handle, (sockaddr*) &bind_address, &addressLength);
listeningPort = ntohs(bind_address.sin_port);
}
// set timeout on socket recieve to 0.5 seconds // set timeout on socket recieve to 0.5 seconds
struct timeval tv; struct timeval tv;
tv.tv_sec = 0; tv.tv_sec = 0;

4
libraries/shared/src/UDPSocket.h
View file

@ -23,14 +23,16 @@ public:
UDPSocket(int listening_port); UDPSocket(int listening_port);
~UDPSocket(); ~UDPSocket();
bool init(); bool init();
int getListeningPort() const { return listeningPort; }
void setBlocking(bool blocking); void setBlocking(bool blocking);
bool isBlocking() { return blocking; } bool isBlocking() const { return blocking; }
int send(sockaddr* destAddress, const void* data, size_t byteLength) const; int send(sockaddr* destAddress, const void* data, size_t byteLength) const;
int send(char* destAddress, int destPort, const void* data, size_t byteLength) const; int send(char* destAddress, int destPort, const void* data, size_t byteLength) const;
bool receive(void* receivedData, ssize_t* receivedBytes) const; bool receive(void* receivedData, ssize_t* receivedBytes) const;
bool receive(sockaddr* recvAddress, void* receivedData, ssize_t* receivedBytes) const; bool receive(sockaddr* recvAddress, void* receivedData, ssize_t* receivedBytes) const;
private: private:
int handle; int handle;
int listeningPort;
bool blocking; bool blocking;
}; };