Move variables declaration to the beginning of the function (old C)

[stg.git] / projects / sgauthstress / user.cpp

diff --git a/projects/sgauthstress/user.cpp b/projects/sgauthstress/user.cpp
index b36da5e1f1b3928603767088d6bc359d88ee25de..efe63af664bd181d407d8f6454a56e76dde9e917 100644 (file)
--- a/projects/sgauthstress/user.cpp
+++ b/projects/sgauthstress/user.cpp
@@ -15,11 +15,12 @@ USER::USER(const std::string & l,
     : login(l),
       password(pwd),
       ip(i),
     : login(l),
       password(pwd),
       ip(i),

-      aliveTimeout(0),
-      userTimeout(0),
+      aliveTimeout(5),
+      userTimeout(60),

       phase(1),
       phaseChangeTime(0),
       phase(1),
       phaseChangeTime(0),

-      rnd(0)
+      rnd(0),
+      sock(-1)

 {
 unsigned char key[IA_PASSWD_LEN];
 memset(key, 0, IA_PASSWD_LEN);
 {
 unsigned char key[IA_PASSWD_LEN];
 memset(key, 0, IA_PASSWD_LEN);


@@ -35,7 +36,8 @@ USER::USER(const USER & rvalue)
       userTimeout(rvalue.userTimeout),
       phase(1),
       phaseChangeTime(0),
       userTimeout(rvalue.userTimeout),
       phase(1),
       phaseChangeTime(0),

-      rnd(0)
+      rnd(0),
+      sock(-1)

 {
 unsigned char key[IA_PASSWD_LEN];
 memset(key, 0, IA_PASSWD_LEN);
 {
 unsigned char key[IA_PASSWD_LEN];
 memset(key, 0, IA_PASSWD_LEN);


@@ -45,10 +47,11 @@ Blowfish_Init(&ctx, key, IA_PASSWD_LEN);
 
 USER::~USER()
 {
 
 USER::~USER()
 {

-close(sock);
+if (sock > 0)
+    close(sock);

 }
 
 }
 

-const USER & USER::operator=(const USER & rvalue)
+USER & USER::operator=(const USER & rvalue)

 {
 login = rvalue.login;
 password = rvalue.password;
 {
 login = rvalue.login;
 password = rvalue.password;


@@ -58,6 +61,7 @@ userTimeout = rvalue.userTimeout;
 phase = 1;
 phaseChangeTime = 0;
 rnd = 0;
 phase = 1;
 phaseChangeTime = 0;
 rnd = 0;

+sock = -1;

 
 unsigned char key[IA_PASSWD_LEN];
 memset(key, 0, IA_PASSWD_LEN);
 
 unsigned char key[IA_PASSWD_LEN];
 memset(key, 0, IA_PASSWD_LEN);


@@ -71,6 +75,11 @@ bool USER::InitNetwork()
 {
 sock = socket(AF_INET, SOCK_DGRAM, 0);
 
 {
 sock = socket(AF_INET, SOCK_DGRAM, 0);
 

+if (sock < 0)
+    {
+    throw std::runtime_error(std::string("USER::USER() - socket creation error: '") + strerror(errno) + "', ip: " + inet_ntostring(ip) + ", login: " + login);
+    }
+

 struct sockaddr_in addr;
 
 addr.sin_family = AF_INET;
 struct sockaddr_in addr;
 
 addr.sin_family = AF_INET;


@@ -82,4 +91,6 @@ if (res == -1)
     {
     throw std::runtime_error(std::string("USER::USER() - bind error: '") + strerror(errno) + "', ip: " + inet_ntostring(ip) + ", login: " + login);
     }
     {
     throw std::runtime_error(std::string("USER::USER() - bind error: '") + strerror(errno) + "', ip: " + inet_ntostring(ip) + ", login: " + login);
     }

+
+return true;

 }
 }