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

allow overwriting builtin dual DHT options #688

Merged
merged 2 commits into from
Aug 25, 2020
Merged

allow overwriting builtin dual DHT options #688

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c708b1
allow overwriting builtin dual DHT options
petar Aug 20, 2020
ac3582f
LAN DHT ignores user options in determining Client vs Server mode
aschmahmann Aug 21, 2020
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
37 changes: 24 additions & 13 deletions dual/dual.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,31 +96,42 @@ func DHTOption(opts ...dht.Option) Option {
// will be overriden by this constructor.
func New(ctx context.Context, h host.Host, options ...Option) (*DHT, error) {
var cfg config
err := cfg.apply(options...)
err := cfg.apply(
WanDHTOption(
dht.QueryFilter(dht.PublicQueryFilter),
dht.RoutingTableFilter(dht.PublicRoutingTableFilter),
dht.RoutingTablePeerDiversityFilter(dht.NewRTPeerDiversityFilter(h, maxPrefixCountPerCpl, maxPrefixCount)),
),
)
if err != nil {
return nil, err
}
wanOpts := append(cfg.wan,
dht.QueryFilter(dht.PublicQueryFilter),
dht.RoutingTableFilter(dht.PublicRoutingTableFilter),
dht.RoutingTablePeerDiversityFilter(dht.NewRTPeerDiversityFilter(h, maxPrefixCountPerCpl, maxPrefixCount)),
err = cfg.apply(
LanDHTOption(
dht.ProtocolExtension(LanExtension),
dht.QueryFilter(dht.PrivateQueryFilter),
dht.RoutingTableFilter(dht.PrivateRoutingTableFilter),
),
)
wan, err := dht.New(ctx, h, wanOpts...)
if err != nil {
return nil, err
}
err = cfg.apply(options...)
if err != nil {
return nil, err
}

wan, err := dht.New(ctx, h, cfg.wan...)
if err != nil {
return nil, err
}

// Unless overridden by user supplied options, the LAN DHT should default
// to 'AutoServer' mode.
lanOpts := append(cfg.lan,
dht.ProtocolExtension(LanExtension),
dht.QueryFilter(dht.PrivateQueryFilter),
dht.RoutingTableFilter(dht.PrivateRoutingTableFilter),
)
if wan.Mode() != dht.ModeClient {
lanOpts = append(lanOpts, dht.Mode(dht.ModeServer))
cfg.lan = append(cfg.lan, dht.Mode(dht.ModeServer))
}
lan, err := dht.New(ctx, h, lanOpts...)
lan, err := dht.New(ctx, h, cfg.lan...)
if err != nil {
return nil, err
}
Expand Down