arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Fixes unknown nvram format for IOU. Fixes #594.

Browse Source
This commit is contained in:
grossmj 2016-09-07 12:41:13 -06:00
parent 62377315dd
commit de526482e3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/compute/iou/utils/iou_import.py
View File

@ -64,9 +64,10 @@ def put_uint32(data, off, value):
# calculate padding # calculate padding
def padding(off, ios): def padding(off, ios, nvram_len):
pad = (4 - off % 4) % 4 # padding to alignment of 4 pad = (4 - off % 4) % 4 # padding to alignment of 4
if ios <= 0x0F00 and pad != 0: # add 4 if IOS <= 15.0 # add 4 if IOS <= 15.0 or NVRAM area >= 64KB
if (ios <= 0x0F00 or nvram_len >= 64 * 1024) and pad != 0:
pad += 4 pad += 4
return pad return pad
@ -118,7 +119,7 @@ def nvram_import(nvram, startup, private, size):
if get_uint16(nvram, 0) == 0xABCD: if get_uint16(nvram, 0) == 0xABCD:
ios = get_uint16(nvram, 6) ios = get_uint16(nvram, 6)
config_len = 36 + get_uint32(nvram, 16) config_len = 36 + get_uint32(nvram, 16)
config_len += padding(config_len, ios) config_len += padding(config_len, ios, nvram_len)
if get_uint16(nvram, config_len) == 0xFEDC: if get_uint16(nvram, config_len) == 0xFEDC:
config_len += 16 + get_uint32(nvram, config_len + 12) config_len += 16 + get_uint32(nvram, config_len + 12)
except IndexError: except IndexError:
@ -158,7 +159,7 @@ def nvram_import(nvram, startup, private, size):
put_uint32(new_nvram, 12, BASE_ADDRESS + 36 + len(startup)) # end address put_uint32(new_nvram, 12, BASE_ADDRESS + 36 + len(startup)) # end address
put_uint32(new_nvram, 16, len(startup)) # length put_uint32(new_nvram, 16, len(startup)) # length
new_nvram.extend(startup) new_nvram.extend(startup)
new_nvram.extend([0] * padding(len(new_nvram), ios)) new_nvram.extend([0] * padding(len(new_nvram), ios, nvram_len))
# import private config # import private config
if private is None: if private is None: