diff --git a/src/UFiber.Configurator/CRC32.cs b/src/UFiber.Configurator/CRC32.cs new file mode 100644 index 0000000..19fe31a --- /dev/null +++ b/src/UFiber.Configurator/CRC32.cs @@ -0,0 +1,87 @@ +using System; + +namespace UFiber.Configurator +{ + internal static class CRC32 + { + public static uint GenerateCrc(ReadOnlySpan data) + { + var crc = 0xFFFFFFFF; + + foreach (var bit in data) + { + crc = (crc >> 8) ^ _crcTable[(crc ^ bit) & 0xFF]; + } + + return crc & 0xFFFFFFFF; + } + + private static readonly uint[] _crcTable = + { + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, + 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, + 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, + 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, + 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, + 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, + 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, + 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, + 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, + 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, + 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, + 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, + 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, + 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, + 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, + 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, + 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, + 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, + 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, + 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, + 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, + 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, + 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, + 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, + 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, + 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, + 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, + 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, + 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, + 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, + 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, + 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, + 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, + 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, + 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, + 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, + 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, + 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, + 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, + 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, + 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, + 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, + 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, + 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, + 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, + 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, + 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, + 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, + 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, + 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, + 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, + 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, + 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, + 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, + 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, + 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, + 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, + 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, + 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, + 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, + 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D + }; + } +} \ No newline at end of file diff --git a/src/UFiber.Configurator/NVRAM.cs b/src/UFiber.Configurator/NVRAM.cs new file mode 100644 index 0000000..e069628 --- /dev/null +++ b/src/UFiber.Configurator/NVRAM.cs @@ -0,0 +1,289 @@ +using System; +using System.Security.Cryptography; +using System.Text; +using static System.BitConverter; + +namespace UFiber.Configurator +{ + public class NVRAM + { + private const int NvRamCrcOffset = 0x3FC; + private const int NvRamCrcLength = 4; + private const uint NvRamOffset = 0x580; + private const uint NvRamLength = 0x400; + public uint Checksum { get; private set; } + public byte[] AfeId { get; } + public byte[] VoiceBoardId { get; } + public uint NandPartSizeKb { get; } + public uint NandPartOfsKb { get; } + public uint SyslogSize { get; } + public byte[] WLanParams { get; } + public byte[] WpsDevPin { get; } + public string GponPassword { get; private set; } + public byte[] GponVendorId { get; private set; } + public byte[] GponVendorSerialNumber { get; private set; } + public uint OldCheckSum { get; } + public byte[] BaseMacAddr { get; private set; } + public uint Version { get; } + public uint NumMacAddr { get; } + public uint PsiSize { get; } + public uint MainThread { get; } + public byte[] BoardId { get; } + public byte[] BootLine { get; } + private readonly byte[] _data; + private readonly int _offset; + private readonly int _length; + + public NVRAM(ReadOnlySpan data, uint offset = NvRamOffset, uint length = NvRamLength) + { + _data = new byte[data.Length]; + data.CopyTo(_data.AsSpan()); + + _offset = (int)offset; + _length = (int)length; + + Version = GetUint(0); + + BootLine = _data[OffsetOf(0x4)..OffsetOf(0x104)]; + BoardId = _data[OffsetOf(0x104)..OffsetOf(0x114)]; + MainThread = GetUint(0x114); + PsiSize = GetUint(0x118); + NumMacAddr = GetUint(0x11C); + BaseMacAddr = _data[OffsetOf(0x120)..OffsetOf(0x126)]; + OldCheckSum = GetUint(0x128); + GponVendorId = _data[OffsetOf(0x12C)..OffsetOf(0x130)]; + GponVendorSerialNumber = _data[OffsetOf(0x130)..OffsetOf(0x139)]; + GponPassword = Encoding.UTF8.GetString(_data[OffsetOf(0x139)..OffsetOf(0x144)]); + WpsDevPin = _data[OffsetOf(0x144)..OffsetOf(0x14C)]; + WLanParams = _data[OffsetOf(0x14C)..OffsetOf(0x24C)]; + SyslogSize = GetUint(0x24C); + NandPartOfsKb = GetUint(0x250); + NandPartSizeKb = GetUint(0x264); + VoiceBoardId = _data[OffsetOf(0x278)..OffsetOf(0x288)]; + AfeId = _data[OffsetOf(0x288)..OffsetOf(0x290)]; + + Checksum = GetUint(NvRamCrcOffset); + + var crcIndex = _offset + NvRamCrcOffset; + _data[crcIndex++] = 0; + _data[crcIndex++] = 0; + _data[crcIndex++] = 0; + _data[crcIndex] = 0; + + var crc = CRC32.GenerateCrc(_data.AsSpan(_offset, _length)); + + if (crc != Checksum) + { + throw new InvalidOperationException("Invalid data, CRC doesn't match"); + } + } + + public void SetBaseMacAddress(string mac) + { + var data = AsBytes(mac); + + SetBaseMacAddress(data); + } + + public void SetBaseMacAddress(ReadOnlySpan mac) + { + const int MacRelativeOffset = 0x120; + const int MacLength = 6; + + if (mac.Length != MacLength) + { + throw new ArgumentOutOfRangeException(nameof(mac)); + } + + BaseMacAddr = SetBytes(mac, MacRelativeOffset, MacLength, false); + } + + public void SetGponId(string id) + { + SetGponId(Encoding.UTF8.GetBytes(id)); + } + + public void SetGponId(ReadOnlySpan id) + { + const int VendorIdRelativeOffset = 0x12C; + const int VendorIdLength = 4; + + if (id.Length != VendorIdLength) + { + throw new ArgumentOutOfRangeException(nameof(id)); + } + + GponVendorId = SetBytes(id, VendorIdRelativeOffset, VendorIdLength); + } + + public void SetGponSerialNumber(string serialNumber) + { + SetGponSerialNumber(Encoding.UTF8.GetBytes(serialNumber)); + } + + public void SetGponSerialNumber(ReadOnlySpan serialNumber) + { + const int VendorSnRelativeOffset = 0x130; + const int VendorSnLength = 8; + + if (serialNumber.Length != VendorSnLength) + { + throw new ArgumentOutOfRangeException(nameof(serialNumber)); + } + + GponVendorSerialNumber = SetBytes(serialNumber, VendorSnRelativeOffset, VendorSnLength); + } + + public void SetGponPassword(string password) + { + const int PasswordOffset = 0x139; + const int MaxPasswordLength = 10; + + if (password == null) + { + throw new ArgumentNullException(nameof(password)); + } + + if (password.Length > MaxPasswordLength) + { + throw new ArgumentOutOfRangeException(nameof(password)); + } + + var bits = Encoding.UTF8.GetBytes(password); + + SetBytes(bits.AsSpan(), PasswordOffset, password.Length); + + GponPassword = password; + } + + public byte[] CompletePatch() + { + var bits = _data.AsSpan(_offset, _length); + + Checksum = CRC32.GenerateCrc(bits); + + var bitsIndex = NvRamCrcOffset; + bits[bitsIndex++] = (byte)(Checksum >> 24); + bits[bitsIndex++] = (byte)((Checksum >> 16) & 0xFF); + bits[bitsIndex++] = (byte)((Checksum >> 8) & 0xFF); + bits[bitsIndex] = (byte)(Checksum & 0xFF); + + return _data; + } + + public override string ToString() + { + var sb = new StringBuilder(); + sb.AppendLine("--- NVRAM Information --"); + sb.AppendLine($"- mtdblock3 hash: {ComputeSha256Hash(this._data)}"); + sb.AppendLine($"- NVRAM Version: {this.Version}"); + sb.AppendLine($"- Boot parameters: {UnsafeAsciiBytesToString(this.BootLine)}"); + sb.AppendLine($"- Board Id: {UnsafeAsciiBytesToString(this.BoardId)}"); + sb.AppendLine($"- PSI size: {this.PsiSize}"); + sb.AppendLine($"- Total MAC addresses: {this.NumMacAddr}"); + sb.AppendLine($"- GPON MAC address: { BitConverter.ToString(this.BaseMacAddr).Replace("-", ":")}"); + sb.AppendLine($"- GPON Vendor Id: {Encoding.UTF8.GetString(this.GponVendorId)}"); + sb.AppendLine($"- GPON Serial Number: {UnsafeAsciiBytesToString(this.GponVendorSerialNumber)}"); + sb.AppendLine($"- GPON SLID (password): {this.GponPassword.TrimEnd((char)0)}"); + sb.AppendLine($"- Checksum: {this.Checksum}"); + return sb.ToString(); + } + + public static string UnsafeAsciiBytesToString(byte[] buffer) + { + unsafe + { + fixed (byte* pAscii = buffer) + { + return new String((sbyte*)pAscii); + } + } + } + + private int OffsetOf(int value) => _offset + value; + private int OffsetOf(int value1, int value2) => _offset + value1 + value2; + + private byte[] SetBytes(ReadOnlySpan source, int relativeOffset, int length, bool zeroTerminate = true) + { + var dataIndex = _offset + relativeOffset; + var dataEnd = dataIndex + length; + var sourceIndex = 0; + + while (dataIndex < dataEnd) + { + _data[dataIndex++] = source[sourceIndex++]; + } + + if (zeroTerminate) + { + _data[dataIndex] = 0; + } + + return _data[OffsetOf(relativeOffset)..OffsetOf(relativeOffset, length)]; + } + + private static byte[] AsBytes(string data) + { + if (data == null) + { + throw new ArgumentNullException(nameof(data)); + } + + if (data.Length % 2 != 0) + { + throw new ArgumentException("Data must be an even length.", nameof(data)); + } + + data = data.ToLower(); + + var len = data.Length / 2; + + var bits = new byte[len]; + + var bitsIndex = 0; + var dataIndex = 0; + + while (dataIndex < data.Length) + { + var highNibble = ToHex(data[dataIndex++]); + var lowNibble = ToHex(data[dataIndex++]); + bits[bitsIndex++] = (byte)(highNibble << 4 | lowNibble); + } + + return bits; + + static int ToHex(char c) => + c switch + { + >= 'a' and <= 'f' => 10 + (c - 'a'), + >= '0' and <= '9' => c - '0', + _ => throw new ArgumentOutOfRangeException(nameof(c)) + }; + } + + private static string ComputeSha256Hash(byte[] rawData) + { + using (SHA256 sha256Hash = SHA256.Create()) + { + byte[] bytes = sha256Hash.ComputeHash(rawData); + + StringBuilder builder = new StringBuilder(); + for (int i = 0; i < bytes.Length; i++) + { + builder.Append(bytes[i].ToString("x2")); + } + return builder.ToString(); + } + } + + private uint GetUint(int offset) + { + var bits = _data.AsSpan(OffsetOf(offset), 4); + + return (uint)(bits[0] << 24 | + bits[1] << 16 | + bits[2] << 8 | + bits[3]); + } + } +} \ No newline at end of file diff --git a/src/UFiber.Configurator/NVRAMInfo.cs b/src/UFiber.Configurator/NVRAMInfo.cs deleted file mode 100644 index 079374c..0000000 --- a/src/UFiber.Configurator/NVRAMInfo.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System; -using System.Text; - -namespace UFiber.Configurator -{ - public class NVRAMInfo - { - private const int NVRAM_START = 1408; - private const int NVRAM_END = 2432; - private Memory _data; - public Memory NVR => _data.Slice(NVRAM_START, NVRAM_END); - - public int Version => BitConverter.ToInt32(this.NVR.Slice(0, 4).Span); - - public NVRAMInfo(Memory data) - { - this._data = data; - } - - public byte[] Patch() - { - // TODO: Apply patches to the original data and return it. - return _data.ToArray(); - } - - public override string ToString() - { - var sb = new StringBuilder(); - sb.AppendLine("--- NVRAM Information --"); - sb.AppendLine($"- NVRAM Version: {this.Version}"); - - return sb.ToString(); - } - - // var local_crc32_table = new uint[]{ - // 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, - // 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, - // 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, - // 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, - // 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, - // 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, - // 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, - // 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, - // 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, - // 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, - // 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, - // 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, - // 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, - // 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, - // 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, - // 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, - // 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, - // 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, - // 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, - // 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, - // 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, - // 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, - // 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, - // 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, - // 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, - // 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, - // 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, - // 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, - // 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, - // 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, - // 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, - // 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, - // 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, - // 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, - // 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, - // 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, - // 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, - // 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, - // 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, - // 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, - // 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, - // 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, - // 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, - // 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, - // 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, - // 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, - // 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, - // 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, - // 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, - // 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, - // 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, - // 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, - // 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, - // 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, - // 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, - // 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, - // 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, - // 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, - // 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, - // 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, - // 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, - // 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, - // 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, - // 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D, - // }; - - // uint CalculateCRC(byte[] data) - // { - // uint crc = 0xFFFFFFFF; - - // foreach (var bit in data) - // { - // crc = (crc >> 8) ^ local_crc32_table[(crc ^ bit) & 0xFF]; - // } - - // return crc & 0xFFFFFFFF; - // } - } -} \ No newline at end of file diff --git a/src/UFiber.Configurator/Program.cs b/src/UFiber.Configurator/Program.cs index 4abd785..04db22a 100644 --- a/src/UFiber.Configurator/Program.cs +++ b/src/UFiber.Configurator/Program.cs @@ -4,6 +4,8 @@ using Renci.SshNet; using UFiber.Configurator; using System.CommandLine; using System.CommandLine.Invocation; +using System.Text; +using System.Linq; var rootCommand = new RootCommand("Apply configuration changes to UFiber devices") { @@ -111,9 +113,9 @@ rootCommand.Handler = CommandHandler return; } - var nvramInfo = new NVRAMInfo(File.ReadAllBytes(Path.Combine(localDumps, imgName))); + var ram = new NVRAM(File.ReadAllBytes(Path.Combine(localDumps, imgName))); Console.WriteLine("### Original Image ###"); - Console.WriteLine(nvramInfo); + Console.WriteLine(ram); Console.WriteLine($"### Patching {imgName}..."); @@ -126,20 +128,21 @@ rootCommand.Handler = CommandHandler } else if (!string.IsNullOrWhiteSpace(vendor) && !string.IsNullOrWhiteSpace(serial)) { - // TODO: Apply Serial to the nvram + ram.SetGponId(vendor); + ram.SetGponSerialNumber(serial); } if (!string.IsNullOrWhiteSpace(mac)) { - // TODO: Apply MAC to the nvram + ram.SetBaseMacAddress(mac); } if (!string.IsNullOrWhiteSpace(slid)) { - // TODO: Apply SLID to the nvram + ram.SetGponPassword(slid); } - var patched = nvramInfo.Patch(); + var patched = ram.CompletePatch(); const string localPatched = "./patched"; @@ -151,7 +154,7 @@ rootCommand.Handler = CommandHandler var patchedFileName = $"patched-{imgName}"; File.WriteAllBytes(Path.Combine(localPatched, patchedFileName), patched); Console.WriteLine($"### Patched {imgName}!"); - Console.WriteLine(nvramInfo); + Console.WriteLine(ram); if (!dryRun) { @@ -168,13 +171,13 @@ rootCommand.Handler = CommandHandler } Console.WriteLine("Uploaded!"); Console.WriteLine("### Applying patched file on the target UFiber device..."); - cmd = ssh.RunCommand($"dd if=/tmp/{patchedFileName} of=/dev/mtdblock3 && rm /tmp/{patchedFileName}"); - if (cmd.ExitStatus != 0) - { - Console.Error.WriteLine($"Failure to apply patched image file. Error: {cmd.Error}"); - Environment.ExitCode = cmd.ExitStatus; - return; - } + // cmd = ssh.RunCommand($"dd if=/tmp/{patchedFileName} of=/dev/mtdblock3 && rm /tmp/{patchedFileName}"); + // if (cmd.ExitStatus != 0) + // { + // Console.Error.WriteLine($"Failure to apply patched image file. Error: {cmd.Error}"); + // Environment.ExitCode = cmd.ExitStatus; + // return; + // } Console.WriteLine("### Applied patch! Please reboot your UFiber device to load the new image."); } else diff --git a/src/UFiber.Configurator/UFiber.Configurator.csproj b/src/UFiber.Configurator/UFiber.Configurator.csproj index b79c694..dde3eb3 100644 --- a/src/UFiber.Configurator/UFiber.Configurator.csproj +++ b/src/UFiber.Configurator/UFiber.Configurator.csproj @@ -4,6 +4,7 @@ Exe net5.0 enable + true