daily work

This commit is contained in:
Olaf Rempel 2006-03-05 02:28:19 +01:00
parent 38542d7ddf
commit 2e728963c7
32 changed files with 186 additions and 382 deletions

View File

@ -16,6 +16,9 @@ hlswmaster: $(OBJS)
%.d: %.cpp
$(CXX) $(CFLAGS) -MM -c $< -o $@
dist:
git-tar-tree HEAD hlswmaster-ng | gzip -9 -c > hlswmaster-ng.tar.gz
clean:
rm -f hlswmaster *.d *.o *.log

View File

@ -3,6 +3,10 @@
#define DEFAULT_TIMEOUT 180
/*
** TODO: replace list with sorted list, or even better with a hash
*/
GameList::GameList(Config& conf)
: lastUpdate(0)
{
@ -12,6 +16,8 @@ GameList::GameList(Config& conf)
GameList::~GameList()
{
while (!glist.isEmpty())
delete glist.get();
}
void GameList::cleanup()
@ -29,11 +35,11 @@ Iterator<GameEntry>* GameList::createIterator()
return glist.createIterator();
}
void GameList::addGame(int gameid, NetPkt* pkt)
void GameList::addGame(int gameid, NetPkt* pkt, int port2)
{
char buf[64];
pkt->show(buf, sizeof(buf));
LogSystem::log(LOG_NOTICE, "Adding Game %d: %s", gameid, buf);
LogSystem::log(LOG_NOTICE, "Adding Game %d: %s %d", gameid, buf, port2);
glist.add(new GameEntry());
}

View File

