Skip to content

CB-305: bugfix: add padding to OUI bytes in PDID reports #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Halophilus merged 1 commit into from
Nov 3, 2026
+13 −3
Merged

CB-305: bugfix: add padding to OUI bytes in PDID reports #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/jeff/reply/id_report.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ defmodule Jeff.Reply.IdReport do
fw_build
>> = data

vendor = [vendor1, vendor2, vendor3] |> Enum.map_join(&hex/1)
serial = hex(serial) |> String.pad_leading(8, "0")
vendor = [vendor1, vendor2, vendor3] |> Enum.map_join(&hex(&1, 2))
serial = hex(serial, 8)
firmware = "#{fw_major}.#{fw_minor}.#{fw_build}"

%__MODULE__{
Expand All @@ -42,5 +42,5 @@ defmodule Jeff.Reply.IdReport do
}
end

defp hex(i), do: Integer.to_string(i, 16)
defp hex(i, length), do: Integer.to_string(i, 16) |> String.pad_leading(length, "0")
end
10 changes: 10 additions & 0 deletions test/reply/id_report_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,14 @@ defmodule ReplyIdReportTest do

assert actual == expected
end

test "vendor codes with leading zeroes get padded" do
leading_zeroes = IdReport.decode(<<1, 1, 1, 48, 1, 100, 106, 61, 0, 4, 8, 1>>)
all_zeroes = IdReport.decode(<<0, 0, 0, 48, 1, 100, 106, 61, 0, 4, 8, 1>>)
intermittent_zeroes = IdReport.decode(<<0, 16, 1, 48, 1, 100, 106, 61, 0, 4, 8, 1>>)

assert leading_zeroes.vendor == "010101"
assert all_zeroes.vendor == "000000"
assert intermittent_zeroes.vendor == "001001"
end
end
Loading