Skip to content

export RelayHostPort #172

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

Merged
ingon merged 1 commit into from
May 7, 2026
Merged

export RelayHostPort #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 deletions server/control/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"crypto/x509"
"encoding/json"
"errors"
"net"
"os"
"path/filepath"
"strconv"
"time"

"github.com/connet-dev/connet"
Expand Down Expand Up @@ -106,20 +108,20 @@ type RelayConnKey struct {

type RelayConnValue struct {
Authentication RelayAuthentication `json:"authentication"`
Hostports []relayHostPort `json:"hostports"`
Hostports []RelayHostPort `json:"hostports"`
Metadata string `json:"metadata"`
Certificate *x509.Certificate `json:"certificate"`
AuthenticationSealKey *[32]byte `json:"authentication-seal-key"`
}

type relayHostPort struct {
type RelayHostPort struct {
Host string `json:"host"`
Port uint16 `json:"port"`
}

type jsonRelayConnValue struct {
Authentication RelayAuthentication `json:"authentication"`
Hostports []relayHostPort `json:"hostports"`
Hostports []RelayHostPort `json:"hostports"`
Metadata string `json:"metadata"`
Certificate []byte `json:"certificate"`
AuthenticationSealKey []byte `json:"authentication-seal-key"`
Expand Down Expand Up @@ -152,24 +154,28 @@ func (v *RelayConnValue) UnmarshalJSON(b []byte) error {
return nil
}

func hostPortFromPB(h *pbmodel.HostPort) relayHostPort {
return relayHostPort{
func hostPortFromPB(h *pbmodel.HostPort) RelayHostPort {
return RelayHostPort{
Host: h.Host,
Port: uint16(h.Port),
}
}

func hostPortFromPBs(hs []*pbmodel.HostPort) []relayHostPort {
func hostPortFromPBs(hs []*pbmodel.HostPort) []RelayHostPort {
return iterc.MapSlice(hs, hostPortFromPB)
}

func pbsFromHostPorts(hps []relayHostPort) []*pbmodel.HostPort {
return iterc.MapSlice(hps, relayHostPort.pb)
func pbsFromHostPorts(hps []RelayHostPort) []*pbmodel.HostPort {
return iterc.MapSlice(hps, RelayHostPort.pb)
}

func (h relayHostPort) pb() *pbmodel.HostPort {
func (h RelayHostPort) pb() *pbmodel.HostPort {
return &pbmodel.HostPort{
Host: h.Host,
Port: uint32(h.Port),
}
}

func (h RelayHostPort) String() string {
return net.JoinHostPort(h.Host, strconv.Itoa(int(h.Port)))
}
Loading