Small name fixes.

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index 9bbe62d7de2ce1b4d7a49956a215baed9b952f9e..0f5c9cc9ba23566c012c3e2a6ce853d021617cb9 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -369,17 +369,17 @@ if (!data->requst.prepaidTraff.res_empty())
 
 for (int i = 0; i < DIR_NUM; i++)
     {
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (!data->requst.up[i].res_empty())
+    if (!data->requst.sessionUpload[i].res_empty())

         cout << "session upload for dir" << i << "=" << info.stat.su[i] << endl;
         cout << "session upload for dir" << i << "=" << info.stat.su[i] << endl;

-    if (!data->requst.down[i].res_empty())
+    if (!data->requst.sessionDownload[i].res_empty())

         cout << "session download for dir" << i << "=" << info.stat.sd[i] << endl;
     }
 
 for (int i = 0; i < DIR_NUM; i++)
     {
         cout << "session download for dir" << i << "=" << info.stat.sd[i] << endl;
     }
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (!data->requst.monthUp[i].res_empty())
+    if (!data->requst.monthUpload[i].res_empty())

         cout << "month upload for dir" << i << "=" << info.stat.mu[i] << endl;
         cout << "month upload for dir" << i << "=" << info.stat.mu[i] << endl;

-    if (!data->requst.monthDown[i].res_empty())
+    if (!data->requst.monthDownload[i].res_empty())

         cout << "month download for dir" << i << "=" << info.stat.md[i] << endl;
     }
 
         cout << "month download for dir" << i << "=" << info.stat.md[i] << endl;
     }
 

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index fae181f6e38b6c48d8770a13068df361810319bf..76a47824b379472e4d1f526af01c1e2b6e4c4f24 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -66,10 +66,10 @@ struct option long_options_get[] = {
 {"passive",     0, 0, 'i'},  //passive
 {"disable-stat",0, 0, 'S'},  //disable detail stat
 {"always-online",0, 0, 'O'}, //always online
 {"passive",     0, 0, 'i'},  //passive
 {"disable-stat",0, 0, 'S'},  //disable detail stat
 {"always-online",0, 0, 'O'}, //always online

-{"session-upload-dir",   1, 0, 500},  //SU0
-{"session-download-dir", 1, 0, 501},  //SD0
-{"month-upload-dir",     1, 0, 502},  //MU0
-{"month-download-dir",   1, 0, 503},  //MD0
+{"session-upload",   1, 0, 500},  //SU0
+{"session-download", 1, 0, 501},  //SD0
+{"month-upload",     1, 0, 502},  //MU0
+{"month-download",   1, 0, 503},  //MD0

 
 {"user-data",   1, 0, 700},  //UserData0
 
 
 {"user-data",   1, 0, 700},  //UserData0
 


@@ -757,19 +757,19 @@ while (1)
 
         case 500: //U
             //printf("U%d\n", c - 500);
 
         case 500: //U
             //printf("U%d\n", c - 500);

-            req.sessionUp[optarg] = 1;
+            req.sessionUpload[optarg] = 1;

             break;
         case 501:
             //printf("U%d\n", c - 500);
             break;
         case 501:
             //printf("U%d\n", c - 500);

-            req.sessionDown[optarg] = 1;
+            req.sessionDownload[optarg] = 1;

             break;
         case 502:
             //printf("U%d\n", c - 500);
             break;
         case 502:
             //printf("U%d\n", c - 500);

-            req.monthUp[optarg] = 1;
+            req.monthUpload[optarg] = 1;

             break;
         case 503:
             //printf("U%d\n", c - 500);
             break;
         case 503:
             //printf("U%d\n", c - 500);

-            req.monthDown[optarg] = 1;
+            req.monthDownload[optarg] = 1;

             break;
 
         case 700: //UserData
             break;
 
         case 700: //UserData

diff --git a/projects/sgconf/request.h b/projects/sgconf/request.h
index 5ce4d093caa05c566d85d8f9819b4270dc44129a..70c45059485d7571802281ca4718dc0d6625d6da 100644 (file)
--- a/projects/sgconf/request.h
+++ b/projects/sgconf/request.h
@@ -90,11 +90,11 @@ RESETABLE<bool>     disableDetailStat;
 RESETABLE<bool>     alwaysOnline;
 RESETABLE<double>   prepaidTraff;
 
 RESETABLE<bool>     alwaysOnline;
 RESETABLE<double>   prepaidTraff;
 

-RESETABLE<int64_t>  sessionUp[DIR_NUM];
-RESETABLE<int64_t>  sessionDown[DIR_NUM];
+RESETABLE<int64_t>  sessionUpload[DIR_NUM];
+RESETABLE<int64_t>  sessionDownload[DIR_NUM];

 
 

-RESETABLE<int64_t>  monthUp[DIR_NUM];
-RESETABLE<int64_t>  monthDown[DIR_NUM];
+RESETABLE<int64_t>  monthUpload[DIR_NUM];
+RESETABLE<int64_t>  monthDownload[DIR_NUM];

 
 RESETABLE<string>   userData[USERDATA_NUM];
 
 
 RESETABLE<string>   userData[USERDATA_NUM];