Skip to content

Commit

Permalink
Manual dependencies update
Browse files Browse the repository at this point in the history
Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
  • Loading branch information
glazychev-art committed Jan 25, 2022
1 parent ef6622e commit aa2123a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ require (
github.com/networkservicemesh/api v1.1.2-0.20220119092736-21eda250c390
github.com/networkservicemesh/sdk v0.5.1-0.20220124073803-419fa7053a1a
github.com/networkservicemesh/sdk-k8s v0.0.0-20220120084602-e17b3e54e603
github.com/networkservicemesh/sdk-sriov v0.0.0-20220124074808-6eb537000575
github.com/networkservicemesh/sdk-vpp v0.0.0-20220124162243-63c4025e5d02
github.com/networkservicemesh/sdk-sriov v0.0.0-20220124162404-d41c26fbdf72
github.com/networkservicemesh/sdk-vpp v0.0.0-20220125043716-fe7cf740f889
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0-beta.2
github.com/stretchr/testify v1.7.0
github.com/thanhpk/randstr v1.0.4
github.com/vishvananda/netlink v1.1.0
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae
github.com/vishvananda/netlink v1.1.1-0.20220118170537-d6b03fdeb845
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74
google.golang.org/grpc v1.42.0
)
22 changes: 11 additions & 11 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -388,12 +388,12 @@ github.com/networkservicemesh/sdk v0.5.1-0.20220124073803-419fa7053a1a h1:VSV85C
github.com/networkservicemesh/sdk v0.5.1-0.20220124073803-419fa7053a1a/go.mod h1:u3HgGqMae6MFZ//JRrN8CkEJ7pwr+CWBG7cvHymhHDY=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220120084602-e17b3e54e603 h1:Y5g41QvLMlVyCTBaBosFWGD9cauU1lja30jvi2Xb55w=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220120084602-e17b3e54e603/go.mod h1:daomInenPepn8gQck45Z6zcUWsQbsdli6JmPRPe0CNI=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220124074135-d78e942e0bc2 h1:xL0h60MMtjwWZVxJZ6mohq7sV2z3tzGCKB22jW6DkmY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220124074135-d78e942e0bc2/go.mod h1:giRLbG501oSMWSA45Mj+3n9mlkLtHfjLFzhbdAw+2Nc=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220124074808-6eb537000575 h1:W0hFazZsHyyl3PZX2euuFxRDqD4zAfUZHOYMCHPNtJ4=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220124074808-6eb537000575/go.mod h1:OrRbpGfWzTTZtOPijW2QNyviC59Gg9BDX7lKS/gbAUE=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220124162243-63c4025e5d02 h1:LZN2aqWPioIU6K7oHm8xpW7MpxfF/RsHUIelIJNff0E=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220124162243-63c4025e5d02/go.mod h1:HVU79WyqgL7ZmsXFgRJCpwtw4PltHP5FcrCADp1Gg94=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220124162134-500ed3134da5 h1:RU6tEZigx/zX2cRwSke2BVFNCLQipaxeu0JYTwWbYoE=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220124162134-500ed3134da5/go.mod h1:DvBiFXiN7umMQISiuU2L1XChqqIYE43lgoeDXflJTRk=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220124162404-d41c26fbdf72 h1:sU3PMXxfVmkJ6eJ/K4UYguzKQUPwc+dIl/GwYPGnniM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220124162404-d41c26fbdf72/go.mod h1:BJMxnxKmvt3sLRqg6XpjGJc8MIS4npU6TL5t+vFEOeQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220125043716-fe7cf740f889 h1:qmoaToG3bOX3EEbxAU848I2VARryrCsL77vfGgKE8Zc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220125043716-fe7cf740f889/go.mod h1:RdukwAt4yqJiZzdNS9FnlfkAoQtqPGgj1bUHRpiqTG8=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
Expand Down Expand Up @@ -509,11 +509,11 @@ github.com/thanhpk/randstr v1.0.4/go.mod h1:M/H2P1eNLZzlDwAzpkkkUvoyNNMbzRGhESZu
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=
github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns=
github.com/vishvananda/netlink v1.1.1-0.20220118170537-d6b03fdeb845 h1:bIVwDExax2ZzN6mYF8Az0ms0wg+v/LYA4VI8x1TSQcs=
github.com/vishvananda/netlink v1.1.1-0.20220118170537-d6b03fdeb845/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
Expand Down Expand Up @@ -711,7 +711,6 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand All @@ -737,6 +736,7 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200610111108-226ff32320da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand Down
8 changes: 5 additions & 3 deletions internal/vppinit/vppinit.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2020-2021 Cisco and/or its affiliates.
// Copyright (c) 2020-2022 Cisco and/or its affiliates.
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down Expand Up @@ -154,7 +154,8 @@ func LinkToAfPacket(ctx context.Context, vppConn api.Connection, tunnelIP net.IP
},
},
}
for _, route := range routes {
for i := range routes {
route := routes[i]
if route.Gw != nil {
routeIsIpv6 := route.Gw.To4() == nil
ipRouteAddDel.Route.Paths[0].Nh.Address = types.ToVppAddress(route.Gw).Un
Expand Down Expand Up @@ -297,7 +298,8 @@ func defaultRouteLink(ctx context.Context) (netlink.Link, error) {
WithField("duration", time.Since(now)).
WithField("netlink", "RouteList").Debug("completed")

for _, route := range routes {
for i := range routes {
route := routes[i]
// Is it a default route?
if route.Dst != nil {
ones, _ := route.Dst.Mask.Size()
Expand Down

0 comments on commit aa2123a

Please sign in to comment.