New option for custom IEEE OUI file (CSV format)

Author: Saluki

data/ieee-oui.csv

@@ -0,0 +1,33 @@
+Registry,Assignment,Organization Name,Organization Address
+MA-L,002272,American Micro-Fuel Device Corp.,2181 Buchanan Loop Ferndale WA US 98248 
+MA-L,00D0EF,IGT,9295 PROTOTYPE DRIVE RENO NV US 89511 
+MA-L,086195,Rockwell Automation,1 Allen-Bradley Dr. Mayfield Heights OH US 44124-6118 
+MA-L,F4BD9E,"Cisco Systems, Inc",80 West Tasman Drive San Jose CA US 94568 
+MA-L,5885E9,Realme Chongqing MobileTelecommunications Corp Ltd,"No.24 Nichang Boulevard, Huixing Block, Yubei District, Chongqing. Chongqing China CN 401120 "
+MA-L,BC2392,BYD Precision Manufacture Company Ltd.,"No.3001, Bao He Road, Baolong Industrial, Longgang Street,Longgang Zone, Shenzhen shenzhen  CN 518116 "
+MA-L,405582,Nokia,600 March Road Kanata Ontario CA K2K 2E6 
+MA-L,A4E31B,Nokia,600 March Road Kanata Ontario CA K2K 2E6 
+MA-L,D48660,Arcadyan Corporation,"No.8, Sec.2, Guangfu Rd. Hsinchu City Hsinchu TW 30071 "
+MA-L,C489ED,Solid Optics EU N.V.,De Huchtstraat 35 Almere Flevoland NL 1327 EC 
+MA-L,60F43A,Edifier International,"Suit 2207, 22nd floor, Tower II, Lippo centre, 89 Queensway Hong Kong  CN 070 "
+MA-L,58A87B,"Fitbit, Inc.","199 Fremont Street, 14th Fl San Francisco CA US 94105 "
+MA-L,5C6BD7,Foshan VIOMI Electric Appliance Technology Co. Ltd.,"No.2 North Xinxi Fourth Road, Xiashi Village Committee,Lunjiao Sub-district Office, Shunde District Foshan Guandong CN 528308 "
+MA-L,1848CA,"Murata Manufacturing Co., Ltd.","1-10-1, Higashikotari Nagaokakyo-shi Kyoto JP 617-8555 "
+MA-L,90EEC7,"Samsung Electronics Co.,Ltd","#94-1, Imsoo-Dong Gumi Gyeongbuk KR 730-350 "
+MA-L,1029AB,"Samsung Electronics Co.,Ltd","#94-1, Imsoo-Dong Gumi Gyeongbuk KR 730-350 "
+MA-L,184ECB,"Samsung Electronics Co.,Ltd","#94-1, Imsoo-Dong Gumi Gyeongbuk KR 730-350 "
+MA-L,010101,SomeCorp,Unknown address
+MA-L,8022A7,"NEC Platforms, Ltd.",2-3 Kandatsukasamachi Chiyodaku Tokyo JP 101-8532 
+MA-L,B83BCC,Xiaomi Communications Co Ltd,"#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road Beijing Haidian District CN 100085 "
+MA-L,88D199,"Vencer Co., Ltd.","14F-12, No. 79, Section 1, Hsin Tai Wu Road, Hsi-Chih District, New Taipei City Taiwan TW 22101 "
+MA-L,CCE236,Hangzhou Yaguan Technology Co. LTD,"33rd Floor, T4 US Center, European and American Financial City, Yuhang District, Hangzhou, Zhejiang Hangzhou Zhejiang CN 311100 "
+MA-L,204181,ESYSE GmbH Embedded Systems Engineering,Ruth-Niehaus Str. 8 Meerbusch Nordrhein-Westfalen DE 40667 
+MA-L,DCBB96,Full Solution Telecom,"Calle 130A #59C-42, Barrio Ciudad Jardin Norte Bogota Distrito Capital de Bogota CO 111111 "
+MA-L,74765B,"Quectel Wireless Solutions Co.,Ltd.","7th Floor, Hongye Building, No.1801 Hongmei Road, Xuhui District Shanghai  CN 200233 "
+MA-L,B437D8,D-Link (Shanghai) Limited Corp.,"Room 612, Floor 6, No.88, Taigu Road, Shanghai  CN 200131 "
+MA-L,9CD57D,"Cisco Systems, Inc",80 West Tasman Drive San Jose CA US 94568 
+MA-L,941F3A,Ambiq,"6500 River Place Blvd., Building 7, Suite 200  Austin TX US 78730 "
+MA-L,2C3557,"ELIIY Power CO., Ltd.","1-6-4, Osaki Shinagawa-ku TOKYO US 141-0032 "
+MA-L,7066E1,dnt Innovation GmbH,Maiburger Straße 29 Leer  DE 26789 
+MA-L,F8CE72,Wistron Corporation," NO.5, HSIN AN ROAD, SCIENCE-BASED INDUSTRIAL PARK, HSINCHU, TAIWAN, R.O.C. Hsinchu County Taiwan TW 303036 "
+MA-L,CC9DA2,Eltex Enterprise Ltd.,Okruzhnaya st. 29v Novosibirsk  RU 630020 

src/args.rs

@@ -47,6 +47,9 @@ pub fn build_args<'a, 'b>() -> App<'a, 'b> {
         .arg(
             Arg::with_name("interval").short("I").long("interval").takes_value(true).value_name("INTERVAL_DURATION").help("Milliseconds between ARP requests")
         )
+        .arg(
+            Arg::with_name("oui-file").long("oui-file").takes_value(true).value_name("FILE_PATH").help("Path to custom IEEE OUI CSV file")
+        )
         .arg(
             Arg::with_name("list").short("l").long("list").takes_value(false).help("List network interfaces")
         )
@@ -71,7 +74,8 @@ pub struct ScanOptions {
     pub retry_count: usize,
     pub interval_ms: u64,
     pub randomize_targets: bool,
-    pub output: OutputFormat
+    pub output: OutputFormat,
+    pub oui_file: String
 }
 
 impl ScanOptions {
@@ -184,6 +188,13 @@ impl ScanOptions {
         };
 
         let randomize_targets = matches.is_present("random");
+
+        
+
+        let oui_file: String = match matches.value_of("oui-file") {
+            Some(file) => file.to_string(),
+            None => "/usr/share/arp-scan/ieee-oui.csv".to_string()
+        };
 
         Arc::new(ScanOptions {
             interface_name,
@@ -195,7 +206,8 @@ impl ScanOptions {
             retry_count,
             interval_ms,
             randomize_targets,
-            output
+            output,
+            oui_file
         })
     }
 

src/main.rs

@@ -107,7 +107,7 @@ fn main() {
     let timed_out = Arc::new(AtomicBool::new(false));
     let cloned_timed_out = Arc::clone(&timed_out);
 
-    let mut vendor_list = Vendor::new();
+    let mut vendor_list = Vendor::new(&scan_options.oui_file);
 
     let cloned_options = Arc::clone(&scan_options);
     let arp_responses = thread::spawn(move || network::receive_arp_responses(&mut rx, cloned_options, cloned_timed_out, &mut vendor_list));