Changeset 10795 in hybrid for branches/releng-9.0/nanobsd

Timestamp:

May 12, 2012, 4:38:21 PM (13 years ago)

Author:

rick

Message:

[1:-1] is voor het IP address en niet voor het mac adress. Zorg ervoor dat er
complete goede mac addressen opgeslagen worden.

Related-To: ​nodefactory:ticket:161

File:

• branches/releng-9.0/nanobsd/files/usr/local/www/wlportal/index.cgi (modified) (2 diffs)

branches/releng-9.0/nanobsd/files/usr/local/www/wlportal/index.cgi

@@ -92 +92 @@
   """ Find out the MAC for a certain IP address """
   try:
-    return subprocess.check_output(['/usr/sbin/arp', '-n' ,ipaddr], shell=False).split()[3][1:-1]
+    # ? (172.17.32.1) at 00:12:34:45:67:90 on ue0 permanent [ethernet]
+    return subprocess.check_output(['/usr/sbin/arp', '-n' ,ipaddr], shell=False).split()[3]
   except subprocess.CalledProcessError:
     raise MACnotFound
@@ -98 +99 @@
 def get_active_MACs():
   """ Return dictionary with active IPs as keys """
+  # ? (172.17.32.1) at 00:12:34:45:67:90 on ue0 permanent [ethernet]
+  # ? (172.17.32.2) at 00:aa:bb:cc:dd:ee on ue0 expires in 964 seconds [ethernet]
+  # ? (172.16.3.38) at (incomplete) on vr2 expired [ethernet]
   output = subprocess.check_output(['/usr/sbin/arp', '-n' ,'-a'], shell=False)
   db = {}
   for line in output.strip().split('\n'):
     i = line.split()
-    mac = i[3][1:-1]
-    ip = i[5]
+    mac = i[3]
+    ip = i[5][1:-1]
     db[ip] = mac
   return db