From a327abc4c2f58f7784d900d693ad8cfeca277cb3 Mon Sep 17 00:00:00 2001
From: Omer <zipory.omer@gmail.com>
Date: Sat, 21 Sep 2019 18:31:29 +0300
Subject: [PATCH 1/4] Added network settings handler for linux

---
 Main/chameleon-vision.iml                     |  1 +
 Main/pom.xml                                  |  5 ++
 .../main/java/com/chameleonvision/Main.java   |  2 +-
 .../settings/NetworkSettings.java             | 65 +++++++++++++++++++
 .../settings/SettingsManager.java             |  9 ++-
 5 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java

diff --git a/Main/chameleon-vision.iml b/Main/chameleon-vision.iml
index d50a9a25c..d298ab873 100644
--- a/Main/chameleon-vision.iml
+++ b/Main/chameleon-vision.iml
@@ -39,6 +39,7 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
     <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-java:2019.4.1" level="project" />
     <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:linuxathena:2019.4.1" level="project" />
     <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:linuxraspbian:2019.4.1" level="project" />
diff --git a/Main/pom.xml b/Main/pom.xml
index f268f5079..28ce24dd4 100644
--- a/Main/pom.xml
+++ b/Main/pom.xml
@@ -70,6 +70,11 @@
             <artifactId>spring-beans</artifactId>
             <version>5.1.9.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+        </dependency>
 
         <!-- supported platforms for wpilib JNI classifiers
             linuxathena
