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

node: allow WebSocket and HTTP works on the same port #729

Merged
merged 11 commits into from
Nov 13, 2024
Merged

node: allow WebSocket and HTTP works on the same port #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fb2f822
node: fix golint warnings
gzliudan Nov 8, 2024
3ed9ce9
eth, node: use APPDATA env to support cygwin/msys correctly (#17786)
gzliudan Nov 8, 2024
68d9dcb
node: require LocalAppData variable (#19132)
gzliudan Nov 8, 2024
d3c023e
cmd/XDC, internal, node: nuke XDC monitor (#19399)
gzliudan Nov 8, 2024
3f1b7d3
rpc: check module availability at startup (#20597)
gzliudan Nov 8, 2024
fd2b217
rpc: remove startup error for invalid modules, log it instead (#20684)
gzliudan Nov 8, 2024
57e5f5e
rpc: not log error if user configures --rpcapi=rpc (#20776)
gzliudan Nov 8, 2024
b76438a
node: allow WebSocket and HTTP work on same port (#20810)
gzliudan Nov 8, 2024
ba23964
node: shutdown HTTP and WebSocket servers gracefully (#20956)
gzliudan Nov 8, 2024
b1d6bec
cmd, node: dump empty value config (#21296)
gzliudan Nov 8, 2024
22ad2f5
node: fix websocket connection header check (#21646)
gzliudan Nov 8, 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
4 changes: 2 additions & 2 deletions cmd/XDC/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ func defaultNodeConfig() node.Config {
cfg := node.DefaultConfig
cfg.Name = clientIdentifier
cfg.Version = params.VersionWithCommit(gitCommit)
cfg.HTTPModules = append(cfg.HTTPModules, "eth", "shh")
cfg.WSModules = append(cfg.WSModules, "eth", "shh")
cfg.HTTPModules = append(cfg.HTTPModules, "eth")
cfg.WSModules = append(cfg.WSModules, "eth")
cfg.IPCPath = "XDC.ipc"
return cfg
}
Expand Down
351 changes: 0 additions & 351 deletions cmd/XDC/monitorcmd.go
View file
Open in desktop

This file was deleted.

13 changes: 8 additions & 5 deletions cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,12 +768,15 @@ func setNAT(ctx *cli.Context, cfg *p2p.Config) {

// splitAndTrim splits input separated by a comma
// and trims excessive white space from the substrings.
func splitAndTrim(input string) []string {
result := strings.Split(input, ",")
for i, r := range result {
result[i] = strings.TrimSpace(r)
func splitAndTrim(input string) (ret []string) {
l := strings.Split(input, ",")
for _, r := range l {
r = strings.TrimSpace(r)
if len(r) > 0 {
ret = append(ret, r)
}
}
return result
return ret
}

// setHTTP creates the HTTP RPC listener interface string from the set
Expand Down
Loading