forks/go-ethereum-modded-tocallarg
1
0
Fork 0
forked from forks/go-ethereum
Code Pull requests Activity

p2p: fix marshaling of NAT in TOML (#31192)

Browse source 
This fixes an issue where a nat.Interface unmarshaled from the TOML
config file could not be re-marshaled to TOML correctly.

Fixes #31183
This commit is contained in:
Felix Lange 2025-02-17 09:47:12 +01:00 committed by GitHub
parent e5bc789185
commit c113e3b5b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
p2p/config.go
View file

@ -18,6 +18,7 @@ package p2p
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"encoding"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/common/mclock" "github.com/ethereum/go-ethereum/common/mclock"
@ -135,6 +136,13 @@ type configNAT struct {
nat.Interface nat.Interface
} }
func (w *configNAT) MarshalText() ([]byte, error) {
if tm, ok := w.Interface.(encoding.TextMarshaler); ok {
return tm.MarshalText()
}
return nil, fmt.Errorf("NAT specification %#v cannot be marshaled", w.Interface)
}
func (w *configNAT) UnmarshalText(input []byte) error { func (w *configNAT) UnmarshalText(input []byte) error {
n, err := nat.Parse(string(input)) n, err := nat.Parse(string(input))
if err != nil { if err != nil {