* updated README, use from import instead of import for examples. both work

* added new function for another_same_vid(). generates a new mac address
based on same VID as a provided MAC
* Bugfix, changed "none" to None in the lookup table. This was changed in the
functions, but some reason, not in the lookup table

Author: NetworkJack2

README.md

@@ -28,51 +28,57 @@ Usage
 Import and set up an object.
 
 ```
-import generate_mac
-g = generate_mac.generate_mac
+from generate_mac import generate_mac
 ```
 
 Procedurely generated Vendor and Host bytes. Checks for broadcast bit
 
 ```
-g.total_random()
-'12:7E:C4:B5:F1:8E'
+generate_mac.total_random()
+'7E:CD:60:1E:AC:6E'
 ```
 
 Read Vendor bytes from random line in a file. This has to be formated the same
 as wireshark's manuf file.
 ```
-g.vid_file_random('/usr/share/wireshark/manuf')
-'00:55:DA:10:FB:D8'
+generate_mac.vid_file_random('/usr/share/wireshark/manuf')
+'70:B3:D5:C5:40:49'
 ```
 
 Read from a manuf file like above, but find Vendor bytes belonging to a specific
 vendor, by name.
 ```
-g.vid_file_vendor('/usr/share/wireshark/manuf', 'Apple')
-'94:0C:98:BC:74:1C'
+generate_mac.vid_file_vendor('/usr/share/wireshark/manuf', '3Com')
+'00:06:8C:C7:3F:93'
 ```
 
 Provide the vendor bytes in a string. Generate Host bytes only
 ```
-g.vid_provided('AA:BB:CC')
-'AA:BB:CC:B8:B3:01'
+generate_mac.vid_provided('00:06:8C')
+'00:06:8C:35:5E:C4'
 ```
 
 List valid vendor options as a list.
 ```
-g.list_vendors('/usr/share/wireshark/manuf')
+generate_mac.list_vendors('/usr/share/wireshark/manuf')
 ['Vendor1','Vendor2','etc']
 ```
 
-Check if a MAC address is valid
+Check if a MAC address is valid. returns a Bool(True,False)
 ```
-if g.is_mac_address('94:0C:98:BC:74:1C') == True:
-    print('Valid Ethernet Address')
+generate_mac.is_mac_address('00:06:8C:35:5E:C4')
+True
+
 ```
 
 Get the VID bytes from a MAC address
 ```
-g.get_vid_bytes('94:0C:98:BC:74:1C')
-'94:0C:98'
+generate_mac.get_vid_bytes('00:06:8C:35:5E:C4')
+'00:06:8C'
+```
+
+Generate another MAC from the same VID bytes as current MAC
+```
+generate_mac.another_same_vid('00:06:8C:35:5E:C4')
+'00:06:8C:3D:C2:F2'
 ```

generate_mac/__init__.py

@@ -12,7 +12,7 @@ class generate_mac():
     '36':2,
     '32':3,
     '28':4,
-    'none':6,
+    None:6,
     }
     def _strip_comments(in_list):
         '''Proccesses out comments using # as the comment character'''
@@ -208,14 +208,25 @@ def is_mac_address(mac_address):
             return False
 
     def get_vid_bytes(mac_address):
-        '''return vendor bytes from a given MAC address as a string'''
+        '''Return vendor bytes from a given MAC address as a string'''
         # check if this is a valid mac address
         if generate_mac.is_mac_address(mac_address) != True:
-            raise ValueError(mac_address + ' is not a validi MAC address')
+            raise ValueError(mac_address + ' is not a valid MAC address')
 
         output = ""
         # Grab the first three bytes, this is the VID
         mac_bytes = mac_address.split(":")
         output = ":".join(mac_bytes[0:3])
 
         return output
+    
+    def another_same_vid(mac_address):
+        '''Generate another MAC address from the same VID bytes'''
+        output = ""
+            
+        vid_bytes = generate_mac.get_vid_bytes(mac_address)
+        dev_bytes = generate_mac._gen_rand_bytes(3)
+        output    = vid_bytes + ":" + dev_bytes
+        output    = output.upper()
+
+        return output