Update bnida to support the latest Binary Ninja API 3.4.4271 @Diefunc…

…tion  (#23)

binja/binja_export.py

@@ -3,7 +3,7 @@
 """
 
 import json
-from binaryninja import SaveFileNameField, get_form_input, BackgroundTaskThread
+from binaryninja import SaveFileNameField, get_form_input, BackgroundTaskThread, types
 from collections import OrderedDict
 
 
@@ -110,27 +110,23 @@ def get_structures(self):
         """
 
         structures = OrderedDict()
-        for type_token in self.bv.types:
-            typ = self.bv.get_type_by_name(type_token)
-            if typ.structure is None:
-                continue
-
-            struct_name = type_token.name[0]
-            members = {}
-            for member in typ.structure.members:
-                members[member.name] = {}
-                members[member.name]['offset'] = member.offset
-                members[member.name]['size'] = member.type.width
-                members[member.name]['type'] = ''
-                for token in member.type.tokens:
-                    members[member.name]['type'] += str(token)
-
-            structures[struct_name] = {}
-            structures[struct_name]['size'] = typ.structure.width
-            structures[struct_name]['members'] = members
-
+        for type_name, vtype in self.bv.types:
+            if type(vtype) == types.StructureType:
+                struct_name = str(type_name)
+                members = {}
+                for member in vtype.members:
+                    members[member.name] = {}
+                    members[member.name]['offset'] = member.offset
+                    members[member.name]['size']   = member.type.width
+                    members[member.name]['type']   = ''
+                    for token in member.type.tokens:
+                        members[member.name]['type'] += str(token)
+                structures[struct_name] = {}
+                structures[struct_name]['size'] = vtype.width
+                structures[struct_name]['members'] = members
         return structures
 
+
     def run(self):
         """
         Export analysis data to bnida JSON file

binja/binja_import.py

@@ -147,7 +147,7 @@ def import_structures(self, structs):
         """
 
         for struct_name, struct_info in structs.items():
-            struct = types.Structure()
+            struct = types.StructureBuilder.create()
             for member_name, member_info in struct_info['members'].items():
                 try:
                     typ, _ = self.bv.parse_type_string('{}'.format(