Cli port input

modAionImpl/src/org/aion/zero/impl/cli/Arguments.java

@@ -126,6 +126,11 @@ public class Arguments {
             description = "execute kernel with selected database directory")
     private String directory = null;
 
+    @Option(
+            names = {"-p", "--port"},
+            description = "execute kernel with selected port")
+    private String port = null;
+
     // offline database query and update
     @Option(
             names = {"ps", "--state"},
@@ -240,6 +245,10 @@ public String getDirectory() {
         return directory;
     }
 
+    public String getPort() {
+        return port;
+    }
+
     public String getPruneStateOption() {
         return pruntStateOption;
     }

modAionImpl/src/org/aion/zero/impl/cli/Cli.java

@@ -191,7 +191,37 @@ public ReturnType call(final String[] args, Cfg cfg) {
             // true means the UUID must be set
             boolean overwrite = cfg.fromXML(configFile);
 
-            // 4. can be influenced by the -d argument above
+            // determine the port configuration, can be combined with the -n, -d, -c, -i arguments
+            if (options.getPort() != null) {
+
+                int currentPort = cfg.getNet().getP2p().getPort();
+                int portNumber = currentPort;
+                boolean validPort = true;
+
+                try {
+                    portNumber = Integer.parseInt(options.getPort());
+                } catch (NumberFormatException e) {
+                    validPort = false;
+                    System.out.println("Port must be an integer value");
+                }
+
+                if (portNumber < 0 || portNumber > 0xFFFF) {
+                    validPort = false;
+                    System.out.println("Port out of range: " + portNumber);
+                }
+
+                if (validPort && portNumber != currentPort) {
+                    // update port in config
+                    cfg.getNet().getP2p().setPort(portNumber);
+                    overwrite = true;
+                    System.out.println("Port set to: " + portNumber);
+                } else {
+                    System.out.println("Using the current port configuration: " + currentPort);
+                }
+                // no return, allow for other parameters combined with -p
+            }
+
+            // 4. can be influenced by the -n, -d, -p arguments above
 
             if (options.getConfig() != null) {
                 // network was already set above
@@ -229,15 +259,15 @@ public ReturnType call(final String[] args, Cfg cfg) {
                 return ReturnType.EXIT;
             }
 
-            // 5. options that can be influenced by the -d and -n arguments
+            // 5. options that can be influenced by the -d, -n and -p arguments
 
             if (options.isInfo()) {
                 System.out.println(
                         "Reading config file from: "
                                 + getRelativePath(configFile.getAbsolutePath()));
                 if (overwrite) {
-                    // updating the file in case the user id was not set
-                    cfg.toXML(new String[] {"--id=" + cfg.getId()}, configFile);
+                    // updating the file in case the user id was not set; overwrite port
+                    cfg.toXML(null, configFile);
                 }
                 printInfo(cfg);
                 return ReturnType.EXIT;
@@ -247,8 +277,8 @@ public ReturnType call(final String[] args, Cfg cfg) {
             makeDirs(configFile, forkFile, cfg);
 
             if (overwrite) {
-                // only updating the file in case the user id was not set
-                cfg.toXML(new String[] {"--id=" + cfg.getId()}, cfg.getExecConfigFile());
+                // updating the file in case the user id was not set; overwrite port
+                cfg.toXML(null, cfg.getExecConfigFile());
             }
 
             // set correct keystore directory
@@ -861,6 +891,9 @@ Set<String> getSkippedTasks(Arguments options, TaskPriority breakingTaskPriority
             if (options.getDirectory() != null) {
                 skippedTasks.add("--datadir");
             }
+            if (options.getPort() != null) {
+                skippedTasks.add("--port");
+            }
             if (options.getConfig() != null) {
                 skippedTasks.add("--config");
             }

modAionImpl/src/org/aion/zero/impl/config/CfgAion.java

@@ -345,7 +345,9 @@ public void toXML(final String[] args, File file) {
                     if (subArgsArr.length > 0) {
                         List<String> _nodes = new ArrayList<>();
                         for (String subArg : subArgsArr) {
-                            if (!subArg.equals("")) _nodes.add(subArg);
+                            if (!subArg.equals("")) {
+                                _nodes.add(subArg);
+                            }
                         }
                         this.getNet().setNodes(_nodes.toArray(new String[0]));
                     }
@@ -354,7 +356,9 @@ public void toXML(final String[] args, File file) {
                     override = true;
                     String[] subArgsArr = arg.replace("--p2p=", "").split(",");
                     if (subArgsArr.length == 2) {
-                        this.getNet().getP2p().setIp(subArgsArr[0]);
+                        if (!subArgsArr[0].equals("")) {
+                            this.getNet().getP2p().setIp(subArgsArr[0]);
+                        }
                         this.getNet().getP2p().setPort(Integer.parseInt(subArgsArr[1]));
                     }
                 }