From fd8c9a42679f954f67f98850dcf2f42e40c162ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Thu, 28 Jun 2018 18:18:48 +0200
Subject: [PATCH] IrcMiRCARTBot.py: adds optional -[46] force IPv[46] flag.

---
 IrcClient.py     | 10 ++++++----
 IrcMiRCARTBot.py | 30 +++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/IrcClient.py b/IrcClient.py
index 4891027..ba1d2ec 100644
--- a/IrcClient.py
+++ b/IrcClient.py
@@ -38,12 +38,14 @@ class IrcClient:
             self.clientSocket.close()
         self.clientSocket = self.clientSocketFile = None;
     # }}}
-    # {{{ connect(self, timeout=None): Connect to server and register w/ optional timeout
-    def connect(self, timeout=None):
-        self.clientSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    # {{{ connect(self, preferFamily=socket.AF_INET, timeout=None): Connect to server and register w/ optional timeout
+    def connect(self, preferFamily=socket.AF_INET, timeout=None):
+        gaiInfo = socket.getaddrinfo(self.serverHname, self.serverPort,
+                                     preferFamily, socket.SOCK_STREAM, socket.IPPROTO_TCP)
+        self.clientSocket = socket.socket(*gaiInfo[0][:3])
         self.clientSocket.setblocking(0)
         try:
-            self.clientSocket.connect((self.serverHname, int(self.serverPort)))
+            self.clientSocket.connect(gaiInfo[0][4])
         except BlockingIOError:
             pass
         if timeout:
diff --git a/IrcMiRCARTBot.py b/IrcMiRCARTBot.py
index 9bd7003..1c1f7e3 100755
--- a/IrcMiRCARTBot.py
+++ b/IrcMiRCARTBot.py
@@ -22,8 +22,9 @@
 # SOFTWARE.
 #
 
+from getopt import getopt, GetoptError
 import base64
-import os, sys, time
+import os, socket, sys, time
 import json
 import IrcClient
 import requests, urllib.request
@@ -206,10 +207,10 @@ class IrcMiRCARTBot(IrcClient.IrcClient):
         if (totalSize > pow(2,20)):
             raise IrcMiRCARTBot.ContentTooLargeException
     # }}}
-    # {{{ connect(self, timeout=None): Connect to server and (re)initialise w/ optional timeout
-    def connect(self, timeout=None):
+    # {{{ connect(self, preferFamily=0, timeout=None): Connect to server and (re)initialise w/ optional timeout
+    def connect(self, preferFamily=0, timeout=None):
         self._log("Connecting to {}:{}...".format(self.serverHname, self.serverPort))
-        if super().connect(timeout):
+        if super().connect(preferFamily=preferFamily, timeout=timeout):
                 self._log("Connected to {}:{}.".format(self.serverHname, self.serverPort))
                 self._log("Registering on {}:{} as {}, {}, {}...".format(self.serverHname, self.serverPort, self.clientNick, self.clientIdent, self.clientGecos))
                 self.clientLastMessage = 0; self.clientChannelOps = [];
@@ -255,18 +256,25 @@ class IrcMiRCARTBot(IrcClient.IrcClient):
 
 #
 # Entry point
-def main(*argv):
-    _IrcMiRCARTBot = IrcMiRCARTBot(*argv[1:])
+def main(optdict, *argv):
+    _IrcMiRCARTBot = IrcMiRCARTBot(*argv)
     while True:
-        if _IrcMiRCARTBot.connect(15):
+        if "-4" in optdict:
+            preferFamily = socket.AF_INET
+        elif "-6" in optdict:
+            preferFamily = socket.AF_INET6
+        else:
+            preferFamily = 0
+        if _IrcMiRCARTBot.connect(preferFamily=preferFamily, timeout=15):
             _IrcMiRCARTBot.dispatch()
             _IrcMiRCARTBot.close()
         time.sleep(15)
 
 if __name__ == "__main__":
-    if ((len(sys.argv) - 1) < 1)\
-    or ((len(sys.argv) - 1) > 4):
-        print("usage: {} "                                                  \
+    optlist, argv = getopt(sys.argv[1:], "46")
+    optdict = dict(optlist)
+    if len(argv) < 1 or len(argv) > 4:
+        print("usage: {} [-4|-6] "                                          \
             "<IRC server hostname> "                                        \
             "[<IRC server port; defaults to 6667>] "                        \
             "[<IRC bot nick name; defaults to pngbot>] "                    \
@@ -274,6 +282,6 @@ if __name__ == "__main__":
             "[<IRC bot real name; defaults to pngbot>] "                    \
             "[<IRC bot channel name; defaults to #MiRCART>] ".format(sys.argv[0]), file=sys.stderr)
     else:
-        main(*sys.argv)
+        main(optdict, *argv)
 
 # vim:expandtab foldmethod=marker sw=4 ts=4 tw=120