@ -2,25 +2,10 @@
#define _GAMELIST_H_
#include "config.h"
#include "list.h"
#include "netpkt.h"
#include "gameentry.h"
#include "timerservice.h"
class GameEntry {
public:
GameEntry() {};
~GameEntry() {};
struct in_addr addr;
int port1;
int port2;
int gameid;
protected:
GameEntry(const GameEntry& ge);
GameEntry& operator=(const GameEntry& ge);
};
#include "list.h"
class GameList {
public:
@ -28,7 +13,7 @@ public:
~GameList();
void cleanup();
void addGame(int gameid, NetPkt* pkt);
void addGame(int gameid, NetPkt* pkt, int port2 = 0);
long getLastUpdate();
Iterator<GameEntry>* createIterator();

View File

@ -7,10 +7,6 @@ GameParser::GameParser(RecvQueue& rxQueue, ModuleList& modList, GameList& gameLi
{
}
GameParser::~GameParser()
{
}
int GameParser::execute(void* arg)
{
while (1) {

View File

@ -10,7 +10,7 @@
class GameParser : public Thread {
public:
GameParser(RecvQueue& rxQueue, ModuleList& modlist, GameList& gameList);
~GameParser();
~GameParser() {};
int execute(void* arg);

View File

@ -22,8 +22,8 @@ GameScanner::~GameScanner()
int GameScanner::execute(void* arg)
{
while (1) {
int fd = msock->waitOnSocket();
NetPkt* pkt = NetPkt::createFromSocket(fd);
NetPkt* pkt = msock->recv();
if (pkt)
rxQueue.addPkt(pkt);
}
return 0;

View File

@ -91,7 +91,7 @@ int main(int argc, char *argv[])
HlswServer server(conf, gameList);
// modList.reg(new ModHalfLife());
// modList.reg(new ModQ3Engine());
modList.reg(new ModQ3Engine());
// modList.reg(new ModD3Engine());
// modList.reg(new ModGameSpy1());
// modList.reg(new ModGameSpy2());

View File

@ -22,10 +22,10 @@ struct hlsw_entry {
} __attribute__ ((packed));
HlswServer::HlswPacket::HlswPacket(HlswPacket* next)
: next(next), count(0)
: NetPkt(1418), next(next)
{
memcpy(data, hlsw_header, sizeof(hlsw_header));
memset(data + sizeof(hlsw_header), 0, sizeof(data) - sizeof(hlsw_header));
memcpy((void*)data, hlsw_header, sizeof(hlsw_header));
used = sizeof(hlsw_header);
}
HlswServer::HlswPacket::~HlswPacket()
@ -36,7 +36,7 @@ HlswServer::HlswPacket::~HlswPacket()
bool HlswServer::HlswPacket::addGame(GameEntry* ge)
{
if (count >= 140)
if (used >= 1418)
return false;
struct hlsw_entry tmp;
@ -45,30 +45,22 @@ bool HlswServer::HlswPacket::addGame(GameEntry* ge)
tmp.port1 = ge->port1;
tmp.port2 = ge->port2;
memcpy(data + sizeof(hlsw_header) + count * 10, &tmp, sizeof(tmp));
count++;
memcpy((void*)(data + used), &tmp, sizeof(tmp));
used += sizeof(tmp);
return true;
}
void HlswServer::HlswPacket::send(int socket, struct sockaddr_in* dst)
void HlswServer::HlswPacket::send(Socket* socket, struct sockaddr_in* dst)
{
if (next)
next->send(socket, dst);
if (sendto(socket, data, sizeof(hlsw_header) + count * 10, 0,
(struct sockaddr *)dst, sizeof(*dst)) < 0) {
LogSystem::log(LOG_WARN, "HlswPacket::send()");
}
socket->sendto(this, dst);
}
HlswServer::HlswServer(Config& conf, GameList& glist)
: lastUpdate(0)
{
if ((sock = socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
LogSystem::log(LOG_CRIT, "HlswServer(): socket()");
return;
}
const char *ip = conf.getString("global", "master_ip", "0.0.0.0");
LogSystem::log(LOG_NOTICE, "HlswServer listen on %s:%d", ip, HLSW_MASTER_PORT);
@ -76,11 +68,7 @@ HlswServer::HlswServer(Config& conf, GameList& glist)
dst.sin_family = AF_INET;
dst.sin_port = htons(HLSW_MASTER_PORT);
inet_aton(ip, &dst.sin_addr);
if (bind(sock, (struct sockaddr *)&dst, sizeof(dst)) < 0) {
LogSystem::log(LOG_ERROR, "HlswServer(): bind()");
return;
}
socket = Socket::createSocket(&dst);
int interval = conf.getInteger("global", "rebuild_interval", DEFAULT_REBUILD_INTERVAL);
TimerService::registerTimer(new Timer(new RebuildEvent(*this, glist), interval));
@ -90,30 +78,23 @@ HlswServer::HlswServer(Config& conf, GameList& glist)
HlswServer::~HlswServer()
{
close(sock);
delete pktlist;
delete socket;
}
int HlswServer::execute(void* arg)
{
struct sockaddr_in src;
unsigned char buf[32];
socklen_t len;
int ret;
while (1) {
/* auf clientanfrage warten */
len = sizeof(src);
ret = recvfrom(sock, buf, sizeof(buf), 0, (struct sockaddr *)&src, &len);
if (memcmp(buf, hlsw_header, sizeof(hlsw_header))) {
NetPkt* pkt = socket->recv();
if (!pkt->compare(0, hlsw_header, sizeof(hlsw_header))) {
LogSystem::log(LOG_NOTICE, "HlswServer: not a hlsw packet");
continue;
}
mutex.lock();
pktlist->send(sock, &src);
pktlist->send(socket, pkt->getAddress());
mutex.unlock();
}
return 0;
}

View File

@ -6,6 +6,8 @@
#include "thread.h"
#include "config.h"
#include "gamelist.h"
#include "netpkt.h"
#include "socket.h"
#include "mutex.h"
class HlswServer : public Thread {
@ -33,23 +35,21 @@ private:
GameList& gl;
};
class HlswPacket {
class HlswPacket : private NetPkt {
public:
HlswPacket(HlswPacket* next);
~HlswPacket();
bool addGame(GameEntry* ge);
void send(int socket, struct sockaddr_in* dst);
void send(Socket* socket, struct sockaddr_in* dst);
private:
HlswPacket* next;
int count;
char data[1418];
};
Socket* socket;
HlswPacket* pktlist;
Mutex mutex;
int sock;
long lastUpdate;
};

View File

@ -1,5 +1,6 @@
#include <string.h>
#include "netpkt.h"
#include "modhelper.h"
#include "mod_d3engine.h"
static struct game_ports port_arr[] = {
@ -13,14 +14,15 @@ static const char replyhead[] = "\xff\xffinfoResponse";
void ModD3Engine::scan(MultiSock* msock)
{
msock->send(port_arr, scanmsg, strlen(scanmsg));
ModHelper::send(msock, port_arr, scanmsg, strlen(scanmsg));
}
int ModD3Engine::parse(NetPkt* pkt, GameList* glist)
{
int gameid;
if (!(gameid = pkt->checkPortArray(port_arr)))
gameid = ModHelper::checkPorts(pkt, port_arr);
if (!gameid)
return PARSE_REJECT;
if (pkt->compare(0, replyhead, strlen(replyhead)))

View File

@ -1,4 +1,5 @@
#include <string.h>
#include "modhelper.h"
#include "mod_gamespy1.h"
static struct game_ports port_arr[] = {
@ -14,7 +15,7 @@ static const char scanmsg[] = "\\status\\";
void ModGameSpy1::scan(MultiSock* msock)
{
msock->send(port_arr, scanmsg, strlen(scanmsg));
ModHelper::send(msock, port_arr, scanmsg, strlen(scanmsg));
}
int ModGameSpy1::parse(NetPkt* pkt, GameList* slist)

View File

@ -1,4 +1,5 @@
#include <string.h>
#include "modhelper.h"
#include "mod_gamespy2.h"
static struct game_ports port_arr[] = {
@ -15,7 +16,7 @@ static const char replyhead[] = { 0x00, 0xDE, 0xAD, 0xBE, 0xEF };
void ModGameSpy2::scan(MultiSock* msock)
{
msock->send(port_arr, scanmsg, sizeof(scanmsg));
ModHelper::send(msock, port_arr, scanmsg, sizeof(scanmsg));
}
int ModGameSpy2::parse(NetPkt* pkt, GameList* slist)

View File

@ -1,4 +1,5 @@
#include <string.h>
#include "modhelper.h"
#include "mod_halflife.h"
static struct game_ports port_arr[] = {
@ -12,9 +13,9 @@ static const char scanmsg3[] = "\xff\xff\xff\xff""TSource Engine Query";
void ModHalfLife::scan(MultiSock* msock)
{
msock->send(port_arr, scanmsg1, strlen(scanmsg1));
msock->send(port_arr, scanmsg2, strlen(scanmsg2));
msock->send(port_arr, scanmsg3, strlen(scanmsg3));
ModHelper::send(msock, port_arr, scanmsg1, strlen(scanmsg1));
ModHelper::send(msock, port_arr, scanmsg2, strlen(scanmsg2));
ModHelper::send(msock, port_arr, scanmsg3, strlen(scanmsg3));
}
int ModHalfLife::parse(NetPkt* pkt, GameList* slist)

View File

@ -1,10 +1,9 @@
#include <string.h>
#include "logging.h"
#include "modhelper.h"
#include "mod_q3engine.h"
static struct game_ports port_arr[] = {
{ 27960, 27969, ID_Q3A }, // q3(6), ef(7), et25), rtcw(8)
{ 27960, 27960, ID_Q3A }, // q3(6), ef(7), et25), rtcw(8)
// { 28070, 28070, ID_JK2 }, // jk2(12)
// { 28960, 28963, ID_COD }, // cod(31), cod:uo(42), cod2(48)
// { 29070, 29070, ID_JK3 }, // jk3(27)
@ -30,14 +29,15 @@ static const char reply_cod2[] = "Call of Duty 2\\";
void ModQ3Engine::scan(MultiSock* msock)
{
msock->send(port_arr, scanmsg, strlen(scanmsg));
ModHelper::send(msock, port_arr, scanmsg, strlen(scanmsg));
}
int ModQ3Engine::parse(NetPkt* pkt, GameList* glist)
{
int gameid = 0, pos1, pos2;
if (!pkt->checkPortArray(port_arr))
gameid = ModHelper::checkPorts(pkt, port_arr);
if (!gameid)
return PARSE_REJECT;
if (!pkt->compare(0, replyhead, strlen(replyhead)))

View File

@ -2,13 +2,10 @@
#define _MODULE_H_
#include "config.h"
#include "multisock.h"
#include "netpkt.h"
#include "gamelist.h"
/* avoid cyclic deps, include this later.. */
//#include "multisock.h"
class MultiSock;
enum {
ID_UNKNOWN = 0, // "Unknown"
ID_HL, // "Halflife"
@ -81,6 +78,4 @@ protected:
Module& operator=(const Module& m);
};
#include "multisock.h"
#endif // _MODULE_H_

View File

@ -17,101 +17,6 @@
#define DEVFILE "/proc/net/dev"
#define BUFSIZE 1024
MultiSock::Socket::Socket()
{
if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
LogSystem::log(LOG_CRIT, "Socket: socket()");
}
MultiSock::Socket::~Socket()
{
close(fd);
}
bool MultiSock::Socket::bindToDevice(const char* name)
{
strncpy(devname, name, sizeof(devname));
int ret = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, devname, sizeof(devname));
if (ret < 0) {
LogSystem::log(LOG_NOTICE, "Socket: setsockopt(SO_BINDTODEVICE) %s", devname);
return false;
}
return true;
}
bool MultiSock::Socket::bindToPort(int port)
{
struct ifreq ifr;
strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name));
if (ioctl(fd, SIOCGIFADDR, &ifr) != 0) {
LogSystem::log(LOG_WARN, "Socket: ioctl(SIOCGIFADDR) %s", devname);
return false;
}
memcpy(&addr, &ifr.ifr_addr, sizeof(addr));
addr.sin_port = htons(port);
if (bind(fd, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
LogSystem::log(LOG_WARN, "Socket: bind() %s", devname);
return false;
}
int bcast = 1;
if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &bcast, sizeof(bcast))) {
LogSystem::log(LOG_WARN, "Socket: setsockopt(SO_BROADCAST) %s", devname);
return false;
}
return true;
}
int MultiSock::Socket::show(char* buf, int size)
{
return snprintf(buf, size, "%s (%s:%d) ", devname,
inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));
}
MultiSock::Socket* MultiSock::Socket::createSocket(const char* name, int port)
{
Socket* sock = new Socket();
if (sock->fd < 0) {
delete sock;
return NULL;
}
struct ifreq ifr;
strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
if (ioctl(sock->fd, SIOCGIFFLAGS, &ifr) != 0) {
LogSystem::log(LOG_WARN, "Socket: ioctl(SIOCGIFFLAGS) %s", name);
delete sock;
return NULL;
}
if (!(ifr.ifr_flags & IFF_UP) || (ifr.ifr_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) {
delete sock;
return NULL;
}
sock->bindToDevice(name);
if (!sock->bindToPort(port)) {
delete sock;
return NULL;
}
return sock;
}
MultiSock::MultiSock(Config& conf)
{
char* buf = new char [BUFSIZE];
@ -158,8 +63,8 @@ MultiSock::MultiSock(Config& conf)
}
}
}
delete it;
fclose(fp);
delete buf;
@ -173,14 +78,12 @@ MultiSock::~MultiSock()
delete ifaceList.get();
}
int MultiSock::waitOnSocket()
NetPkt* MultiSock::recv()
{
fd_set fdcpy;
while (1) {
memcpy(&fdcpy, &fdsel, sizeof(fdcpy));
select(FD_SETSIZE, &fdcpy, NULL, NULL, NULL);
Iterator<Socket>* it = ifaceList.createIterator();
@ -188,47 +91,23 @@ int MultiSock::waitOnSocket()
Socket* sock = it->next();
if (FD_ISSET(sock->getFD(), &fdcpy)) {
delete it;
return sock->getFD();
return sock->recv();
}
}
delete it;
LogSystem::log(LOG_WARN, "waitOnSocket(): select()");
LogSystem::log(LOG_WARN, "MultiSock::recvFrom(): select()");
}
return NULL;
}
return -1;
}
void MultiSock::send(struct in_addr *dstip, int dport, const char* data, int size)
int MultiSock::sendto(NetPkt* pkt, struct sockaddr_in* dst)
{
struct sockaddr_in addr;
addr.sin_family = AF_INET;
addr.sin_port = htons(dport);
addr.sin_addr.s_addr = (dstip ? dstip->s_addr : 0xFFFFFFFF);
Iterator<Socket>* it = ifaceList.createIterator();
while (it->hasNext())
if (sendto(it->next()->getFD(), data, size, 0, (struct sockaddr *)&addr, sizeof(addr)) < 0)
LogSystem::log(LOG_WARN, "MultiSock::send()");
it->next()->sendto(pkt, dst);
delete it;
usleep(10000);
}
void MultiSock::send(struct game_ports* arr, const char* data, int size)
{
while (arr && arr->portlo && arr->porthi) {
int port;
for (port = arr->portlo; port <= arr->porthi; port++)
send(NULL, port, data, size);
arr++;
}
}
void MultiSock::send(int* arr, const char* data, int size)
{
while (*arr)
send(NULL, *arr++, data, size);
return 0;
}

View File

@ -4,52 +4,24 @@
#include <net/if.h>
#include <netinet/in.h>
#include "list.h"
#include "config.h"
#include "module.h"
#include "netpkt.h"
#include "socket.h"
#include "list.h"
class MultiSock {
public:
MultiSock(Config& conf);
~MultiSock();
void send(struct in_addr *dstip, int dport, const char* data, int size);
void send(struct game_ports* arr, const char* data, int size);
void send(int* arr, const char* data, int size);
int waitOnSocket();
int sendto(NetPkt* pkt, struct sockaddr_in* dst = NULL);
NetPkt* recv();
protected:
MultiSock(const MultiSock& x);
MultiSock& operator=(const MultiSock& x);
private:
class Socket {
public:
static Socket* createSocket(const char* name, int port);
int show(char* buf, int size);
int getFD() { return fd; }
~Socket();
protected:
Socket(const Socket& s);
Socket& operator=(const Socket& s);
private:
Socket();
bool bindToDevice(const char* name);
bool bindToPort(int port);
int fd;
char devname[IFNAMSIZ];
struct sockaddr_in addr;
};
void addIface(const char* name, int port);
List<Socket> ifaceList;
fd_set fdsel;
};

View File

@ -13,78 +13,59 @@
#include "module.h"
#include "netpkt.h"
NetPkt::NetPkt(const char* data, int size)
: data(data), used(size), size(0)
{
}
NetPkt::NetPkt(int size)
:size(size)
: used(0), size(size)
{
data = new char[size];
}
NetPkt::~NetPkt()
{
if (size > 0)
delete data;
}
int NetPkt::readFromSocket(int fd)
{
socklen_t i = sizeof(struct sockaddr_in);
return recvfrom(fd, this->data, this->size, 0, (struct sockaddr *)&this->addr, &i);
}
int NetPkt::show(char* buf, int size)
{
return snprintf(buf, size, "(%s:%d) %d bytes",
return snprintf(buf, size, "(%s:%d) (%d/%d) bytes",
inet_ntoa(this->addr.sin_addr),
ntohs(this->addr.sin_port),
this->size);
}
NetPkt* NetPkt::createFromSocket(int fd)
{
int recvsize;
if (ioctl(fd, FIONREAD, &recvsize) == -1) {
LogSystem::log(LOG_ERROR, "NetPkt::createFromSocket()");
return NULL;
}
NetPkt* retval = new NetPkt(recvsize);
retval->readFromSocket(fd);
return retval;
}
int NetPkt::checkPortArray(struct game_ports* portarr)
{
int myport = ntohs(this->addr.sin_port);
while (portarr && portarr->portlo) {
int port;
for (port = portarr->portlo; port <= portarr->porthi; port++)
if (port == myport)
return portarr->gameid;
portarr++;
}
return 0;
this->used, this->size);
}
bool NetPkt::compare(int offset, const char* buf, int len)
{
if (offset >= this->size)
if (offset >= this->used)
return false;
/* nicht ueber das paket hinaus vergleichen */
if (offset + len >= this->size)
len = this->size - offset;
if (offset + len >= this->used)
len = this->used - offset;
return (memcmp(this->data + offset, buf, len) == 0);
}
int NetPkt::find(int offset, const char *buf, int len)
{
if (offset >= this->size)
if (offset >= this->used)
return -1;
void* found = memmem(this->data + offset, this->size, buf, len);
void* found = memmem(this->data + offset, this->used, buf, len);
return (found == NULL) ? -1 : ((char*)found - this->data);
}
void NetPkt::setAddress(struct sockaddr_in *tmp)
{
memcpy(&addr, tmp, sizeof(addr));
}
struct sockaddr_in * NetPkt::getAddress()
{
return &addr;
}

View File

@ -8,28 +8,33 @@
#define PARSE_ACCEPT_FREED 2
#define PARSE_REJECT 4
/* avoid cyclic deps */
class Socket;
class NetPkt {
friend class Socket;
public:
NetPkt(const char* data, int size);
NetPkt(int size);
~NetPkt();
static NetPkt* createFromSocket(int fd);
int show(char* buf, int size);
int checkPortArray(struct game_ports* arr);
bool compare(int offset, const char* buf, int len);
int find(int offset, const char *buf, int len);
void setAddress(struct sockaddr_in *addr);
struct sockaddr_in * getAddress();
protected:
NetPkt(const NetPkt& x);
NetPkt& operator=(const NetPkt& x);
private:
NetPkt(int size);
int readFromSocket(int fd);
struct sockaddr_in addr;
const char *data;
int used;
private:
int size;
char *data;
};
#endif // _NETPKT_H_

View File

@ -1,9 +1,5 @@
#include "recvqueue.h"
RecvQueue::RecvQueue()
{
}
RecvQueue::~RecvQueue()
{
while (!pktList.isEmpty())

View File

@ -7,7 +7,7 @@
class RecvQueue {
public:
RecvQueue();
RecvQueue() {};
~RecvQueue();
void addPkt(NetPkt* pkt);