]> git.stg.codes - stg.git/commitdiff
Another code cleanup
authorMaxim Mamontov <faust.madf@gmail.com>
Tue, 13 Sep 2011 14:25:24 +0000 (17:25 +0300)
committerMaxim Mamontov <faust.madf@gmail.com>
Tue, 13 Sep 2011 14:25:24 +0000 (17:25 +0300)
projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp

index 94104ac124122445bc33d194755695248d6c36c2..9fc12ecce23c54bb30ce4d65d3fb7a0313cf69ca 100644 (file)
@@ -779,21 +779,10 @@ if (it == ip2user.end())
     std::pair<std::map<uint32_t, IA_USER>::iterator, bool> res;
     res = ip2user.insert(std::make_pair(sip, IA_USER(login, user, sport, protoVer)));
     it = res.first;
-    /*ip2user[sip].login = login;
-    ip2user[sip].user = user;
-    ip2user[sip].protoVer = protoVer;
-    ip2user[sip].port = sport;*/
     #ifdef IA_PHASE_DEBUG
     it->second.phase.SetLogFileName(stgSettings->GetLogFileName());
     it->second.phase.SetUserLogin(login);
     #endif
-
-    /*it = ip2user.find(sip); //TODO
-    if (it == ip2user.end())
-        {
-        printfd(__FILE__, "+++ ERROR +++\n");
-        return -1;
-        }*/
     }
 else if (user->GetID() != it->second.user->GetID())
     {
@@ -811,9 +800,6 @@ else if (user->GetID() != it->second.user->GetID())
 
 IA_USER * iaUser = &(it->second);
 
-/*if (iaUser->port != sport)
-    iaUser->port = sport;*/
-
 if (iaUser->password != user->GetProperty().password.Get())
     {
     InitEncrypt(&iaUser->ctx, user->GetProperty().password.Get());
@@ -1170,7 +1156,7 @@ SwapBytes(connAck->len);
 SwapBytes(connAck->rnd);
 #endif
 printfd( __FILE__, "CONN_ACK_6 %s\n", connAck->type);
-// ÕÓÔÁÎÏ×ÉÔØ ÎÏ×ÕÀ ÆÁÚÕ É ×ÒÅÍÑ É ÒÁÚÒÅÛÉÔØ ÉÎÅÔ
+
 if ((iaUser->phase.GetPhase() == 2) && (connAck->rnd == iaUser->rnd + 1))
     {
     iaUser->phase.UpdateTime();