remove old hardcode stuff

mlat-client

@@ -109,8 +109,6 @@ location pin from the coverage maps.""",
         uuid = [ args.uuid ]
     if args.uuid_path is not None:
         uuid_path = [ args.uuid_path ]
-    else:
-        uuid_path = [ '/usr/local/share/adsbexchange/adsbx-uuid', '/boot/adsbx-uuid' ]
 
     server = JsonServerConnection(host=args.server[0],
                                   port=args.server[1],

mlat/client/jsonclient.py

@@ -181,7 +181,7 @@ class JsonServerConnection(mlat.client.net.ReconnectingConnection):
 
     def __init__(self, host, port, uuid_path, uuid, handshake_data, offer_zlib, offer_udp, return_results):
         super().__init__(host, port)
-        self.uuid_path = uuid_path
+        self.uuid_path = uuid_path or []
         self.handshake_data = handshake_data
         self.offer_zlib = offer_zlib
         self.offer_udp = offer_udp

mlat/client/net.py

@@ -54,15 +54,6 @@ def __init__(self, host, port):
         asyncore.dispatcher.__init__(self)
         self.host = host
         self.port = port
-        # check port as well, if port doesn't match, could be direct MLAT
-        if self.host == 'feed.adsbexchange.com' and port == 31090:
-            self.adsbexchange = True
-        else:
-            self.adsbexchange = False
-        self.adsbexchangePortIndex = 0
-        self.adsbexchangeHostIndex = 0
-        self.adsbexchangePorts = [ 31090, 64590 ]
-        self.adsbexchangeHosts = [ 'feed1.adsbexchange.com', 'feed2.adsbexchange.com' ]
         self.addrlist = []
         self.state = 'disconnected'
         self.reconnect_at = None
@@ -166,11 +157,6 @@ def reconnect(self):
 
             if len(self.addrlist) == 0:
                 # ran out of addresses to try, resolve it again
-                if self.adsbexchange:
-                    self.adsbexchangePortIndex  = (self.adsbexchangePortIndex + 1) % len(self.adsbexchangePorts)
-                    self.adsbexchangeHostIndex  = (self.adsbexchangeHostIndex + 1) % len(self.adsbexchangeHosts)
-                    self.host = self.adsbexchangeHosts[self.adsbexchangeHostIndex];
-                    self.port = self.adsbexchangePorts[self.adsbexchangePortIndex];
 
                 self.addrlist = socket.getaddrinfo(host=self.host,
                                                    port=self.port,