mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-26 08:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

API tweaks

Browse source
This commit is contained in:
Neil Alexander 2021-02-03 17:38:00 +00:00
parent 3f750a4fc2
commit f95a9c9d90
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
build/gobind-pinecone/monolith.go
View file

@ -41,6 +41,7 @@ import (
pineconeMulticast "github.com/matrix-org/pinecone/multicast"
pineconeRouter "github.com/matrix-org/pinecone/router"
pineconeSessions "github.com/matrix-org/pinecone/sessions"
"github.com/matrix-org/pinecone/types"
yggdrasilConfig "github.com/yggdrasil-network/yggdrasil-go/src/config"
)
@ -98,13 +99,19 @@ func (m *DendriteMonolith) DisconnectMulticastPeers() {
// TODO
}
func (m *DendriteMonolith) DisconnectPort(port int) error {
return m.PineconeRouter.Disconnect(types.SwitchPortID(port))
}
func (m *DendriteMonolith) Conduit(zone string) (*Conduit, error) {
l, r := net.Pipe()
var p types.SwitchPortID
go func() {
loop:
for i := 1; i <= 10; i++ {
logrus.Errorf("Attempting authenticated connect (attempt %d)", i)
p, err := m.PineconeRouter.AuthenticatedConnect(l, zone)
var err error
p, err = m.PineconeRouter.AuthenticatedConnect(l, zone)
switch err {
case io.ErrClosedPipe:
logrus.Errorf("Authenticated connect failed due to closed pipe (attempt %d)", i)
@ -117,12 +124,13 @@ func (m *DendriteMonolith) Conduit(zone string) (*Conduit, error) {
return
default:
logrus.WithError(err).Errorf("Authenticated connect failed (attempt %d)", i)
time.Sleep(time.Second)
}
}
_ = l.Close()
_ = r.Close()
}()
return &Conduit{conn: r}, nil
return &Conduit{conn: r, port: p}, nil
}
func (m *DendriteMonolith) RegisterUser(localpart, password string) (string, error) {
@ -358,6 +366,11 @@ func (m *DendriteMonolith) Suspend() {
type Conduit struct {
conn net.Conn
port types.SwitchPortID
}
func (c *Conduit) Port() int {
return int(c.port)
}
func (c *Conduit) Read(b []byte) (int, error) {