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

bfd : removed merge errors #571

Merged
merged 2 commits into from
Mar 5, 2024
Merged

bfd : removed merge errors #571

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbc4cea
bfd : removed merge errors
TrekkieCoder Mar 5, 2024
88947f1
Merge branch 'loxilb-io:main' into main
TrekkieCoder Mar 5, 2024
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
2 changes: 0 additions & 2 deletions proto/bfd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ type Notifer interface {

type bfdSession struct {
RemoteName string
SourceIP string
Instance string
Cxn net.Conn
State SessionState
Expand Down Expand Up @@ -426,7 +425,6 @@ func (b *bfdSession) initialize(remoteIP string, sourceIP string, port uint16, i
if myIP == nil {
return errors.New("source address malformed")
}
b.SourceIP = sourceIP

if myIP.IsUnspecified() {
myIP = getMyDisc(ip)
Expand Down
Loading