X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..8356c34ac9097616997e5d9905f54aa3ba79dd22:/projects/stargazer/plugins/other/rscript/ur_functor.h?ds=inline diff --git a/projects/stargazer/plugins/other/rscript/ur_functor.h b/projects/stargazer/plugins/other/rscript/ur_functor.h index d9706a75..95382400 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__ @@ -31,20 +25,23 @@ #include #include +#include "stg/os_int.h" +#include "stg/common.h" + #include "rscript.h" -#include "os_int.h" -#include "common.h" +namespace RS +{ -class UpdateRouter : public std::unary_function, void> +class UpdateRouter : public std::unary_function, void> { public: UpdateRouter(REMOTE_SCRIPT & t) - : obj(t) {}; + : obj(t) {} - void operator() (std::pair & val) + void operator() (std::pair & val) { - std::vector newRouters = obj.IP2Routers(val.first); + std::vector newRouters = obj.IP2Routers(val.second.ip); std::vector::const_iterator oldIt(val.second.routers.begin()); std::vector::const_iterator newIt(newRouters.begin()); val.second.shortPacketsCount = 0; @@ -55,26 +52,23 @@ public: { if (newIt != newRouters.end()) { - obj.SendDirect(val.first, val.second, *newIt); // Connect on new router + obj.SendDirect(val.second, *newIt); // Connect on new router ++newIt; } } 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.second, *oldIt, true); // Disconnect on old router + ++oldIt; } else if (*oldIt < *newIt) { - obj.SendDirect(val.first, val.second, *oldIt, true); // Disconnect on old router + obj.SendDirect(val.second, *oldIt, true); // Disconnect on old router ++oldIt; } else if (*oldIt > *newIt) { - obj.SendDirect(val.first, val.second, *newIt); // Connect on new router + obj.SendDirect(val.second, *newIt); // Connect on new router ++newIt; } else @@ -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