From 97a198bf64f74f1bacd064026e67d7cb40daffa2 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Sat, 1 Dec 2012 21:07:57 +0200 Subject: [PATCH] Use namespace instead of prefix. --- include/stg/rs_packets.h | 30 +++++++++++++++++-- projects/rscriptd/listener.cpp | 8 ++--- projects/rscriptd/listener.h | 2 +- .../plugins/other/rscript/ur_functor.h | 29 ++++++------------ 4 files changed, 42 insertions(+), 27 deletions(-) diff --git a/include/stg/rs_packets.h b/include/stg/rs_packets.h index 1a038be7..503fe91d 100644 --- a/include/stg/rs_packets.h +++ b/include/stg/rs_packets.h @@ -1,3 +1,24 @@ +/* + * 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 + */ + +/* + * Author : Boris Mikhailenko + * Author : Maxim Mamontov + */ + #ifndef RS_PACKETSH #define RS_PACKETSH @@ -15,7 +36,10 @@ #include "os_int.h" -struct RS_PACKET_HEADER +namespace RS +{ + +struct PACKET_HEADER { int8_t magic[RS_MAGIC_LEN]; int8_t protoVer[RS_PROTO_VER_LEN]; @@ -26,11 +50,13 @@ int8_t login[RS_LOGIN_LEN]; int8_t padding[7]; } __attribute__((__packed__)); // 48 bytes, 6 blocks -struct RS_PACKET_TAIL +struct PACKET_TAIL { int8_t magic[RS_MAGIC_LEN]; int8_t params[RS_PARAMS_LEN]; int8_t padding[7]; } __attribute__((__packed__)); // 992 bytes, 124 blocks +} // namespace RS + #endif diff --git a/projects/rscriptd/listener.cpp b/projects/rscriptd/listener.cpp index 73042674..2761d7f7 100644 --- a/projects/rscriptd/listener.cpp +++ b/projects/rscriptd/listener.cpp @@ -255,7 +255,7 @@ bool LISTENER::RecvPacket() struct iovec iov[2]; char buffer[RS_MAX_PACKET_LEN]; -RS_PACKET_HEADER packetHead; +RS::PACKET_HEADER packetHead; iov[0].iov_base = reinterpret_cast(&packetHead); iov[0].iov_len = sizeof(packetHead); @@ -320,7 +320,7 @@ return false; //----------------------------------------------------------------------------- bool LISTENER::GetParams(char * buffer, UserData & data) { -RS_PACKET_TAIL packetTail; +RS::PACKET_TAIL packetTail; Decrypt(&ctxS, (char *)&packetTail, buffer, sizeof(packetTail) / 8); @@ -330,7 +330,7 @@ if (strncmp((char *)packetTail.magic, RS_ID, RS_MAGIC_LEN)) return true; } -std::stringstream params; +std::ostringstream params; params << "\"" << data.login << "\" " << inet_ntostring(data.ip) << " " << data.id << " " @@ -455,7 +455,7 @@ else return false; } //----------------------------------------------------------------------------- -bool LISTENER::CheckHeader(const RS_PACKET_HEADER & header) const +bool LISTENER::CheckHeader(const RS::PACKET_HEADER & header) const { if (strncmp((char *)header.magic, RS_ID, RS_MAGIC_LEN)) { diff --git a/projects/rscriptd/listener.h b/projects/rscriptd/listener.h index f4d2856e..c6fb143a 100644 --- a/projects/rscriptd/listener.h +++ b/projects/rscriptd/listener.h @@ -96,7 +96,7 @@ private: bool FinalizeNet(); bool RecvPacket(); // Parsing stuff - bool CheckHeader(const RS_PACKET_HEADER & header) const; + bool CheckHeader(const RS::PACKET_HEADER & header) const; bool GetParams(char * buffer, UserData & data); // Processing stuff void ProcessPending(); diff --git a/projects/stargazer/plugins/other/rscript/ur_functor.h b/projects/stargazer/plugins/other/rscript/ur_functor.h index b3a5cdac..c5752e87 100644 --- a/projects/stargazer/plugins/other/rscript/ur_functor.h +++ b/projects/stargazer/plugins/other/rscript/ur_functor.h @@ -18,12 +18,6 @@ * Author : Maxim Mamontov */ -/* - $Revision: 1.3 $ - $Date: 2010/03/04 12:07:03 $ - $Author: faust $ -*/ - #ifndef __UR_FUNCTOR_H__ #define __UR_FUNCTOR_H__ @@ -36,13 +30,16 @@ #include "rscript.h" -class UpdateRouter : public std::unary_function, void> +namespace RS +{ + +class UpdateRouter : public std::unary_function, void> { public: UpdateRouter(REMOTE_SCRIPT & t) : obj(t) {}; - void operator() (std::pair & val) + void operator() (std::pair & val) { std::vector newRouters = obj.IP2Routers(val.first); std::vector::const_iterator oldIt(val.second.routers.begin()); @@ -61,11 +58,8 @@ public: } else if (newIt == newRouters.end()) { - //if (oldIt != newRouters.end()) - //{ // Already checked it - obj.SendDirect(val.first, val.second, *oldIt, true); // Disconnect on old router - ++oldIt; - //} + obj.SendDirect(val.first, val.second, *oldIt, true); // Disconnect on old router + ++oldIt; } else if (*oldIt < *newIt) { @@ -86,16 +80,11 @@ public: } } val.second.routers = newRouters; - /*if (val.second.souters != newRouters) - { - obj.Send(val.first, val.second, true); // Disconnect on old router - val.second.routerIP = obj.IP2Router(val.first); // Change router - val.second.shortPacketsCount = 0; // Reset packets count (to prevent alive send) - obj.Send(val.first, val.second); // Connect on new router - }*/ } private: REMOTE_SCRIPT & obj; }; +} // namespace RS + #endif -- 2.44.2