aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/vishvananda/netlink/xfrm_state.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-23 06:15:11 -0800
committerGitHub <noreply@github.com>2020-01-23 06:15:11 -0800
commit8098cbbee192e644de505e62c4aa0341f4acb4a5 (patch)
tree50af7ba7e829ab4d6fc9ba143e13f79dc04f4f64 /vendor/github.com/vishvananda/netlink/xfrm_state.go
parentc5f3899cb4133922a9732aff4680bb7eea3d391b (diff)
parent9f927c4709a51ef72d84bb557fc371d535c19fba (diff)
downloadpodman-8098cbbee192e644de505e62c4aa0341f4acb4a5.tar.gz
podman-8098cbbee192e644de505e62c4aa0341f4acb4a5.tar.bz2
podman-8098cbbee192e644de505e62c4aa0341f4acb4a5.zip
Merge pull request #4946 from containers/dependabot/go_modules/github.com/vishvananda/netlink-1.1.0
build(deps): bump github.com/vishvananda/netlink from 1.0.0 to 1.1.0
Diffstat (limited to 'vendor/github.com/vishvananda/netlink/xfrm_state.go')
-rw-r--r--vendor/github.com/vishvananda/netlink/xfrm_state.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/vendor/github.com/vishvananda/netlink/xfrm_state.go b/vendor/github.com/vishvananda/netlink/xfrm_state.go
index d14740dc5..483d8934a 100644
--- a/vendor/github.com/vishvananda/netlink/xfrm_state.go
+++ b/vendor/github.com/vishvananda/netlink/xfrm_state.go
@@ -94,6 +94,8 @@ type XfrmState struct {
Limits XfrmStateLimits
Statistics XfrmStateStats
Mark *XfrmMark
+ OutputMark int
+ Ifid int
Auth *XfrmStateAlgo
Crypt *XfrmStateAlgo
Aead *XfrmStateAlgo
@@ -102,8 +104,8 @@ type XfrmState struct {
}
func (sa XfrmState) String() string {
- return fmt.Sprintf("Dst: %v, Src: %v, Proto: %s, Mode: %s, SPI: 0x%x, ReqID: 0x%x, ReplayWindow: %d, Mark: %v, Auth: %v, Crypt: %v, Aead: %v, Encap: %v, ESN: %t",
- sa.Dst, sa.Src, sa.Proto, sa.Mode, sa.Spi, sa.Reqid, sa.ReplayWindow, sa.Mark, sa.Auth, sa.Crypt, sa.Aead, sa.Encap, sa.ESN)
+ return fmt.Sprintf("Dst: %v, Src: %v, Proto: %s, Mode: %s, SPI: 0x%x, ReqID: 0x%x, ReplayWindow: %d, Mark: %v, OutputMark: %d, Ifid: %d, Auth: %v, Crypt: %v, Aead: %v, Encap: %v, ESN: %t",
+ sa.Dst, sa.Src, sa.Proto, sa.Mode, sa.Spi, sa.Reqid, sa.ReplayWindow, sa.Mark, sa.OutputMark, sa.Ifid, sa.Auth, sa.Crypt, sa.Aead, sa.Encap, sa.ESN)
}
func (sa XfrmState) Print(stats bool) string {
if !stats {