Skip to content

add ability to handle pointers in layerString #121

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
mosajjal merged 2 commits into from
Jul 21, 2025
Merged

add ability to handle pointers in layerString #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d20d27e
add ability to handle pointers in layerString
wardviaene Jul 2, 2025
6b2676d
copilot suggestions
wardviaene Jul 15, 2025
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
10 changes: 8 additions & 2 deletions packet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,14 @@ func LayerDump(l Layer) string {
func layerString(v reflect.Value, anonymous bool, writeSpace bool) string {
// Let String() functions take precedence.
if v.CanInterface() {
if s, ok := v.Interface().(fmt.Stringer); ok {
return s.String()
if v.CanAddr() && v.Addr().CanInterface() {
if s, ok := v.Addr().Interface().(fmt.Stringer); ok {
return s.String()
}
} else {
if s, ok := v.Interface().(fmt.Stringer); ok {
return s.String()
}
}
}
// Reflect, and spit out all the exported fields as key=value.
Expand Down
21 changes: 21 additions & 0 deletions packet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,34 @@ type embedding struct {
C, D int
}

type embeddedPointer struct {
A, B *int
AA, BB *string
}

type embeddingPointer struct {
embeddedPointer
C, D int
}

func TestDumpEmbedded(t *testing.T) {
e := embedding{embedded: embedded{A: 1, B: 2}, C: 3, D: 4}
if got, want := layerString(reflect.ValueOf(e), false, false), "{A=1 B=2 C=3 D=4}"; got != want {
t.Errorf("embedded dump mismatch:\n got: %v\n want: %v", got, want)
}
}

func TestDumpEmbeddedPointer(t *testing.T) {
one := 1
two := 2
testString1 := "teststring1"
testString2 := "teststring2"
e := embeddingPointer{embeddedPointer: embeddedPointer{A: &one, B: &two, AA: &testString1, BB: &testString2}, C: 3, D: 4}
if got, want := layerString(reflect.ValueOf(e), false, false), "{A=1 B=2 AA=teststring1 BB=teststring2 C=3 D=4}"; got != want {
t.Errorf("embedded pointer dump mismatch:\n got: %v\n want: %v", got, want)
}
}

type singlePacketSource [1][]byte

func (s *singlePacketSource) ReadPacketData() ([]byte, CaptureInfo, error) {
Expand Down
Loading