Merge pull request #88 from appcelerator/timob-16747_3_2_X

[TIMOB-16747] Fixed bug where 'ipconfig /all' output was incorrectly bei...

lib/net.js

@@ -92,11 +92,11 @@ exports.interfaces = function (callback) {
 					.replace(/\n\n/g, '\n')							// remove double lines
 					.replace(/[\n][\t ]/g, ' ')						// if the next line indents, bring it up a line
 					.replace(/   /g, '~')							// if indented with spaces, mark with ~ so we can match
-					.replace(/ethernet adapter ([^:]*:)\n/ig, '$1')	// on Windows, remove Ethernet adapter
+					.replace(/ethernet adapter ([^:]*:)/ig, '$1')	// on Windows, remove "Ethernet adapter"
 					.split('\n').forEach(function (line) {
 						if (line = line.trim()) {
 							var m = line.match(/([^:~]*).*?((?:[0-9A-F][0-9A-F][:-]){5}[0-9A-F][0-9A-F])/i);
-							m && m.length > 1 && m[2] && (macs[m[1]] = m[2])
+							m && m.length > 1 && m[2] && (macs[m[1]] = m[2]);
 						}
 					});
 
@@ -120,36 +120,8 @@ exports.interfaces = function (callback) {
  * @param {Function} callback - The function to call with the result
  */
 exports.online = function online(callback) {
-	exports.interfaces(function (interfaces) {
-		var done = false,
-			isOnline = false,
-			ifaces = Object.keys(interfaces);
-
-		async.whilst(
-			function () {
-				return !done;
-			},
-			function (next) {
-				var iface = ifaces.shift();
-				if (!iface) {
-					done = true;
-					return next();
-				}
-
-				if (!interfaces[iface].macAddress) {
-					return next();
-				}
-
-				dns.resolve('api.appcelerator.net', function (err) {
-					isOnline = !err;
-					done = true;
-					next();
-				});
-			},
-			function () {
-				return callback(null, isOnline);
-			}
-		);
+	dns.resolve('api.appcelerator.net', function (err) {
+		callback(null, !err);
 	});
 };