Skip to content

Commit 2df478d

Browse files
ekobyekoby
committed
use protobuf generated values
1 parent 87b42b9 commit 2df478d

File tree

2 files changed

+68
-60
lines changed

2 files changed

+68
-60
lines changed

‎ziti/edge/messages.go‎

Lines changed: 65 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -42,79 +42,89 @@ const (
4242
ContentTypeTraceRoute = int32(edge_client_pb.ContentType_TraceRouteType)
4343
ContentTypeTraceRouteResponse = int32(edge_client_pb.ContentType_TraceRouteResponseType)
4444

45+
ContentTypeConnInspectRequest = int32(edge_client_pb.ContentType_ConnInspectRequest)
46+
ContentTypeConnInspectResponse = int32(edge_client_pb.ContentType_ConnInspectResponse)
47+
ContentTypeBindSuccess = int32(edge_client_pb.ContentType_BindSuccess)
48+
4549
ContentTypeUpdateToken = int32(edge_client_pb.ContentType_UpdateTokenType)
4650
ContentTypeUpdateTokenSuccess = int32(edge_client_pb.ContentType_UpdateTokenSuccessType)
4751
ContentTypeUpdateTokenFailure = int32(edge_client_pb.ContentType_UpdateTokenFailureType)
4852

4953
ContentTypePostureResponse = int32(edge_client_pb.ContentType_PostureResponseType)
54+
)
5055

51-
ContentTypeConnInspectRequest = 60798
52-
ContentTypeConnInspectResponse = 60799
53-
ContentTypeBindSuccess = 60800
54-
55-
ConnIdHeader = 1000
56-
SeqHeader = 1001
57-
SessionTokenHeader = 1002
58-
PublicKeyHeader = 1003
59-
CostHeader = 1004
60-
PrecedenceHeader = 1005
61-
TerminatorIdentityHeader = 1006
62-
TerminatorIdentitySecretHeader = 1007
63-
CallerIdHeader = 1008
64-
CryptoMethodHeader = 1009
65-
FlagsHeader = 1010
66-
AppDataHeader = 1011
67-
RouterProvidedConnId = 1012
68-
HealthStatusHeader = 1013
69-
ErrorCodeHeader = 1014
70-
TimestampHeader = 1015
71-
TraceHopCountHeader = 1016
72-
TraceHopTypeHeader = 1017
73-
TraceHopIdHeader = 1018
74-
TraceSourceRequestIdHeader = 1019
75-
TraceError = 1020
76-
ListenerId = 1021
77-
ConnTypeHeader = 1022
78-
SupportsInspectHeader = 1023
79-
SupportsBindSuccessHeader = 1024
80-
ConnectionMarkerHeader = 1025
81-
CircuitIdHeader = 1026
82-
StickinessTokenHeader = 1027
83-
84-
ErrorCodeInternal = 1
85-
ErrorCodeInvalidApiSession = 2
86-
ErrorCodeInvalidSession = 3
87-
ErrorCodeWrongSessionType = 4
88-
ErrorCodeInvalidEdgeRouterForSession = 5
89-
ErrorCodeInvalidService = 6
90-
ErrorCodeTunnelingNotEnabled = 7
91-
ErrorCodeInvalidTerminator = 8
92-
ErrorCodeInvalidPrecedence = 9
93-
ErrorCodeInvalidCost = 10
94-
ErrorCodeEncryptionDataMissing = 11
95-
96-
PrecedenceDefault Precedence = 0
97-
PrecedenceRequired Precedence = 1
98-
PrecedenceFailed Precedence = 2
99-
56+
const (
10057
// UUIDHeader is put in the reflected range so replies will share the same UUID
101-
UUIDHeader = 128
58+
UUIDHeader = int32(edge_client_pb.HeaderId_UUID)
59+
60+
ConnIdHeader = int32(edge_client_pb.HeaderId_ConnId)
61+
SeqHeader = int32(edge_client_pb.HeaderId_Seq)
62+
SessionTokenHeader = int32(edge_client_pb.HeaderId_SessionToken)
63+
PublicKeyHeader = int32(edge_client_pb.HeaderId_PublicKey)
64+
CostHeader = int32(edge_client_pb.HeaderId_Cost)
65+
PrecedenceHeader = int32(edge_client_pb.HeaderId_Precedence)
66+
TerminatorIdentityHeader = int32(edge_client_pb.HeaderId_TerminatorIdentity)
67+
TerminatorIdentitySecretHeader = int32(edge_client_pb.HeaderId_TerminatorIdentitySecret)
68+
CallerIdHeader = int32(edge_client_pb.HeaderId_CallerId)
69+
CryptoMethodHeader = int32(edge_client_pb.HeaderId_CryptoMethod)
70+
FlagsHeader = int32(edge_client_pb.HeaderId_Flags)
71+
AppDataHeader = int32(edge_client_pb.HeaderId_AppData)
72+
RouterProvidedConnId = int32(edge_client_pb.HeaderId_RouterProvidedConnId)
73+
HealthStatusHeader = int32(edge_client_pb.HeaderId_HealthStatus)
74+
ErrorCodeHeader = int32(edge_client_pb.HeaderId_ErrorCode)
75+
TimestampHeader = int32(edge_client_pb.HeaderId_Timestamp)
76+
TraceHopCountHeader = int32(edge_client_pb.HeaderId_TraceHopCount)
77+
TraceHopTypeHeader = int32(edge_client_pb.HeaderId_TraceHopType)
78+
TraceHopIdHeader = int32(edge_client_pb.HeaderId_TraceHopId)
79+
TraceSourceRequestIdHeader = int32(edge_client_pb.HeaderId_TraceSourceRequestId)
80+
TraceError = int32(edge_client_pb.HeaderId_TraceError)
81+
ListenerId = int32(edge_client_pb.HeaderId_ListenerId)
82+
ConnTypeHeader = int32(edge_client_pb.HeaderId_ConnType)
83+
SupportsInspectHeader = int32(edge_client_pb.HeaderId_SupportsInspect)
84+
SupportsBindSuccessHeader = int32(edge_client_pb.HeaderId_SupportsBindSuccess)
85+
ConnectionMarkerHeader = int32(edge_client_pb.HeaderId_ConnectionMarker)
86+
CircuitIdHeader = int32(edge_client_pb.HeaderId_CircuitId)
87+
StickinessTokenHeader = int32(edge_client_pb.HeaderId_StickinessToken)
88+
)
89+
90+
const (
91+
ErrorCodeInternal = int32(edge_client_pb.Error_Internal)
92+
ErrorCodeInvalidApiSession = int32(edge_client_pb.Error_InvalidApiSession)
93+
ErrorCodeInvalidSession = int32(edge_client_pb.Error_InvalidSession)
94+
ErrorCodeWrongSessionType = int32(edge_client_pb.Error_WrongSessionType)
95+
ErrorCodeInvalidEdgeRouterForSession = int32(edge_client_pb.Error_InvalidEdgeRouterForSession)
96+
ErrorCodeInvalidService = int32(edge_client_pb.Error_InvalidService)
97+
ErrorCodeTunnelingNotEnabled = int32(edge_client_pb.Error_TunnelingNotEnabled)
98+
ErrorCodeInvalidTerminator = int32(edge_client_pb.Error_InvalidTerminator)
99+
ErrorCodeInvalidPrecedence = int32(edge_client_pb.Error_InvalidPrecedence)
100+
ErrorCodeInvalidCost = int32(edge_client_pb.Error_InvalidCost)
101+
ErrorCodeEncryptionDataMissing = int32(edge_client_pb.Error_EncryptionDataMissing)
102+
)
103+
104+
const (
105+
PrecedenceDefault = Precedence(edge_client_pb.PrecedenceValue_Default)
106+
PrecedenceRequired = Precedence(edge_client_pb.PrecedenceValue_Required)
107+
PrecedenceFailed = Precedence(edge_client_pb.PrecedenceValue_Failed)
108+
)
102109

