From 8e72aac9f5a8c4f56609d582ad10e6cae954849d Mon Sep 17 00:00:00 2001 From: ehofman Date: Mon, 24 Oct 2005 08:48:19 +0000 Subject: [PATCH] Remove DOS line endings. --- src/Server/message.cxx | 298 ++++++++++++++++++++--------------------- src/Server/message.hxx | 196 +++++++++++++-------------- 2 files changed, 247 insertions(+), 247 deletions(-) diff --git a/src/Server/message.cxx b/src/Server/message.cxx index 1844b434c..443780039 100644 --- a/src/Server/message.cxx +++ b/src/Server/message.cxx @@ -1,149 +1,149 @@ -// message.hxx -- Multiplayer Client/Server message base class -// -// Written by John Barrett, started November 2003. -// -// Copyright (C) 2003 John R. Barrett - jbarrett@accesshosting.com -// -// 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., 675 Mass Ave, Cambridge, MA 02139, USA. -// - - -#include "message.hxx" - -FGMPSInstanceFuncMap FGMPSMessage::funcmap; - -FGMPSMessage::FGMPSMessage() -{ - msgid = 0x0000; - elements[0].type = fgmps_null; - elements[0].data = NULL; - -} - -string FGMPSMessage::encodemsg() -{ - FGMPSMsgElementEntry* ptr = getelements(); - - buf.clr(); - if (msgid > 255) { - buf.put(fgmps_som16, true); - buf.write2(&msgid); - } else { - buf.put(fgmps_som8, true); - buf.write1(&msgid); - } - while (ptr->type != fgmps_null) { - buf.put(ptr->type, true); - //printf ("adding %02x\n", ptr->type); - switch (ptr->type) { - case fgmps_uchar: - case fgmps_char: - buf.write1(ptr->data); - break; - case fgmps_uint: - case fgmps_int: - buf.write2(ptr->data); - break; - case fgmps_ulong: - case fgmps_long: - buf.write4(ptr->data); - break; - case fgmps_float: - buf.writef(*(float*)ptr->data); - break; - case fgmps_double: - buf.writed(*(double*)ptr->data); - break; - case fgmps_string: - buf.writes(*(string*)ptr->data); - break; - } - ptr++; - } - - buf.put(fgmps_eom, true); - - return buf.str(); -} - -FGMPSMessage* FGMPSMessage::decodemsg(string msg) -{ - FGMPSMessageBuf buf; - unsigned char ch; - unsigned int mid; - FGMPSInstanceFuncMap::iterator fmitr; - - buf.set(msg); - buf.ofs(0); - ch = buf.get(true); - if (ch != fgmps_som8 && ch != fgmps_som16) { - throw FGMPSDataException("Invalid start of message"); - } - if (ch == fgmps_som8) { - ch = buf.get(); - mid = ch; - } else { - mid = *(unsigned int *)buf.read2(); - } - - fmitr = funcmap.find(mid); - if (fmitr == funcmap.end()) { - throw FGMPSDataException("MessageID has no registered Message Class"); - } - FGMPSMessage* msgclass = (fmitr->second)(); - FGMPSMsgElementEntry* elements = msgclass->getelements(); - while ((ch = buf.get()) != fgmps_eom) { - //printf("dump: "); - //for (int i=-1; i<16; i++) printf("%02x ", buf.peek(i)); - //printf("\n"); - - if (ch != elements->type) { - delete msgclass; - throw FGMPSDataException("Decode: Message Structure Error"); - } - switch (ch) { - case fgmps_uchar: - case fgmps_char: - memcpy(elements->data, buf.read1(), 1); - break; - case fgmps_uint: - case fgmps_int: - memcpy(elements->data, buf.read2(), 2); - break; - case fgmps_ulong: - case fgmps_long: - memcpy(elements->data, buf.read4(), 4); - break; - case fgmps_float: - *(float*)elements->data = buf.readf(); - break; - case fgmps_double: - *(double*)elements->data = buf.readd(); - break; - case fgmps_string: - ch = buf.get(); - *(string*)elements->data = buf.reads(ch); - break; - default: - delete msgclass; - throw FGMPSDataException("Decode: Unknown data type"); - break; - } - elements++; - } - return msgclass; -} - - +// message.hxx -- Multiplayer Client/Server message base class +// +// Written by John Barrett, started November 2003. +// +// Copyright (C) 2003 John R. Barrett - jbarrett@accesshosting.com +// +// 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., 675 Mass Ave, Cambridge, MA 02139, USA. +// + + +#include "message.hxx" + +FGMPSInstanceFuncMap FGMPSMessage::funcmap; + +FGMPSMessage::FGMPSMessage() +{ + msgid = 0x0000; + elements[0].type = fgmps_null; + elements[0].data = NULL; + +} + +string FGMPSMessage::encodemsg() +{ + FGMPSMsgElementEntry* ptr = getelements(); + + buf.clr(); + if (msgid > 255) { + buf.put(fgmps_som16, true); + buf.write2(&msgid); + } else { + buf.put(fgmps_som8, true); + buf.write1(&msgid); + } + while (ptr->type != fgmps_null) { + buf.put(ptr->type, true); + //printf ("adding %02x\n", ptr->type); + switch (ptr->type) { + case fgmps_uchar: + case fgmps_char: + buf.write1(ptr->data); + break; + case fgmps_uint: + case fgmps_int: + buf.write2(ptr->data); + break; + case fgmps_ulong: + case fgmps_long: + buf.write4(ptr->data); + break; + case fgmps_float: + buf.writef(*(float*)ptr->data); + break; + case fgmps_double: + buf.writed(*(double*)ptr->data); + break; + case fgmps_string: + buf.writes(*(string*)ptr->data); + break; + } + ptr++; + } + + buf.put(fgmps_eom, true); + + return buf.str(); +} + +FGMPSMessage* FGMPSMessage::decodemsg(string msg) +{ + FGMPSMessageBuf buf; + unsigned char ch; + unsigned int mid; + FGMPSInstanceFuncMap::iterator fmitr; + + buf.set(msg); + buf.ofs(0); + ch = buf.get(true); + if (ch != fgmps_som8 && ch != fgmps_som16) { + throw FGMPSDataException("Invalid start of message"); + } + if (ch == fgmps_som8) { + ch = buf.get(); + mid = ch; + } else { + mid = *(unsigned int *)buf.read2(); + } + + fmitr = funcmap.find(mid); + if (fmitr == funcmap.end()) { + throw FGMPSDataException("MessageID has no registered Message Class"); + } + FGMPSMessage* msgclass = (fmitr->second)(); + FGMPSMsgElementEntry* elements = msgclass->getelements(); + while ((ch = buf.get()) != fgmps_eom) { + //printf("dump: "); + //for (int i=-1; i<16; i++) printf("%02x ", buf.peek(i)); + //printf("\n"); + + if (ch != elements->type) { + delete msgclass; + throw FGMPSDataException("Decode: Message Structure Error"); + } + switch (ch) { + case fgmps_uchar: + case fgmps_char: + memcpy(elements->data, buf.read1(), 1); + break; + case fgmps_uint: + case fgmps_int: + memcpy(elements->data, buf.read2(), 2); + break; + case fgmps_ulong: + case fgmps_long: + memcpy(elements->data, buf.read4(), 4); + break; + case fgmps_float: + *(float*)elements->data = buf.readf(); + break; + case fgmps_double: + *(double*)elements->data = buf.readd(); + break; + case fgmps_string: + ch = buf.get(); + *(string*)elements->data = buf.reads(ch); + break; + default: + delete msgclass; + throw FGMPSDataException("Decode: Unknown data type"); + break; + } + elements++; + } + return msgclass; +} + + diff --git a/src/Server/message.hxx b/src/Server/message.hxx index 30daf9f81..d046558d2 100644 --- a/src/Server/message.hxx +++ b/src/Server/message.hxx @@ -1,98 +1,98 @@ -// message.hxx -- Multiplayer Client/Server message base class -// -// Written by John Barrett, started November 2003. -// -// Copyright (C) 2003 John R. Barrett - jbarrett@accesshosting.com -// -// 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., 675 Mass Ave, Cambridge, MA 02139, USA. -// - - -#ifndef _FG_MPS_MESSAGE_HXX -#define _FG_MPS_MESSAGE_HXX - -#include - -#include STL_STRING -#include -#include - -SG_USING_STD(string); -SG_USING_STD(invalid_argument); -SG_USING_STD(map); - -#include "messagebuf.hxx" - -typedef enum -{ - fgmps_null = 0x00, - fgmps_uchar = 0xf0, - fgmps_uint = 0xf1, - fgmps_ulong = 0xf2, - fgmps_ulonglong = 0xf3, - fgmps_char = 0xf4, - fgmps_int = 0xf5, - fgmps_long = 0xf6, - fgmps_longlong = 0xf7, - fgmps_float = 0xf8, - fgmps_double = 0xf9, - fgmps_string = 0xfa, - fgmps_reserved = 0xfb, - fgmps_eom = 0xfc, - fgmps_som8 = 0xfd, - fgmps_som16 = 0xfe, - fgmps_esc = 0xfe -} FGMPSMsgElementType; - -typedef struct -{ - FGMPSMsgElementType type; - void * data; -} FGMPSMsgElementEntry; - -#define FGMPSMsgElementArrayEnd {fgmps_null, 0} - -class FGMPSMessage; - -typedef FGMPSMessage* FGMPSMessagePtr; -typedef FGMPSMessagePtr (*FGMPSMsgInstanceFunc)(void); - -typedef map FGMPSInstanceFuncMap; - -class FGMPSMessage -{ -private: - static FGMPSInstanceFuncMap funcmap; - FGMPSMsgElementEntry elements[1]; -protected: - FGMPSMessageBuf buf; - unsigned int msgid; -public: - static int registermsg(int msgid, FGMPSMsgInstanceFunc func) - { - funcmap[msgid] = func; - } - - FGMPSMessage(); - ~FGMPSMessage() {} - - string encodemsg(); - static FGMPSMessage* decodemsg(string msg); - unsigned int getmessageid() { return msgid; } - - virtual FGMPSMsgElementEntry* getelements() { return elements; } -}; - -#endif +// message.hxx -- Multiplayer Client/Server message base class +// +// Written by John Barrett, started November 2003. +// +// Copyright (C) 2003 John R. Barrett - jbarrett@accesshosting.com +// +// 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., 675 Mass Ave, Cambridge, MA 02139, USA. +// + + +#ifndef _FG_MPS_MESSAGE_HXX +#define _FG_MPS_MESSAGE_HXX + +#include + +#include STL_STRING +#include +#include + +SG_USING_STD(string); +SG_USING_STD(invalid_argument); +SG_USING_STD(map); + +#include "messagebuf.hxx" + +typedef enum +{ + fgmps_null = 0x00, + fgmps_uchar = 0xf0, + fgmps_uint = 0xf1, + fgmps_ulong = 0xf2, + fgmps_ulonglong = 0xf3, + fgmps_char = 0xf4, + fgmps_int = 0xf5, + fgmps_long = 0xf6, + fgmps_longlong = 0xf7, + fgmps_float = 0xf8, + fgmps_double = 0xf9, + fgmps_string = 0xfa, + fgmps_reserved = 0xfb, + fgmps_eom = 0xfc, + fgmps_som8 = 0xfd, + fgmps_som16 = 0xfe, + fgmps_esc = 0xfe +} FGMPSMsgElementType; + +typedef struct +{ + FGMPSMsgElementType type; + void * data; +} FGMPSMsgElementEntry; + +#define FGMPSMsgElementArrayEnd {fgmps_null, 0} + +class FGMPSMessage; + +typedef FGMPSMessage* FGMPSMessagePtr; +typedef FGMPSMessagePtr (*FGMPSMsgInstanceFunc)(void); + +typedef map FGMPSInstanceFuncMap; + +class FGMPSMessage +{ +private: + static FGMPSInstanceFuncMap funcmap; + FGMPSMsgElementEntry elements[1]; +protected: + FGMPSMessageBuf buf; + unsigned int msgid; +public: + static int registermsg(int msgid, FGMPSMsgInstanceFunc func) + { + funcmap[msgid] = func; + } + + FGMPSMessage(); + ~FGMPSMessage() {} + + string encodemsg(); + static FGMPSMessage* decodemsg(string msg); + unsigned int getmessageid() { return msgid; } + + virtual FGMPSMsgElementEntry* getelements() { return elements; } +}; + +#endif