Revert "Implement Windows compatibility for slp, maybe ssdp"

This reverts commit 9e13724037.

confluent_server/confluent/discovery/protocols/slp.py

@@ -38,12 +38,6 @@ srvreqfooter = b'\x00\x07DEFAULT\x00\x00\x00\x00'
 # which is defined in RFC 3059, used to indicate support for that capability
 attrlistext = b'\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00'
 
-try:
-    IPPROTO_IPV6 = socket.IPPROTO_IPV6
-except AttributeError:
-    IPPROTO_IPV6 = 41  # Assume Windows value if socket is missing it
-
-
 
 def _parse_slp_header(packet):
     packet = bytearray(packet)
@@ -203,7 +197,7 @@ def _find_srvtype(net, net4, srvtype, addresses, xid):
         v6addrs.append(('ff02::1:' + v6hash, 427, 0, 0))
         for idx in util.list_interface_indexes():
             # IPv6 multicast is by index, so lead with that
-            net.setsockopt(IPPROTO_IPV6, socket.IPV6_MULTICAST_IF, idx)
+            net.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_MULTICAST_IF, idx)
             for sa in v6addrs:
                 try:
                     net.sendto(data, sa)
@@ -384,14 +378,14 @@ def snoop(handler):
     """
     active_scan(handler)
     net = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
-    net.setsockopt(IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
+    net.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
     slpg = socket.inet_pton(socket.AF_INET6, 'ff01::123')
     slpg2 = socket.inet_pton(socket.AF_INET6, 'ff02::123')
     for i6idx in util.list_interface_indexes():
         mreq = slpg + struct.pack('=I', i6idx)
-        net.setsockopt(IPPROTO_IPV6, socket.IPV6_JOIN_GROUP, mreq)
+        net.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_JOIN_GROUP, mreq)
         mreq = slpg2 + struct.pack('=I', i6idx)
-        net.setsockopt(IPPROTO_IPV6, socket.IPV6_JOIN_GROUP, mreq)
+        net.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_JOIN_GROUP, mreq)
     net4 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     net.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     net4.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@@ -489,7 +483,7 @@ def scan(srvtypes=_slp_services, addresses=None):
     # must make the best of it
     # Some platforms/config default to IPV6ONLY, we are doing IPv4
     # too, so force it
-    #net.setsockopt(IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
+    net.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
     # we are going to do broadcast, so allow that...
     initxid = random.randint(0, 32768)
     xididx = 0
@@ -518,6 +512,4 @@ def scan(srvtypes=_slp_services, addresses=None):
 if __name__ == '__main__':
     def testsnoop(a):
         print(repr(a))
-    #snoop(testsnoop)
-    for res in scan():
-        print(repr(res))
+    snoop(testsnoop)

confluent_server/confluent/discovery/protocols/ssdp.py

@@ -34,11 +34,6 @@ import eventlet.green.select as select
 import eventlet.green.socket as socket
 import struct
 
-try:
-    IPPROTO_IPV6 = socket.IPPROTO_IPV6
-except AttributeError:
-    IPPROTO_IPV6 = 41  # Assume Windows value if socket is missing it
-
 mcastv4addr = '239.255.255.250'
 mcastv6addr = 'ff02::c'
 
@@ -74,10 +69,10 @@ def snoop(handler, byehandler=None):
     # so we will have two distinct sockets
     known_peers = set([])
     net6 = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
-    net6.setsockopt(IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
+    net6.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
     for ifidx in util.list_interface_indexes():
         v6grp = ssdp6mcast + struct.pack('=I', ifidx)
-        net6.setsockopt(IPPROTO_IPV6, socket.IPV6_JOIN_GROUP, v6grp)
+        net6.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_JOIN_GROUP, v6grp)
     net6.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     net4 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     for i4 in util.list_ips():
@@ -139,7 +134,7 @@ def snoop(handler, byehandler=None):
 def _find_service(service, target):
     net4 = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     net6 = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
-    net6.setsockopt(IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
+    net6.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
     if target:
         addrs = socket.getaddrinfo(target, 1900, 0, socket.SOCK_DGRAM)
         for addr in addrs:
@@ -152,7 +147,7 @@ def _find_service(service, target):
     else:
         net4.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
         for idx in util.list_interface_indexes():
-            net6.setsockopt(IPPROTO_IPV6, socket.IPV6_MULTICAST_IF,
+            net6.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_MULTICAST_IF,
                             idx)
             try:
                 net6.sendto(smsg.format('[{0}]'.format(mcastv6addr), service

confluent_server/confluent/util.py

@@ -22,7 +22,6 @@ import confluent.log as log
 import hashlib
 import netifaces
 import os
-import socket
 import struct
 
 
@@ -38,14 +37,7 @@ def list_interface_indexes():
             yield intidx
     except (IOError, OSError):
         # Probably situation is non-Linux, just do limited support for
-        # such platforms until other people come along
-        for iface in netifaces.interfaces():
-            addrinfo = netifaces.ifaddresses(iface)[socket.AF_INET6]
-            for addr in addrinfo:
-                v6addr = addr.get('addr', '').partition('%')[2]
-                if v6addr:
-                    yield(int(v6addr))
-                    break
+        # such platforms until other people come alonge
         return