Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Issues Fixed and Dependency Updates

* github.com/openziti/sdk-golang: [v1.1.1 -> v1.1.2](https://github.com/openziti/sdk-golang/compare/v1.1.1...v1.1.2)
* [Issue #742](https://github.com/openziti/sdk-golang/issues/742) - Additional CtrlId and GetDestinationType for inspect support
* [Issue #739](https://github.com/openziti/sdk-golang/issues/739) - go-jose v2.6.3 CVE-2025-27144 resolution

* github.com/zitadel/oidc/v3: v2.12.2 -> v3.39.0
Expand Down
1 change: 1 addition & 0 deletions xgress/circuit_inspections.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,5 @@ type CircuitDetail struct {
Address string `json:"address"`
Originator string `json:"originator"`
IsXgress bool `json:"isXgress"`
CtrlId string `json:"ctrlId"`
}
4 changes: 4 additions & 0 deletions xgress/xgress.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ type Xgress struct {
tags map[string]string
}

func (self *Xgress) GetDestinationType() string {
return "xgress"
}

func (self *Xgress) GetIntervalId() string {
return self.circuitId
}
Expand Down
5 changes: 5 additions & 0 deletions ziti/edge/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ type ServiceConn interface {
type Conn interface {
ServiceConn
Identifiable
GetRouterId() string
CompleteAcceptSuccess() error
CompleteAcceptFailed(err error)
}
Expand Down Expand Up @@ -139,6 +140,10 @@ func NewEdgeMsgChannel(ch SdkChannel, connId uint32) *MsgChannel {
}
}

func (ec *MsgChannel) GetRouterId() string {
return ec.GetChannel().Id()
}

func (ec *MsgChannel) Id() uint32 {
return ec.id
}
Expand Down
1 change: 1 addition & 0 deletions ziti/edge/network/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ func (conn *edgeConn) GetCircuitDetail() *xgress.CircuitDetail {
detail.IsXgress = true
detail.Originator = conn.xgCircuit.xg.Originator().String()
detail.Address = string(conn.xgCircuit.xg.Address())
detail.CtrlId = conn.xgCircuit.xg.CtrlId()
}

return detail
Expand Down
Loading