fixed interface name wrong on liunx

Author: fengmk2

lib/utility.js

@@ -259,7 +259,14 @@ exports.datestruct = function (now) {
 
 function _getIP(family, interfaceName) {
   var interfaces = os.networkInterfaces();
-  interfaceName = interfaceName || 'en';
+  if (!interfaceName) {
+    if (os.platform() === 'linux') {
+      interfaceName = 'eth';
+    } else {
+      interfaceName = 'en';
+    }
+  }
+
   for (var i = 0; i < 8; i++) {
     var items = interfaces[interfaceName + i];
     var found = false;
@@ -277,7 +284,7 @@ function _getIP(family, interfaceName) {
 /**
  * Get current machine IPv4
  *
- * @param {String} [interfaceName] interface name, default is 'en'
+ * @param {String} [interfaceName] interface name, default is 'eth' on linux, 'en' on mac os.
  * @return {String} IP address
  */
 exports.getIP = exports.getIPv4 = function (interfaceName) {
@@ -287,7 +294,7 @@ exports.getIP = exports.getIPv4 = function (interfaceName) {
 /**
  * Get current machine IPv6
  *
- * @param {String} [interfaceName] interface name, default is 'en'
+ * @param {String} [interfaceName] interface name, default is 'eth' on linux, 'en' on mac os.
  * @return {String} IP address
  */
 exports.getIPv6 = function (interfaceName) {

test/utility.test.js

@@ -174,10 +174,63 @@ Encode string s using a URL-safe alphabet, which substitutes - instead of + and
   });
 
   describe('getIP(), getIPv6(), getIPv4()', function () {
+    afterEach(mm.restore);
+
     it('should return ip version 4 address', function () {
+      mm(os, 'networkInterfaces', function () {
+        return { lo0: 
+         [ { address: '::1', family: 'IPv6', internal: true },
+           { address: 'fe80::1', family: 'IPv6', internal: true },
+           { address: '127.0.0.1', family: 'IPv4', internal: true } ],
+        en0:
+         [ { address: 'fe81::cabc:c8ff:feef:f996', family: 'IPv6',
+             internal: true },
+           { address: '10.0.1.123', family: 'IPv4', internal: false } ],
+        en7:
+         [ { address: 'fe80::cabc:c8ff:feef:f996', family: 'IPv6',
+             internal: false },
+           { address: '10.0.1.123', family: 'IPv4', internal: false } ],
+        vmnet1: [ { address: '10.99.99.254', family: 'IPv4', internal: false } ],
+        vmnet8: [ { address: '10.88.88.1', family: 'IPv4', internal: false } ],
+        ppp0: [ { address: '10.2.0.231', family: 'IPv4', internal: false } ] 
+        };
+      });
+      mm(os, 'platform', function () {
+        return 'darwin';
+      });
       var address = utils.getIP();
+      should.exists(address);
+      address.should.equal(utils.getIPv4());
+      address.should.match(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/);
+      address.should.equal('10.0.1.123');
+      mm.restore();
+
+      mm(os, 'networkInterfaces', function () {
+        return { lo0: 
+         [ { address: '::1', family: 'IPv6', internal: true },
+           { address: 'fe80::1', family: 'IPv6', internal: true },
+           { address: '127.0.0.1', family: 'IPv4', internal: true } ],
+        eth0: 
+         [ { address: 'fe81::cabc:c8ff:feef:f996', family: 'IPv6',
+             internal: true },
+           { address: '10.0.1.124', family: 'IPv4', internal: false } ],
+        eth2: 
+         [ { address: 'fe80::cabc:c8ff:feef:f996', family: 'IPv6',
+             internal: false },
+           { address: '10.0.1.123', family: 'IPv4', internal: false } ],
+        vmnet1: [ { address: '10.99.99.254', family: 'IPv4', internal: false } ],
+        vmnet8: [ { address: '10.88.88.1', family: 'IPv4', internal: false } ],
+        ppp0: [ { address: '10.2.0.231', family: 'IPv4', internal: false } ] 
+        };
+      });
+      mm(os, 'platform', function () {
+        return 'linux';
+      });
+      address = utils.getIP();
+      should.exists(address);
       address.should.equal(utils.getIPv4());
       address.should.match(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/);
+      address.should.equal('10.0.1.124');
     });
 
     it('should return ip version 6 address', function () {
@@ -186,11 +239,11 @@ Encode string s using a URL-safe alphabet, which substitutes - instead of + and
          [ { address: '::1', family: 'IPv6', internal: true },
            { address: 'fe80::1', family: 'IPv6', internal: true },
            { address: '127.0.0.1', family: 'IPv4', internal: true } ],
-        en0: 
+        eth0:
          [ { address: 'fe81::cabc:c8ff:feef:f996', family: 'IPv6',
              internal: true },
            { address: '10.0.1.123', family: 'IPv4', internal: false } ],
-        en7: 
+        eth7:
          [ { address: 'fe80::cabc:c8ff:feef:f996', family: 'IPv6',
              internal: false },
            { address: '10.0.1.123', family: 'IPv4', internal: false } ],
@@ -199,6 +252,10 @@ Encode string s using a URL-safe alphabet, which substitutes - instead of + and
         ppp0: [ { address: '10.2.0.231', family: 'IPv4', internal: false } ] 
         };
       });
+      mm(os, 'platform', function () {
+        return 'linux';
+      });
+      
       var address = utils.getIPv6();
       should.exists(address);
       address.should.equal('fe80::cabc:c8ff:feef:f996');