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

use SO_REUSEPORT_LB on FreeBSD #106

Merged
merged 6 commits into from
Aug 17, 2023
Merged

use SO_REUSEPORT_LB on FreeBSD #106

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e965df1
feat: Add support for SO_REUSEPORT_LB option as per freeBSD
chaitanyaprem Aug 4, 2023
280dee2
Merge branch 'libp2p:master' into feat/freebsd-lb-support
chaitanyaprem Aug 16, 2023
b9a6708
fix: address review comments
chaitanyaprem Aug 16, 2023
2f99b77
chore: updated to use build flags
chaitanyaprem Aug 16, 2023
82f33be
chore: remove unnecessary code
chaitanyaprem Aug 17, 2023
2f2c5e4
chore: fix gofmt error
chaitanyaprem Aug 17, 2023
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
7 changes: 7 additions & 0 deletions control_unix.go
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None of the changes except for the change in build flags are needed here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah..right, Thanks for your patience man.
Needed a lot of handholding for this one .

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries. The fact that I have to approve CI every time makes things more complicated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is one thing i wanted to find out, can't this be left to run automatically?
Would save your time and turn-around time for public contributors as well, because if there are any issues we can fix them based on CI failures itself.

Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@ import (
"golang.org/x/sys/unix"
)

// This value has been taken from https://reviews.freebsd.org/D11003 since this is not yet provided in golang.
const FREEBSD_SO_REUSEPORT_LB = 0x00010000
chaitanyaprem marked this conversation as resolved.
Show resolved Hide resolved

func Control(network, address string, c syscall.RawConn) (err error) {
controlErr := c.Control(func(fd uintptr) {
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEADDR, 1)
if err != nil {
return
}
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)
if err != nil {
return
}
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, FREEBSD_SO_REUSEPORT_LB, 1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should only be executed on FreeBSD. We can't just set a random sock opt on other platforms.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, I was thinking of making it future proof by having it for all unix systems.
But if these macros are defined per OS, then it makes sense to protect it as per runtime.
Will change this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This constant is only defined on FreeBSD. You'll need to use build flags.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, tested on freeBSD and macOS after these changes.

})
if controlErr != nil {
err = controlErr
Expand Down