diff options
| author | makefu <makefu@syntax-fehler.de> | 2011-06-30 23:33:03 +0200 |
|---|---|---|
| committer | makefu <makefu@syntax-fehler.de> | 2011-06-30 23:33:03 +0200 |
| commit | 21cf2eae73ea4ae2a63df512767480584073d232 (patch) | |
| tree | 2adc7b1e9f7c067b43ecef7bb7bb00985136eb86 /people | |
| parent | 8efab77bc711f12db0ea8fabed469680acaac472 (diff) | |
| parent | 27636a7d483a2030ba9fae77e9fbe5d03763009b (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
mining/Makefile: now installs tmux and configures
Diffstat (limited to 'people')
| -rwxr-xr-x | people/arping_users.py | 6 | ||||
| -rw-r--r-- | people/mac_names.lst | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/people/arping_users.py b/people/arping_users.py index c576e4f3..008fe337 100755 --- a/people/arping_users.py +++ b/people/arping_users.py @@ -21,7 +21,7 @@ def load_names(MAC_NAMES): names = {} f = open(MAC_NAMES) for l in f: - mac,name = l.split() + mac,name = l.split(' ',1) names[mac] = name.replace('\n','') f.close() return names @@ -29,7 +29,7 @@ def load_names(MAC_NAMES): def arping_helper(dic): return arpingy(**dic) -for first in range(4): +for first in range(1,3): for second in range(255): data.append({'iprange':'10.42.'+str(first)+'.'+str(second),'iface':DEV}) @@ -50,5 +50,3 @@ for p in ret: print p[0] + " => " + p[1] if p[1] in names: print names[p[1]]+ " is online" - - diff --git a/people/mac_names.lst b/people/mac_names.lst index dcd3c2b0..ae58b539 100644 --- a/people/mac_names.lst +++ b/people/mac_names.lst @@ -1 +1,7 @@ 00:40:63:c8:b5:a0 krebs +00:23:54:29:1d:3e hadez +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 |