From db61f243c9cc3c9821703c78e780e745703c0bb3 Mon Sep 17 00:00:00 2001
From: thejosko <jskorich@secureworks.com>
Date: Wed, 11 Jan 2017 17:35:08 -0600
Subject: [PATCH] added `ip` commands in addition to ifconfig and netstat

---
 settings.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/settings.py b/settings.py
index e02dff92..5b959b58 100644
--- a/settings.py
+++ b/settings.py
@@ -229,9 +229,12 @@ def populate(self, options):
                 
 		try:
 			NetworkCard = subprocess.check_output(["ifconfig", "-a"])
-		except subprocess.CalledProcessError as ex:
-			NetworkCard = "Error fetching Network Interfaces:", ex
-			pass
+		except:
+			try:
+				NetworkCard = subprocess.check_output(["ip", "address", "show"])
+			except subprocess.CalledProcessError as ex:
+				NetworkCard = "Error fetching Network Interfaces:", ex
+				pass
 		try:
 			DNS = subprocess.check_output(["cat", "/etc/resolv.conf"])
 		except subprocess.CalledProcessError as ex:
@@ -239,9 +242,12 @@ def populate(self, options):
 			pass
 		try:
 			RoutingInfo = subprocess.check_output(["netstat", "-rn"])
-		except subprocess.CalledProcessError as ex:
-			RoutingInfo = "Error fetching Routing information:", ex
-			pass
+		except:
+			try:
+				RoutingInfo = subprocess.check_output(["ip", "route", "show"])
+			except subprocess.CalledProcessError as ex:
+				RoutingInfo = "Error fetching Routing information:", ex
+				pass
 
 		Message = "Current environment is:\nNetwork Config:\n%s\nDNS Settings:\n%s\nRouting info:\n%s\n\n"%(NetworkCard,DNS,RoutingInfo)
 		try: