Changeset 9579 for src/django_gheat/gheat/management

Timestamp:

Aug 26, 2011, 8:54:24 PM (14 years ago)

Author:

rick

Message:

Map a SSID to an organization to play nice with differnt SSIDs.

Location:

src/django_gheat/gheat/management/commands

Files:

• import_droidstumbler.py (modified) (1 diff)
• import_kismet.py (modified) (1 diff)

src/django_gheat/gheat/management/commands/import_droidstumbler.py

@@ -96 +96 @@
       ssid, encryption = ap_pool[bssid]
       # Special trick in SSID ts avoid escaping in later stage
-      item = str((bssid.upper(),ssid.replace('%','%%'),encryption))
+      item = str((bssid.upper(),ssid.replace('%','%%'),encryption,Accespoint.get_organization(ssid)))
       sql_values.append(item)
-    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`)',sql_values)
+    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`, `organization`)',sql_values)
 
   # Build mapping for meting import

src/django_gheat/gheat/management/commands/import_kismet.py

@@ -76 +76 @@
       ssid, encryption = ap_pool[bssid]
       # Special trick in SSID ts avoid escaping in later stage
-      item = str((bssid.upper(),ssid.replace('%','%%'),encryption))
+      item = str((bssid.upper(),ssid.replace('%','%%'),encryption,Accespoint.get_organization(ssid)))
       sql_values.append(item)
-    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`)',sql_values)
+    counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`, `organization`)',sql_values)
 
   # Determine which Wireless Clients to add