Bug 623045 - script-fu: make server IPv6 aware

use getnameinfo() instead of inet_ntoa()
use two sockets for IPv4, IPv6

plug-ins/script-fu/servertest.py

@@ -2,38 +2,66 @@
 
 import readline, socket, sys
 
-if len (sys.argv) == 1:
-   HOST = 'localhost'
-   PORT = 10008
-elif len (sys.argv) == 3:
-   HOST = sys.argv[1]
-   PORT = int (sys.argv[2])
-else:
-   print >> sys.stderr, "Usage: %s <host> <port>" % sys.argv[0]
-   print >> sys.stderr, "       (if omitted connect to localhost, port 10008)"
-   sys.exit ()
+if len(sys.argv) < 1 or len(sys.argv) > 3:
+   print >>sys.stderr, "Usage: %s <host> <port>" % sys.argv[0]
+   print >>sys.stderr, "       (if omitted connect to localhost, port 10008)"
+   sys.exit(1)
 
-
-sock = socket.socket (socket.AF_INET, socket.SOCK_STREAM)
-sock.connect ((HOST, PORT))
+HOST = "localhost"
+PORT = 10008
 
 try:
-   cmd = raw_input ("Script-Fu-Remote - Testclient\n> ")
+    HOST = sys.argv[1]
+    try:
+        PORT = int(sys.argv[2])
+    except IndexError:
+        pass
+except IndexError:
+    pass
 
-   while len (cmd) > 0:
-      sock.send ('G%c%c%s' % (len (cmd) / 256, len (cmd) % 256, cmd))
+addresses = socket.getaddrinfo(HOST, PORT, socket.AF_UNSPEC, socket.SOCK_STREAM)
+
+connected = False
+
+for addr in addresses:
+    (family, socktype, proto, canonname, sockaddr) = addr
+
+    numeric_addr = sockaddr[0]
+
+    if canonname:
+        print "Trying %s ('%s')." % (numeric_addr, canonname)
+    else:
+        print "Trying %s." % numeric_addr
+
+    try:
+        sock = socket.socket(family, socket.SOCK_STREAM)
+        sock.connect((HOST, PORT))
+        connected = True
+        break
+    except:
+        pass
+
+if not connected:
+    print "Failed."
+    sys.exit(1)
+
+try:
+   cmd = raw_input("Script-Fu-Remote - Testclient\n> ")
+
+   while len(cmd) > 0:
+      sock.send('G%c%c%s' % (len(cmd) / 256, len(cmd) % 256, cmd))
 
       data = ""
-      while len (data) < 4:
-         data += sock.recv (4 - len (data))
+      while len(data) < 4:
+         data += sock.recv(4 - len(data))
 
-      if len (data) >= 4:
+      if len(data) >= 4:
          if data[0] == 'G':
-            l = ord (data[2]) * 256 + ord (data[3])
+            l = ord(data[2]) * 256 + ord(data[3])
             msg = ""
-            while len (msg) < l:
-               msg += sock.recv (l - len (msg))
-            if ord (data[1]):
+            while len(msg) < l:
+               msg += sock.recv(l - len(msg))
+            if ord(data[1]):
                print "(ERR):", msg
             else:
                print " (OK):", msg
@@ -41,9 +69,9 @@ try:
             print "invalid magic: %s\n" % data
       else:
          print "short response: %s\n" % data
-      cmd = raw_input ("> ")
+      cmd = raw_input("> ")
 
 except EOFError:
    print
 
-sock.close
+sock.close()