Parse TCP port correctly.

diff --git a/projects/stargazer/plugins/other/radius/config.cpp b/projects/stargazer/plugins/other/radius/config.cpp
index 6a29f002d7fd215baa43902b78e04b9008f0d53f..6742f8111e1be21a732818908a2093a5a5fe63ef 100644 (file)
--- a/projects/stargazer/plugins/other/radius/config.cpp
+++ b/projects/stargazer/plugins/other/radius/config.cpp
@@ -167,6 +167,14 @@ T toInt(const std::vector<std::string>& values)
     return 0;
 }
 
     return 0;
 }
 

+uint16_t toPort(const std::string& value)
+{
+    uint16_t res = 0;
+    if (str2x(value, res) == 0)
+        return res;
+    throw ParserError(0, "'" + value + "' is not a valid port number.");
+}
+

 typedef std::map<std::string, Config::ReturnCode> Codes;
 
 // One-time call to initialize the list of codes.
 typedef std::map<std::string, Config::ReturnCode> Codes;
 
 // One-time call to initialize the list of codes.


@@ -229,11 +237,31 @@ std::string parseString(const std::string& paramName, const std::vector<PARAM_VA
     return "";
 }
 
     return "";
 }
 

-std::string parseAddress(const std::string& address)
+std::string parseAddress(Config::Type connectionType, const std::string& value)

 {
 {

-    size_t pos = address.find_first_of(':');
+    size_t pos = value.find_first_of(':');
+    if (pos == std::string::npos)
+        throw ParserError(0, "Connection type is not specified. Should be either 'unix' or 'tcp'.");
+    if (connectionType == Config::UNIX)
+        return value.substr(pos + 1);
+    std::string address(value.substr(pos + 1));
+    pos = address.find_first_of(':', pos + 1);
+    if (pos == std::string::npos)
+        throw ParserError(0, "Port is not specified.");
+    return address.substr(0, pos - 1);
+}
+
+std::string parsePort(Config::Type connectionType, const std::string& value)
+{
+    size_t pos = value.find_first_of(':');

     if (pos == std::string::npos)
         throw ParserError(0, "Connection type is not specified. Should be either 'unix' or 'tcp'.");
     if (pos == std::string::npos)
         throw ParserError(0, "Connection type is not specified. Should be either 'unix' or 'tcp'.");

+    if (connectionType == Config::UNIX)
+        return value.substr(pos + 1);
+    std::string address(value.substr(pos + 1));
+    pos = address.find_first_of(':', pos + 1);
+    if (pos == std::string::npos)
+        throw ParserError(0, "Port is not specified.");

     return address.substr(pos + 1);
 }
 
     return address.substr(pos + 1);
 }
 


@@ -295,8 +323,10 @@ Config::Config(const MODULE_SETTINGS& settings)
       acct(parseSection("acct", settings.moduleParams)),
       verbose(parseBool("verbose", settings.moduleParams)),
       address(parseString("bind_address", settings.moduleParams)),
       acct(parseSection("acct", settings.moduleParams)),
       verbose(parseBool("verbose", settings.moduleParams)),
       address(parseString("bind_address", settings.moduleParams)),

-      bindAddress(parseAddress(address)),

       connectionType(parseConnectionType(address)),
       connectionType(parseConnectionType(address)),

+      bindAddress(parseAddress(connectionType, address)),
+      portStr(parsePort(connectionType, address)),
+      port(toPort(portStr)),

       key(parseString("key", settings.moduleParams)),
       sockUID(parseUID("sock_owner", settings.moduleParams)),
       sockGID(parseGID("sock_group", settings.moduleParams)),
       key(parseString("key", settings.moduleParams)),
       sockUID(parseUID("sock_owner", settings.moduleParams)),
       sockGID(parseGID("sock_group", settings.moduleParams)),

diff --git a/projects/stargazer/plugins/other/radius/config.h b/projects/stargazer/plugins/other/radius/config.h
index 809d91c9783b444650e18734960309d676c3e488..2d4f638f652dc4263bbf5b86e627fe2055f7ade4 100644 (file)
--- a/projects/stargazer/plugins/other/radius/config.h
+++ b/projects/stargazer/plugins/other/radius/config.h
@@ -75,8 +75,8 @@ struct Config
     bool verbose;
 
     std::string address;
     bool verbose;
 
     std::string address;

-    std::string bindAddress;

     Type connectionType;
     Type connectionType;

+    std::string bindAddress;

     std::string portStr;
     uint16_t port;
     std::string key;
     std::string portStr;
     uint16_t port;
     std::string key;