reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the full EthernetDecoder available to LogFrame

Browse Source 
So that LogFrame can include information about the decoded frame beyond
the ethernet layer.
This commit is contained in:
David Wragg committed 2015-06-25 17:11:20 +01:00
1 parent ea59c6c065
commit 4162dcafd3
5 files changed
+35 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

prog/weaver/main.go
+4 -4
View File
@@ -192,14 +192,14 @@ func options() map[string]string {
func logFrameFunc(debug bool) weave.LogFrameFunc {
if !debug {
return func(prefix string, frame []byte, eth *layers.Ethernet) {}
return func(prefix string, frame []byte, dec *weave.EthernetDecoder) {}
}
return func(prefix string, frame []byte, eth *layers.Ethernet) {
return func(prefix string, frame []byte, dec *weave.EthernetDecoder) {
h := fmt.Sprintf("%x", sha256.Sum256(frame))
if eth == nil {
if dec == nil {
log.Println(prefix, len(frame), "bytes (", h, ")")
} else {
log.Println(prefix, len(frame), "bytes (", h, "):", eth.SrcMAC, "->", eth.DstMAC)
log.Println(prefix, len(frame), "bytes (", h, "):", dec.Eth.SrcMAC, "->", dec.Eth.DstMAC)
}
}
}