Adjust calculations for mesh ip and wlan ip outputs

index.html

@@ -114,8 +114,8 @@ <h1>PittMesh IP address calculator</h1>
         }
 
         var macArrayDecimals = convertHexToDecimals(macArray);
-        var meshIP = calcMeshIP(lastThreeOctets(macArrayDecimals));
-        var wlanIP = calcWlanIP(lastTwoOctets(macArrayDecimals));
+        var meshIP = calcMeshIP(adjustOctets(lastThreeOctets(macArrayDecimals)));
+        var wlanIP = calcWlanIP(adjustOctets(lastTwoOctets(macArrayDecimals)));
 
         meshEl.value = meshIP;
         wlanEl.value = wlanIP;
@@ -170,6 +170,17 @@ <h1>PittMesh IP address calculator</h1>
         return line;
       }
 
+      function adjustOctets(arr) {
+	console.log(arr.length);
+        if (arr.length == 3) {
+          arr[0] %= 32 + 96;
+          arr[2] -= (arr[2] % 64 - arr[2] % 32);
+        } else if (arr.length == 2) {
+          arr[1] -= (arr[1] % 64 - arr[1] % 32);
+        }
+        return arr;
+      }
+
       function convertHexToDecimals(arr) { return arr.map( function(h) { return parseInt(h, 16); } ); }
       function firstThreeOctets(arr) { return arr.slice(0, 3); }
       function lastThreeOctets(arr) { return arr.slice(3, 6); }