Merge pull request #146 from revmischa/master

Add option to specify bind address when connecting

docs/API.rst

@@ -19,6 +19,7 @@ Client
             userName: 'nodebot',
             realName: 'nodeJS IRC client',
             port: 6667,
+            localAddress: null,
             debug: false,
             showErrors: false,
             autoRejoin: true,
@@ -40,6 +41,8 @@ Client
     If you set `selfSigned` to true SSL accepts certificates from a non trusted CA.
     If you set `certExpired` to true, the bot connects even if the ssl cert has expired.
 
+    `localAddress` is the address to bind to when connecting.
+
     `floodProtection` queues all your messages and slowly unpacks it to make sure
     that we won't get kicked out because for Excess Flood. You can also use
     `Client.activateFloodProtection()` to activate flood protection after

lib/irc.js

@@ -36,6 +36,7 @@ function Client(server, nick, opt) {
         userName: 'nodebot',
         realName: 'nodeJS IRC client',
         port: 6667,
+        localAddress: null,
         debug: false,
         showErrors: false,
         autoRejoin: true,
@@ -631,14 +632,31 @@ Client.prototype.connect = function(retryCount, callback) { // {{{
     }
     var self = this;
     self.chans = {};
+
+    // socket opts
+    var connectionOpts = {
+        host: self.opt.server,
+        port: self.opt.port
+    };
+
+    // local address to bind to
+    if (self.opt.localAddress)
+        connectionOpts.localAddress = self.opt.localAddress;
+
     // try to connect to the server
     if (self.opt.secure) {
         var creds = self.opt.secure;
-        if (typeof self.opt.secure !== 'object') {
-            creds = {rejectUnauthorized: !self.opt.selfSigned};
+        creds.rejectUnauthorized = !self.opt.selfSigned;
+
+        if (typeof self.opt.secure == 'object') {
+            // copy "secure" opts to options passed to connect()
+            for (var f in self.opt.secure) {
+                if (creds.hasOwnProperty(f))
+                    connectionOpts[f] = creds[f];
+            }
         }
 
-        self.conn = tls.connect(self.opt.port, self.opt.server, creds, function() {
+        self.conn = tls.connect(connectionOpts, function() {
             // callback called only after successful socket connection
             self.conn.connected = true;
             if (self.conn.authorized ||
@@ -668,8 +686,8 @@ Client.prototype.connect = function(retryCount, callback) { // {{{
                 util.log(self.conn.authorizationError);
             }
         });
-    }else {
-        self.conn = net.createConnection(self.opt.port, self.opt.server);
+    } else {
+        self.conn = net.createConnection(connectionOpts);
     }
     self.conn.requestedDisconnect = false;
     self.conn.setTimeout(0);

package.json

@@ -9,7 +9,8 @@
   },
   "contributors": [
     "Fionn Kelleher <me@fionn.co>",
-    "xAndy <xandy@hackerspace-bamberg.de>"
+    "xAndy <xandy@hackerspace-bamberg.de>",
+    "Mischa Spiegelmock <revmischa@cpan.org>"
   ],
   "repository": {
     "type": "git",