Merge branch 'master' of https://github.com/ritfirstrobotics/2018-core-code

Author: thatging3rkid

network/utils.py

@@ -3,11 +3,15 @@
 
 :author: Connor Henley @thatging3rkid
 """
+import fcntl
 import socket
+import struct
 
-# shamelessly stolen from https://stackoverflow.com/a/1267524
-def get_ip():
-    try:
-        return [ip for ip in socket.gethostbyname_ex(socket.gethostname())[2] if not ip.startswith("127.")][:1][0]
-    except:
-        return "127.0.0.1"
+# shamelessly stolen from https://stackoverflow.com/a/24196955
+def get_ip(ifname):
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    return socket.inet_ntoa(fcntl.ioctl(
+        s.fileno(),
+        0x8915,  # SIOCGIFADDR
+        struct.pack('256s', bytes(ifname[:15], 'utf-8'))
+    )[20:24])

utils/HeaderParser.py

@@ -95,7 +95,7 @@ def __parse(self, file):
 
             # Skip the line if it should not be processed (ie #ifdef is false)
             if depth != -1:
-                if not process_ln[depth] is None or process_ln[depth] is True:
+                if not(process_ln[depth] == None or process_ln[depth] == True):
                     continue
 
             # See if the line starts with #define