110+
const (
103111
// CryptoMethodLibsodium are used to indicate the crypto engine in use
104112
CryptoMethodLibsodium CryptoMethod = 0 // default: crypto_kx_*, crypto_secretstream_*
105113
CryptoMethodSSL CryptoMethod = 1 // OpenSSL(possibly with FIPS): ECDH, AES256-GCM
114+
)
106115

116+
const (
107117
// FIN is an edge payload flag used to signal communication ends
108-
FIN = 0x1
118+
FIN = uint32(edge_client_pb.Flag_FIN)
109119
// TRACE_UUID indicates that peer will send data messages with specially constructed UUID headers
110-
TRACE_UUID = 1 << 1
120+
TRACE_UUID = uint32(edge_client_pb.Flag_TRACE_UUID)
111121
// MULTIPART indicates that peer can accept multipart data messages
112-
MULTIPART = 1 << 2
122+
MULTIPART = uint32(edge_client_pb.Flag_MULTIPART)
113123
// STREAM indicates connection with stream semantics
114124
// this allows consolidation of payloads to lower overhead
115-
STREAM = 1 << 3
125+
STREAM = uint32(edge_client_pb.Flag_STREAM)
116126
// MULTIPART_MSG set on data message with multiple payloads
117-
MULTIPART_MSG = 1 << 4
127+
MULTIPART_MSG = uint32(edge_client_pb.Flag_MULTIPART_MSG)
118128
)
119129

120130
type CryptoMethod byte

‎ziti/edge/network/conn.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,11 @@ func (conn *edgeConn) Write(data []byte) (int, error) {
9999
}
100100
}
101101

102-
var finHeaders = map[int32][]byte{
103-
edge.FlagsHeader: {edge.FIN, 0, 0, 0},
104-
}
105-
106102
func (conn *edgeConn) CloseWrite() error {
107103
if conn.sentFIN.CompareAndSwap(false, true) {
108-
_, err := conn.MsgChannel.WriteTraced(nil, nil, finHeaders)
104+
headers := channel.Headers{}
105+
headers.PutUint32Header(edge.FlagsHeader, edge.FIN)
106+
_, err := conn.MsgChannel.WriteTraced(nil, nil, headers)
109107
return err
110108
}
111109

0 commit comments

Comments
 (0)