diff options
| author | makefu <github@syntax-fehler.de> | 2011-08-06 01:56:55 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2011-08-06 01:56:55 +0200 |
| commit | 4ba5f6f8bf321c4c1f1c0f5652248fbbc2cd2419 (patch) | |
| tree | 42e042d5c7ff27584c64742ec3dcd82fca0c69ac /census | |
| parent | 67331f023a364d8e256c848ea42467d2ad870e47 (diff) | |
| parent | 94bc4b14ecaa9935dcddfd104704c05c6fa13764 (diff) | |
emergency merge
Diffstat (limited to 'census')
| -rwxr-xr-x | census/arping_users.py | 6 | ||||
| -rw-r--r-- | census/mac_names.lst | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/census/arping_users.py b/census/arping_users.py index 5866c517..f0df4924 100755 --- a/census/arping_users.py +++ b/census/arping_users.py @@ -46,9 +46,9 @@ def main(): def arping_helper(dic): return arpingy(**dic) - for first in range(1,3): - for second in range(255): - data.append({'iprange':'10.42.'+str(first)+'.'+str(second),'iface':DEV}) +for first in range(1,4): + for second in range(256): + data.append({'iprange':'10.42.'+str(first)+'.'+str(second),'iface':DEV}) try: p = Pool(20) diff --git a/census/mac_names.lst b/census/mac_names.lst index ae58b539..85fbfb25 100644 --- a/census/mac_names.lst +++ b/census/mac_names.lst @@ -3,5 +3,12 @@ 00:26:c7:bd:a7:1a Martin 04:1e:64:05:39:28 Stephan 5c:59:48:22:2d:d2 Phil -00:21:00:fb:5c:b6 Kah Hah -00:1e:64:27:3b:72 Felix +00:21:00:fb:5c:b6 Kah-Hah +00:1e:64:27:3b:72 Felix +40:30:04:4f:de:73 Armin +00:26:c6:82:51:38 samuirai +3c:8b:fe:5c:4e:da Moh-Moh +00:26:bb:69:98:cc Jan +78:dd:08:d5:34:28 Patrick +78:ca:39:6e:ed:16 Tillman +00:22:43:25:61:79 Te vau |