Skip to content

Allowed the network part which more than 24 bits. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
honda0510 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allowed the network part which more than 24 bits. #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dda3e84
Modified the way to exclude the network and broadcast addresses.
honda0510 Apr 12, 2019
1316ff9
Allowed the network part which more than 24 bits.
honda0510 Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 15 additions & 26 deletions tello_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,13 @@ def find_avaliable_tello(self, num):
"""
print '[Start_Searching]Searching for %s available Tello...\n' % num

subnets, address = self.get_subnets()
networks = self.get_ipv4_networks()
possible_addr = []

for subnet, netmask in subnets:
for ip in IPNetwork('%s/%s' % (subnet, netmask)):
# skip local and broadcast
if str(ip).split('.')[3] == '0' or str(ip).split('.')[3] == '255':
continue
possible_addr.append(str(ip))
for network in networks:
for ip in network.iter_hosts():
if str(network.ip) != str(ip):
possible_addr.append(str(ip))

while len(self.tello_ip_list) < num:
print '[Still_Searching]Trying to find Tello in subnets...\n'
Expand All @@ -65,11 +63,8 @@ def find_avaliable_tello(self, num):
for tello_ip in self.tello_ip_list:
if tello_ip in possible_addr:
possible_addr.remove(tello_ip)
# skip server itself
# send each of the addresses a command.
for ip in possible_addr:
if ip in address:
continue

# record this command
self.log[ip].append(Stats('command', len(self.log[ip])))
self.socket.sendto(b'command', (ip, 8889))
Expand All @@ -81,38 +76,32 @@ def find_avaliable_tello(self, num):
temp[ip] = self.log[ip]
self.log = temp



def get_subnets(self):
def get_ipv4_networks(self):
"""
Look through the server's internet connection and
returns subnet addresses and server ip
:return: list[str]: subnets
list[str]: addr_list
returns ipv4 networks
:return: list[IPNetwork]: networks
"""
subnets = []
ifaces = netifaces.interfaces()
addr_list = []
networks = []
for myiface in ifaces:
addrs = netifaces.ifaddresses(myiface)

if socket.AF_INET not in addrs:
continue

# Get ipv4 stuff
ipinfo = addrs[socket.AF_INET][0]
address = ipinfo['addr']
netmask = ipinfo['netmask']

# limit range of search. This will work for router subnets
if netmask != '255.255.255.0':
if not netmask.startswith('255.255.255'):
continue

# Create ip object and get
cidr = netaddr.IPNetwork('%s/%s' % (address, netmask))
network = cidr.network
subnets.append((network, netmask))
addr_list.append(address)
return subnets, addr_list
network = IPNetwork('%s/%s' % (address, netmask))
networks.append(network)
return networks

def get_tello_list(self):
return self.tello_list
Expand Down