Skip to content

Commit 781ec45

Browse files
Add.generic.msg.sink (#797)
* reworks MsgMux - rename MsgMux to ConnMux, as it muxes Conns - rename sinkId to connId, as that is the language of Conn's - add doc - add generic meta data for MsgSink - remove jwt refreshing client test program
1 parent 64e7272 commit 781ec45

File tree

9 files changed

+597
-102
lines changed

9 files changed

+597
-102
lines changed

xgress/xgress.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ type AckSender interface {
6161

6262
type OptionsData map[interface{}]interface{}
6363

64-
// The BindHandlers are invoked to install the appropriate handlers.
64+
// BindHandler is an interface invoked to install the appropriate handlers.
6565
type BindHandler interface {
6666
HandleXgressBind(x *Xgress)
6767
}
@@ -923,7 +923,7 @@ func (self *Xgress) SendEmptyAck() {
923923
func (self *Xgress) GetSequence() uint64 {
924924
self.rxSequenceLock.Lock()
925925
defer self.rxSequenceLock.Unlock()
926-
return uint64(self.rxSequence)
926+
return self.rxSequence
927927
}
928928

929929
func (self *Xgress) getLastBufferSizeSent() uint32 {

ziti/edge/conn.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ package edge
1818

1919
import (
2020
"fmt"
21-
"github.com/openziti/edge-api/rest_model"
22-
"github.com/openziti/foundation/v2/concurrenz"
23-
"github.com/openziti/sdk-golang/xgress"
24-
"github.com/openziti/secretstream/kx"
2521
"io"
2622
"net"
2723
"os"
@@ -31,7 +27,11 @@ import (
3127
"github.com/google/uuid"
3228
"github.com/michaelquigley/pfxlog"
3329
"github.com/openziti/channel/v4"
30+
"github.com/openziti/edge-api/rest_model"
31+
"github.com/openziti/foundation/v2/concurrenz"
3432
"github.com/openziti/foundation/v2/sequence"
33+
"github.com/openziti/sdk-golang/xgress"
34+
"github.com/openziti/secretstream/kx"
3535
)
3636

3737
const (

0 commit comments

Comments
 (0)