Server - Add -a/--address option

Change-Id: Ia9e8d76b9a4ba0aadc567142601a87f0ad0b69e4
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>

common/rdc_utils.cc

@@ -20,9 +20,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
+#include <netinet/in.h>
 #include <sys/stat.h>
 #include <assert.h>
+#include <arpa/inet.h>
 
+#include <iostream>
 #include <string>
 #include <fstream>
 #include <sstream>
@@ -77,5 +80,12 @@ bool IsNumber(const std::string &s) {
   return !s.empty() && std::all_of(s.begin(), s.end(), ::isdigit);
 }
 
+bool IsIP(const std::string &s) {
+  struct sockaddr_in sa;
+  int result = inet_pton(AF_INET, s.c_str(), &sa);
+  // inet_pton returns 1 on success
+  return result == 1;
+}
+
 }  // namespace rdc
 }  // namespace amd

common/rdc_utils.h

@@ -49,6 +49,7 @@ int
 ReadFile(const char *path, std::string *retStr, bool chop_newline = false);
 
 bool IsNumber(const std::string &s);
+bool IsIP(const std::string &s);
 
 }  // namespace rdc
 }  // namespace amd

server/include/rdc/rdc_server_main.h

@@ -32,6 +32,7 @@ THE SOFTWARE.
 #include "rdc/rdc_api_service.h"
 
 typedef struct {
+  std::string listen_address;
   std::string listen_port;
   bool no_authentication;
   bool use_pinned_certs;

server/src/rdc_server_main.cc

@@ -77,10 +77,11 @@ static const char * kDefaultRDCServerCertPemPkiPath =
 static const char * kDefaultRDCClientCACertPemPkiPath =
                                        "/etc/rdc/client/certs/rdc_cacert.pem";
 
+static const char *kDefaultListenAddress = "0.0.0.0";
 static const char *kDefaultListenPort = "50051";
 static const uint32_t kRSMIUMask = 027;
 
-RDCServer::RDCServer() : server_address_("0.0.0.0:"),
+RDCServer::RDCServer() :
     secure_creds_(false), rsmi_service_(nullptr), rdc_admin_service_(nullptr) {
 }
 
@@ -93,6 +94,8 @@ RDCServer::~RDCServer() {
 void
 RDCServer::Initialize(RdcdCmdLineOpts *cl) {
   cmd_line_ = cl;
+  server_address_ = cmd_line_->listen_address;
+  server_address_ += ":";
   server_address_ += cmd_line_->listen_port;
   secure_creds_ = !cmd_line_->no_authentication;
   use_pinned_certs_ = cmd_line_->use_pinned_certs;
@@ -506,6 +509,7 @@ MakeDaemon(bool is_root) {
 //  * optional_argument
 //  * no_argument
 static const struct option long_options[] = {
+  {"address", required_argument, nullptr, 'a'},
   {"port", required_argument, nullptr, 'p'},
   // Any options with optionals args would go here; e.g.,
   // {"start_rdcd", optional_argument, nullptr, 'd'},
@@ -516,11 +520,13 @@ static const struct option long_options[] = {
 
   {nullptr, 0, nullptr, 0}
 };
-static const char* short_options = "p:uidh";
+static const char* short_options = "a:p:uidh";
 
 static void PrintHelp(void) {
   std::cout <<
      "Optional rdctst Arguments:\n"
+     "--address, -a <IPv4 address> specify address on which to listen; "
+         "default is 0.0.0.0\n"
      "--port, -p <port> specify port on which to listen; "
          "default is to listen on port 50051\n"
      "--unauth_comm, -u don't do authentication with communications"
@@ -547,6 +553,15 @@ uint32_t ProcessCmdline(RdcdCmdLineOpts* cmdl_opts,
     }
 
     switch (a) {
+      case 'a':
+        if (!amd::rdc::IsIP(optarg)) {
+          std::cerr << "\"" << optarg <<
+                                "\" is not a valid IP address." << std::endl;
+          return -1;
+        }
+        cmdl_opts->listen_address = optarg;
+        break;
+
       case 'p':
         if (!amd::rdc::IsNumber(optarg)) {
           std::cerr << "\"" << optarg <<
@@ -591,6 +606,7 @@ uint32_t ProcessCmdline(RdcdCmdLineOpts* cmdl_opts,
 
 static void init_cmd_line_opts(RdcdCmdLineOpts *opts) {
   assert(opts != nullptr);
+  opts->listen_address = kDefaultListenAddress;
   opts->listen_port = kDefaultListenPort;
   opts->no_authentication = false;
   opts->use_pinned_certs = false;
@@ -606,7 +622,12 @@ int main(int argc, char** argv) {
   bool is_root = (caller_id == 0);
 
   init_cmd_line_opts(&cmd_line_opts);
-  ProcessCmdline(&cmd_line_opts, argc, argv);
+  auto result = ProcessCmdline(&cmd_line_opts, argc, argv);
+
+  if (result != 0) {
+    std::cerr << "Error occured during ProcessCmdline." << std::endl;
+    return 1;
+  }
 
   // Can read the certificates and private key when authentication.
   if (!cmd_line_opts.no_authentication) {