Changeset 7741e414ebca5089076d58982d1f967f627ace69

Timestamp:

03/20/09 14:29:54 (3 years ago)

Author:

Frederic Lepied <frederic.lepied@…>

Children:

e5e582bfb02593a628c358d97bd630ff91da7f41

Parents:

17e460a8150132a2f65061e57d00d0af6f545ed8

git-committer:

Frederic Lepied <frederic.lepied@…> (03/20/09 14:29:54)

Message:

display IP address if present

Location:

pxe

Files:

• common.py (modified) (2 diffs)
• dpysystem (modified) (2 diffs)

pxe/common.py

@@ -14 +14 @@
 from models import *
 
-IP_REGEXP = re.compile('^.*\s([0-9A-F:]+)\s.*')
+MAC_REGEXP = re.compile('^.*\s([0-9A-F:]+)\s.*')
+IP_REGEXP = re.compile('^([0-9.]+).*\s[0-9A-F:]+\s.*')
+
+def ip_to_mac(ip):
+    for line in open('/proc/net/arp').readlines():
+        if line.find(ip) != -1:
+            res = MAC_REGEXP.search(line)
+            if res:
+                return res.group(1)
+    return None
 
 def mac_to_ip(mac):
+    mac = mac.upper()
     for line in open('/proc/net/arp').readlines():
         if line.find(mac) != -1:
@@ -22 +32 @@
             if res:
                 return res.group(1)
-    return False
+    return None
 
 def get_mac(request):
-    mac = mac_to_ip(request.META['REMOTE_ADDR'])
+    mac = ip_to_mac(request.META['REMOTE_ADDR'])
     if not mac:
         raise Http404

pxe/dpysystem

@@ -31 +31 @@
     for mac in MacAddress.objects.filter(system=system):
         print 'Mac:',
+        r = ''
         for i in range(0, 10, 2):
-            sys.stdout.write('%s:' % mac.mac[i:i+2])
-        sys.stdout.write('%s\n' % mac.mac[10:12])
+            r = r +  '%s:' % mac.mac[i:i+2]
+        r = r + mac.mac[10:12]
+        print '%s (%s)' % (r, mac_to_ip(r))
     
     logs = Log.objects.filter(system=system).order_by('-date')
@@ -40 +42 @@
     
     print 'History:'
-    for l in logs[1:]:
+    for l in logs[1:10]:
         print l.date, l.boot_name.name