Skip to content
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

Change af_packet API version #699

Merged
merged 1 commit into from
Feb 22, 2023
Merged

Change af_packet API version #699

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
22 changes: 5 additions & 17 deletions pkg/networkservice/mechanisms/kernel/kernelvethpair/afpacket/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import (

"git.fd.io/govpp.git/api"
"github.com/edwarnicke/govpp/binapi/af_packet"
interfaces "github.com/edwarnicke/govpp/binapi/interface"
"github.com/edwarnicke/govpp/binapi/interface_types"
"github.com/networkservicemesh/api/pkg/api/networkservice"
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/kernel"
"github.com/networkservicemesh/sdk/pkg/tools/log"
Expand All @@ -49,31 +47,21 @@ func create(ctx context.Context, conn *networkservice.Connection, vppConn api.Co
return errors.New("peer link not found")
}
now := time.Now()
rsp, err := af_packet.NewServiceClient(vppConn).AfPacketCreate(ctx, &af_packet.AfPacketCreate{
rsp, err := af_packet.NewServiceClient(vppConn).AfPacketCreateV3(ctx, &af_packet.AfPacketCreateV3{
Mode: af_packet.AF_PACKET_API_MODE_ETHERNET,
HostIfName: peerLink.Attrs().Name,
HwAddr: types.ToVppMacAddress(&peerLink.Attrs().HardwareAddr),
Flags: af_packet.AF_PACKET_API_FLAG_VERSION_2,
})
if err != nil {
return errors.Wrap(err, "vppapi AfPacketCreate returned error")
return errors.Wrap(err, "vppapi AfPacketCreateV3 returned error")
}
log.FromContext(ctx).
WithField("swIfIndex", rsp.SwIfIndex).
WithField("duration", time.Since(now)).
WithField("vppapi", "AfPacketCreate").Debug("completed")
WithField("vppapi", "AfPacketCreateV3").Debug("completed")
ifindex.Store(ctx, isClient, rsp.SwIfIndex)

now = time.Now()
if _, err := interfaces.NewServiceClient(vppConn).SwInterfaceSetRxMode(ctx, &interfaces.SwInterfaceSetRxMode{
SwIfIndex: rsp.SwIfIndex,
Mode: interface_types.RX_MODE_API_ADAPTIVE,
}); err != nil {
return errors.Wrap(err, "vppapi SwInterfaceSetRxMode returned error")
}
log.FromContext(ctx).
WithField("swIfIndex", rsp.SwIfIndex).
WithField("mode", interface_types.RX_MODE_API_ADAPTIVE).
WithField("duration", time.Since(now)).
WithField("vppapi", "SwInterfaceSetRxMode").Debug("completed")
up.Store(ctx, isClient, true)
}
return nil
Expand Down