diff --git a/Main/src/main/java/com/chameleonvision/Main.java b/Main/src/main/java/com/chameleonvision/Main.java
index 8eca7dbf0..638d73d0e 100644
--- a/Main/src/main/java/com/chameleonvision/Main.java
+++ b/Main/src/main/java/com/chameleonvision/Main.java
@@ -8,7 +8,7 @@ import com.chameleonvision.web.Server;
 public class Main {
     public static void main(String[] args) {
         if (CameraManager.initializeCameras()) {
-            SettingsManager.intialize();
+            SettingsManager.initialize();
             for (var camSet : CameraManager.getAllCamerasByName().entrySet()) {
                 new Thread(new CameraProcess(camSet.getValue())).start();
             }
diff --git a/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java b/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java
new file mode 100644
index 000000000..5c420f290
--- /dev/null
+++ b/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java
@@ -0,0 +1,65 @@
+package com.chameleonvision.settings;
+
+import java.net.*;
+import java.util.Collections;
+import java.util.Enumeration;
+
+import org.apache.commons.lang3.SystemUtils;
+
+public class NetworkSettings {
+    public String connectionType, ip, netmask, gateway, hostname;
+
+    public void run() {
+        String adapter = getAdapter();
+        if (SystemUtils.IS_OS_LINUX) {//TODO check linux commands
+            if (!adapter.equals("")) {
+                executeCommand("ifconfig " + adapter + " down");
+                if (connectionType.equals("DHCP"))
+                    executeCommand("dhclient -r " + adapter);
+                else if (connectionType.equals("Static")) {
+                    executeCommand("ifconfig " + adapter + " " + this.ip + " netmask " + this.netmask);
+                    executeCommand("route add default gw " + this.gateway + " " + adapter);
+                }
+                executeCommand("ifconfig " + adapter + " up");
+            }
+            executeCommand("hostnamectl set-hostname " + this.hostname);
+        }
+        //TODO add windows networking commands
+
+//            else
+//            if (SystemUtils.IS_OS_WINDOWS)
+//            {
+//                executeCommand("cmd /c COMMAND HERE");
+//        }
+    }
+
+    private void executeCommand(String command) {
+        try {
+            Process p = Runtime.getRuntime().exec(command);
+            p.waitFor();
+            p.destroy();
+        } catch (Exception e) {
+            System.err.println("Error while executing command!");
+            e.printStackTrace();
+        }
+    }
+
+    public static String getAdapter() {
+        try {
+            Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
+            for (NetworkInterface netint : Collections.list(nets)) {
+                Enumeration<InetAddress> ee = netint.getInetAddresses();
+                for (InetAddress addr : Collections.list(ee))
+                    if (addr instanceof Inet4Address)
+//                    if ((addr.getAddress()[0] & 0xFF) == 10 && (addr.getAddress()[1] & 0xFF) == SettingsManager.GeneralSettings.team_number) {
+                        if ((addr.getAddress()[0] & 0xFF) == 192 && (addr.getAddress()[1] & 0xFF) == 168) {
+                            System.out.println("found robot network interface at " + netint.getName() + " ip: " + addr.getHostAddress());
+                            return netint.getName();
+                        }
+            }
+        } catch (SocketException e) {
+            System.err.println("Socket exception while trying to find current ip");
+        }
+        return "";
+    }
+}
diff --git a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
index a2f1d3e8d..0450f3da7 100644
--- a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
+++ b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
@@ -20,8 +20,15 @@ public class SettingsManager {
 
 	private SettingsManager() {}
 
-	public static void intialize() {
+	public static void initialize() {
 		initGeneralSettings();
+		NetworkSettings netSettings = new NetworkSettings();
+		netSettings.hostname=GeneralSettings.hostname;
+		netSettings.gateway=GeneralSettings.gateway;
+		netSettings.netmask=GeneralSettings.netmask;
+		netSettings.connectionType=GeneralSettings.connection_type;
+		netSettings.ip=GeneralSettings.ip;
+		netSettings.run();
 
 		var allCameras = CameraManager.getAllCamerasByName();
 		if (!allCameras.containsKey(GeneralSettings.curr_camera) && allCameras.size() > 0) {

From d94ac908ec5944cf9f8014b924c4f915a49c78d6 Mon Sep 17 00:00:00 2001
From: Omer <zipory.omer@gmail.com>
Date: Sat, 21 Sep 2019 18:33:00 +0300
Subject: [PATCH 2/4] Revert "Added network settings handler for linux"

This reverts commit a327abc4c2f58f7784d900d693ad8cfeca277cb3.
---
 Main/chameleon-vision.iml                     |  1 -
 Main/pom.xml                                  |  5 --
 .../main/java/com/chameleonvision/Main.java   |  2 +-
 .../settings/NetworkSettings.java             | 65 -------------------
 .../settings/SettingsManager.java             |  9 +--
 5 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java

diff --git a/Main/chameleon-vision.iml b/Main/chameleon-vision.iml
index d298ab873..d50a9a25c 100644
--- a/Main/chameleon-vision.iml
+++ b/Main/chameleon-vision.iml
@@ -39,7 +39,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
     <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-java:2019.4.1" level="project" />
     <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:linuxathena:2019.4.1" level="project" />
     <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:linuxraspbian:2019.4.1" level="project" />
diff --git a/Main/pom.xml b/Main/pom.xml
index 28ce24dd4..f268f5079 100644
--- a/Main/pom.xml
+++ b/Main/pom.xml
@@ -70,11 +70,6 @@
             <artifactId>spring-beans</artifactId>
             <version>5.1.9.RELEASE</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
-        </dependency>
 
         <!-- supported platforms for wpilib JNI classifiers
             linuxathena
diff --git a/Main/src/main/java/com/chameleonvision/Main.java b/Main/src/main/java/com/chameleonvision/Main.java
index 638d73d0e..8eca7dbf0 100644
--- a/Main/src/main/java/com/chameleonvision/Main.java
+++ b/Main/src/main/java/com/chameleonvision/Main.java
@@ -8,7 +8,7 @@ import com.chameleonvision.web.Server;
 public class Main {
     public static void main(String[] args) {
         if (CameraManager.initializeCameras()) {
-            SettingsManager.initialize();
+            SettingsManager.intialize();
             for (var camSet : CameraManager.getAllCamerasByName().entrySet()) {
                 new Thread(new CameraProcess(camSet.getValue())).start();
             }
diff --git a/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java b/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java
deleted file mode 100644
index 5c420f290..000000000
--- a/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.chameleonvision.settings;
-
-import java.net.*;
-import java.util.Collections;
-import java.util.Enumeration;
-
-import org.apache.commons.lang3.SystemUtils;
-
-public class NetworkSettings {
-    public String connectionType, ip, netmask, gateway, hostname;
-
-    public void run() {
-        String adapter = getAdapter();
-        if (SystemUtils.IS_OS_LINUX) {//TODO check linux commands
-            if (!adapter.equals("")) {
-                executeCommand("ifconfig " + adapter + " down");
-                if (connectionType.equals("DHCP"))
-                    executeCommand("dhclient -r " + adapter);
-                else if (connectionType.equals("Static")) {
-                    executeCommand("ifconfig " + adapter + " " + this.ip + " netmask " + this.netmask);
-                    executeCommand("route add default gw " + this.gateway + " " + adapter);
-                }
-                executeCommand("ifconfig " + adapter + " up");
-            }
-            executeCommand("hostnamectl set-hostname " + this.hostname);
-        }
-        //TODO add windows networking commands
-
-//            else
-//            if (SystemUtils.IS_OS_WINDOWS)
-//            {
-//                executeCommand("cmd /c COMMAND HERE");
-//        }
-    }
-
-    private void executeCommand(String command) {
-        try {
-            Process p = Runtime.getRuntime().exec(command);
-            p.waitFor();
-            p.destroy();
-        } catch (Exception e) {
-            System.err.println("Error while executing command!");
-            e.printStackTrace();
-        }
-    }
-
-    public static String getAdapter() {
-        try {
-            Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
-            for (NetworkInterface netint : Collections.list(nets)) {
-                Enumeration<InetAddress> ee = netint.getInetAddresses();
-                for (InetAddress addr : Collections.list(ee))
-                    if (addr instanceof Inet4Address)
-//                    if ((addr.getAddress()[0] & 0xFF) == 10 && (addr.getAddress()[1] & 0xFF) == SettingsManager.GeneralSettings.team_number) {
-                        if ((addr.getAddress()[0] & 0xFF) == 192 && (addr.getAddress()[1] & 0xFF) == 168) {
-                            System.out.println("found robot network interface at " + netint.getName() + " ip: " + addr.getHostAddress());
-                            return netint.getName();
-                        }
-            }
-        } catch (SocketException e) {
-            System.err.println("Socket exception while trying to find current ip");
-        }
-        return "";
-    }
-}
diff --git a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
index 0450f3da7..a2f1d3e8d 100644
--- a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
+++ b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
@@ -20,15 +20,8 @@ public class SettingsManager {
 
 	private SettingsManager() {}
 
-	public static void initialize() {
+	public static void intialize() {
 		initGeneralSettings();
-		NetworkSettings netSettings = new NetworkSettings();
-		netSettings.hostname=GeneralSettings.hostname;
-		netSettings.gateway=GeneralSettings.gateway;
-		netSettings.netmask=GeneralSettings.netmask;
-		netSettings.connectionType=GeneralSettings.connection_type;
-		netSettings.ip=GeneralSettings.ip;
-		netSettings.run();
 
 		var allCameras = CameraManager.getAllCamerasByName();
 		if (!allCameras.containsKey(GeneralSettings.curr_camera) && allCameras.size() > 0) {

From 5aa829a13405a1a57b7cbbe6c5e2f835b8cbce1e Mon Sep 17 00:00:00 2001
From: Omer <zipory.omer@gmail.com>
Date: Sat, 21 Sep 2019 18:38:08 +0300
Subject: [PATCH 3/4] Revert "Revert "Added network settings handler for
 linux""

This reverts commit d94ac908ec5944cf9f8014b924c4f915a49c78d6.
---
 Main/chameleon-vision.iml                     |  1 +
 Main/pom.xml                                  |  5 ++
 .../main/java/com/chameleonvision/Main.java   |  2 +-
 .../settings/NetworkSettings.java             | 65 +++++++++++++++++++
 .../settings/SettingsManager.java             |  9 ++-
 5 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java

diff --git a/Main/chameleon-vision.iml b/Main/chameleon-vision.iml
index d50a9a25c..d298ab873 100644
--- a/Main/chameleon-vision.iml
+++ b/Main/chameleon-vision.iml
@@ -39,6 +39,7 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
     <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-java:2019.4.1" level="project" />
     <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:linuxathena:2019.4.1" level="project" />
     <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:linuxraspbian:2019.4.1" level="project" />
diff --git a/Main/pom.xml b/Main/pom.xml
index f268f5079..28ce24dd4 100644
--- a/Main/pom.xml
+++ b/Main/pom.xml
@@ -70,6 +70,11 @@
             <artifactId>spring-beans</artifactId>
             <version>5.1.9.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+        </dependency>
 
         <!-- supported platforms for wpilib JNI classifiers
             linuxathena
diff --git a/Main/src/main/java/com/chameleonvision/Main.java b/Main/src/main/java/com/chameleonvision/Main.java
index 8eca7dbf0..638d73d0e 100644
--- a/Main/src/main/java/com/chameleonvision/Main.java
+++ b/Main/src/main/java/com/chameleonvision/Main.java
@@ -8,7 +8,7 @@ import com.chameleonvision.web.Server;
 public class Main {
     public static void main(String[] args) {
         if (CameraManager.initializeCameras()) {
-            SettingsManager.intialize();
+            SettingsManager.initialize();
             for (var camSet : CameraManager.getAllCamerasByName().entrySet()) {
                 new Thread(new CameraProcess(camSet.getValue())).start();
             }
diff --git a/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java b/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java
new file mode 100644
index 000000000..5c420f290
--- /dev/null
+++ b/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java
@@ -0,0 +1,65 @@
+package com.chameleonvision.settings;
+
+import java.net.*;
+import java.util.Collections;
+import java.util.Enumeration;
+
+import org.apache.commons.lang3.SystemUtils;
+
+public class NetworkSettings {
+    public String connectionType, ip, netmask, gateway, hostname;
+
+    public void run() {
+        String adapter = getAdapter();
+        if (SystemUtils.IS_OS_LINUX) {//TODO check linux commands
+            if (!adapter.equals("")) {
+                executeCommand("ifconfig " + adapter + " down");
+                if (connectionType.equals("DHCP"))
+                    executeCommand("dhclient -r " + adapter);
+                else if (connectionType.equals("Static")) {
+                    executeCommand("ifconfig " + adapter + " " + this.ip + " netmask " + this.netmask);
+                    executeCommand("route add default gw " + this.gateway + " " + adapter);
+                }
+                executeCommand("ifconfig " + adapter + " up");
+            }
+            executeCommand("hostnamectl set-hostname " + this.hostname);
+        }
+        //TODO add windows networking commands
+
+//            else
+//            if (SystemUtils.IS_OS_WINDOWS)
+//            {
+//                executeCommand("cmd /c COMMAND HERE");
+//        }
+    }
+
+    private void executeCommand(String command) {
+        try {
+            Process p = Runtime.getRuntime().exec(command);
+            p.waitFor();
+            p.destroy();
+        } catch (Exception e) {
+            System.err.println("Error while executing command!");
+            e.printStackTrace();
+        }
+    }
+
+    public static String getAdapter() {
+        try {
+            Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
+            for (NetworkInterface netint : Collections.list(nets)) {
+                Enumeration<InetAddress> ee = netint.getInetAddresses();
+                for (InetAddress addr : Collections.list(ee))
+                    if (addr instanceof Inet4Address)
+//                    if ((addr.getAddress()[0] & 0xFF) == 10 && (addr.getAddress()[1] & 0xFF) == SettingsManager.GeneralSettings.team_number) {
+                        if ((addr.getAddress()[0] & 0xFF) == 192 && (addr.getAddress()[1] & 0xFF) == 168) {
+                            System.out.println("found robot network interface at " + netint.getName() + " ip: " + addr.getHostAddress());
+                            return netint.getName();
+                        }
+            }
+        } catch (SocketException e) {
+            System.err.println("Socket exception while trying to find current ip");
+        }
+        return "";
+    }
+}
diff --git a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
index a2f1d3e8d..0450f3da7 100644
--- a/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
+++ b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
@@ -20,8 +20,15 @@ public class SettingsManager {
 
 	private SettingsManager() {}
 
-	public static void intialize() {
+	public static void initialize() {
 		initGeneralSettings();
+		NetworkSettings netSettings = new NetworkSettings();
+		netSettings.hostname=GeneralSettings.hostname;
+		netSettings.gateway=GeneralSettings.gateway;
+		netSettings.netmask=GeneralSettings.netmask;
+		netSettings.connectionType=GeneralSettings.connection_type;
+		netSettings.ip=GeneralSettings.ip;
+		netSettings.run();
 
 		var allCameras = CameraManager.getAllCamerasByName();
 		if (!allCameras.containsKey(GeneralSettings.curr_camera) && allCameras.size() > 0) {

From 8a451f74ab95a089f87baf4dcdb5ee8f4b60523c Mon Sep 17 00:00:00 2001
From: Omer <zipory.omer@gmail.com>
Date: Sat, 21 Sep 2019 18:39:31 +0300
Subject: [PATCH 4/4] Network settings for linux

---
 .../java/com/chameleonvision/settings/NetworkSettings.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java b/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java
index 5c420f290..b13761b7f 100644
--- a/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java
+++ b/Main/src/main/java/com/chameleonvision/settings/NetworkSettings.java
@@ -51,8 +51,7 @@ public class NetworkSettings {
                 Enumeration<InetAddress> ee = netint.getInetAddresses();
                 for (InetAddress addr : Collections.list(ee))
                     if (addr instanceof Inet4Address)
-//                    if ((addr.getAddress()[0] & 0xFF) == 10 && (addr.getAddress()[1] & 0xFF) == SettingsManager.GeneralSettings.team_number) {
-                        if ((addr.getAddress()[0] & 0xFF) == 192 && (addr.getAddress()[1] & 0xFF) == 168) {
+                    if ((addr.getAddress()[0] & 0xFF) == 10 && (addr.getAddress()[1] & 0xFF) == SettingsManager.GeneralSettings.team_number) {
                             System.out.println("found robot network interface at " + netint.getName() + " ip: " + addr.getHostAddress());
                             return netint.getName();
                         }