prudp: rename packet flags to distinguish them from other constants

This commit is contained in:
Jonathan Barrow 2024-03-15 18:25:46 -04:00
parent 719cb01968
commit ff1d3b1482
No known key found for this signature in database
GPG key ID: E86E9FE9049C741F
7 changed files with 51 additions and 51 deletions

View file

@ -1,18 +1,18 @@
package constants
const (
// FlagAck is the ID for the PRUDP Ack Flag
FlagAck uint16 = 0x1
// PacketFlagAck is the ID for the PRUDP Ack Flag
PacketFlagAck uint16 = 0x1
// FlagReliable is the ID for the PRUDP Reliable Flag
FlagReliable uint16 = 0x2
// PacketFlagReliable is the ID for the PRUDP Reliable Flag
PacketFlagReliable uint16 = 0x2
// FlagNeedsAck is the ID for the PRUDP NeedsAck Flag
FlagNeedsAck uint16 = 0x4
// PacketFlagNeedsAck is the ID for the PRUDP NeedsAck Flag
PacketFlagNeedsAck uint16 = 0x4
// FlagHasSize is the ID for the PRUDP HasSize Flag
FlagHasSize uint16 = 0x8
// PacketFlagHasSize is the ID for the PRUDP HasSize Flag
PacketFlagHasSize uint16 = 0x8
// FlagMultiAck is the ID for the PRUDP MultiAck Flag
FlagMultiAck uint16 = 0x200
// PacketFlagMultiAck is the ID for the PRUDP MultiAck Flag
PacketFlagMultiAck uint16 = 0x200
)

View file

@ -114,7 +114,7 @@ func (pep *PRUDPEndPoint) processPacket(packet PRUDPPacketInterface, socket *Soc
packet.SetSender(connection)
if packet.HasFlag(constants.FlagAck) || packet.HasFlag(constants.FlagMultiAck) {
if packet.HasFlag(constants.PacketFlagAck) || packet.HasFlag(constants.PacketFlagMultiAck) {
pep.handleAcknowledgment(packet)
return
}
@ -141,7 +141,7 @@ func (pep *PRUDPEndPoint) handleAcknowledgment(packet PRUDPPacketInterface) {
return
}
if packet.HasFlag(constants.FlagMultiAck) {
if packet.HasFlag(constants.PacketFlagMultiAck) {
pep.handleMultiAcknowledgment(packet)
return
}
@ -226,8 +226,8 @@ func (pep *PRUDPEndPoint) handleSyn(packet PRUDPPacketInterface) {
connection.Signature = connectionSignature
ack.SetType(constants.SynPacket)
ack.AddFlag(constants.FlagAck)
ack.AddFlag(constants.FlagHasSize)
ack.AddFlag(constants.PacketFlagAck)
ack.AddFlag(constants.PacketFlagHasSize)
ack.SetSourceVirtualPortStreamType(packet.DestinationVirtualPortStreamType())
ack.SetSourceVirtualPortStreamID(packet.DestinationVirtualPortStreamID())
ack.SetDestinationVirtualPortStreamType(packet.SourceVirtualPortStreamType())
@ -279,8 +279,8 @@ func (pep *PRUDPEndPoint) handleConnect(packet PRUDPPacketInterface) {
connection.ServerSessionID = packet.SessionID()
ack.SetType(constants.ConnectPacket)
ack.AddFlag(constants.FlagAck)
ack.AddFlag(constants.FlagHasSize)
ack.AddFlag(constants.PacketFlagAck)
ack.AddFlag(constants.PacketFlagHasSize)
ack.SetSourceVirtualPortStreamType(packet.DestinationVirtualPortStreamType())
ack.SetSourceVirtualPortStreamID(packet.DestinationVirtualPortStreamID())
ack.SetDestinationVirtualPortStreamType(packet.SourceVirtualPortStreamType())
@ -386,7 +386,7 @@ func (pep *PRUDPEndPoint) handleData(packet PRUDPPacketInterface) {
connection.resetHeartbeat()
if packet.HasFlag(constants.FlagReliable) {
if packet.HasFlag(constants.PacketFlagReliable) {
pep.handleReliable(packet)
} else {
pep.handleUnreliable(packet)
@ -397,7 +397,7 @@ func (pep *PRUDPEndPoint) handleDisconnect(packet PRUDPPacketInterface) {
// TODO - Should we check the state here, or just let the connection disconnect at any time?
// TODO - Should we bother to set the connections state here? It's being destroyed anyway
if packet.HasFlag(constants.FlagNeedsAck) {
if packet.HasFlag(constants.PacketFlagNeedsAck) {
pep.acknowledgePacket(packet)
}
@ -417,7 +417,7 @@ func (pep *PRUDPEndPoint) handlePing(packet PRUDPPacketInterface) {
connection.resetHeartbeat()
if packet.HasFlag(constants.FlagNeedsAck) {
if packet.HasFlag(constants.PacketFlagNeedsAck) {
pep.acknowledgePacket(packet)
}
}
@ -500,7 +500,7 @@ func (pep *PRUDPEndPoint) acknowledgePacket(packet PRUDPPacketInterface) {
}
ack.SetType(packet.Type())
ack.AddFlag(constants.FlagAck)
ack.AddFlag(constants.PacketFlagAck)
ack.SetSourceVirtualPortStreamType(packet.DestinationVirtualPortStreamType())
ack.SetSourceVirtualPortStreamID(packet.DestinationVirtualPortStreamID())
ack.SetDestinationVirtualPortStreamType(packet.SourceVirtualPortStreamType())
@ -519,7 +519,7 @@ func (pep *PRUDPEndPoint) acknowledgePacket(packet PRUDPPacketInterface) {
}
func (pep *PRUDPEndPoint) handleReliable(packet PRUDPPacketInterface) {
if packet.HasFlag(constants.FlagNeedsAck) {
if packet.HasFlag(constants.PacketFlagNeedsAck) {
pep.acknowledgePacket(packet)
}
@ -564,7 +564,7 @@ func (pep *PRUDPEndPoint) handleReliable(packet PRUDPPacketInterface) {
}
func (pep *PRUDPEndPoint) handleUnreliable(packet PRUDPPacketInterface) {
if packet.HasFlag(constants.FlagNeedsAck) {
if packet.HasFlag(constants.PacketFlagNeedsAck) {
pep.acknowledgePacket(packet)
}
@ -637,7 +637,7 @@ func (pep *PRUDPEndPoint) sendPing(connection *PRUDPConnection) {
}
ping.SetType(constants.PingPacket)
ping.AddFlag(constants.FlagNeedsAck)
ping.AddFlag(constants.PacketFlagNeedsAck)
ping.SetSourceVirtualPortStreamType(connection.StreamType)
ping.SetSourceVirtualPortStreamID(pep.StreamID)
ping.SetDestinationVirtualPortStreamType(connection.StreamType)

View file

@ -251,7 +251,7 @@ func (p *PRUDPPacketLite) decodeOptions() error {
}
}
if p.packetType == constants.ConnectPacket && !p.HasFlag(constants.FlagAck) {
if p.packetType == constants.ConnectPacket && !p.HasFlag(constants.PacketFlagAck) {
if optionID == 0x80 {
p.liteSignature = optionsStream.ReadBytesNext(int64(optionSize))
}
@ -276,14 +276,14 @@ func (p *PRUDPPacketLite) encodeOptions() []byte {
optionsStream.WritePrimitiveUInt8(4)
optionsStream.WritePrimitiveUInt32LE(p.minorVersion | (p.supportedFunctions << 8))
if p.packetType == constants.SynPacket && p.HasFlag(constants.FlagAck) {
if p.packetType == constants.SynPacket && p.HasFlag(constants.PacketFlagAck) {
optionsStream.WritePrimitiveUInt8(1)
optionsStream.WritePrimitiveUInt8(16)
optionsStream.Grow(16)
optionsStream.WriteBytesNext(p.connectionSignature)
}
if p.packetType == constants.ConnectPacket && !p.HasFlag(constants.FlagAck) {
if p.packetType == constants.ConnectPacket && !p.HasFlag(constants.PacketFlagAck) {
optionsStream.WritePrimitiveUInt8(1)
optionsStream.WritePrimitiveUInt8(16)
optionsStream.Grow(16)

View file

@ -137,7 +137,7 @@ func (p *PRUDPPacketV0) decode() error {
var payloadSize uint16
if p.HasFlag(constants.FlagHasSize) {
if p.HasFlag(constants.PacketFlagHasSize) {
if p.readStream.Remaining() < 2 {
return errors.New("Failed to read PRUDPv0 payload size. Not have enough data")
}
@ -220,7 +220,7 @@ func (p *PRUDPPacketV0) Bytes() []byte {
stream.WritePrimitiveUInt8(p.fragmentID)
}
if p.HasFlag(constants.FlagHasSize) {
if p.HasFlag(constants.PacketFlagHasSize) {
stream.WritePrimitiveUInt16LE(uint16(len(p.payload)))
}

View file

@ -234,8 +234,8 @@ func (ps *PRUDPServer) sendPacket(packet PRUDPPacketInterface) {
packetCopy := packet.Copy()
connection := packetCopy.Sender().(*PRUDPConnection)
if !packetCopy.HasFlag(constants.FlagAck) && !packetCopy.HasFlag(constants.FlagMultiAck) {
if packetCopy.HasFlag(constants.FlagReliable) {
if !packetCopy.HasFlag(constants.PacketFlagAck) && !packetCopy.HasFlag(constants.PacketFlagMultiAck) {
if packetCopy.HasFlag(constants.PacketFlagReliable) {
slidingWindow := connection.SlidingWindow(packetCopy.SubstreamID())
packetCopy.SetSequenceID(slidingWindow.NextOutgoingSequenceID())
} else if packetCopy.Type() == constants.DataPacket {
@ -249,8 +249,8 @@ func (ps *PRUDPServer) sendPacket(packet PRUDPPacketInterface) {
packetCopy.SetSessionID(connection.ServerSessionID)
if packetCopy.Type() == constants.DataPacket && !packetCopy.HasFlag(constants.FlagAck) && !packetCopy.HasFlag(constants.FlagMultiAck) {
if packetCopy.HasFlag(constants.FlagReliable) {
if packetCopy.Type() == constants.DataPacket && !packetCopy.HasFlag(constants.PacketFlagAck) && !packetCopy.HasFlag(constants.PacketFlagMultiAck) {
if packetCopy.HasFlag(constants.PacketFlagReliable) {
slidingWindow := connection.SlidingWindow(packetCopy.SubstreamID())
payload := packetCopy.Payload()
@ -279,7 +279,7 @@ func (ps *PRUDPServer) sendPacket(packet PRUDPPacketInterface) {
packetCopy.setSignature(packetCopy.calculateSignature(connection.SessionKey, connection.ServerConnectionSignature))
}
if packetCopy.HasFlag(constants.FlagReliable) && packetCopy.HasFlag(constants.FlagNeedsAck) {
if packetCopy.HasFlag(constants.PacketFlagReliable) && packetCopy.HasFlag(constants.PacketFlagNeedsAck) {
slidingWindow := connection.SlidingWindow(packetCopy.SubstreamID())
slidingWindow.ResendScheduler.AddPacket(packetCopy)
}

View file

@ -96,9 +96,9 @@ func login(packet nex.PRUDPPacketInterface) {
responsePacket, _ := nex.NewPRUDPPacketV0(authServer, packet.Sender().(*nex.PRUDPConnection), nil)
responsePacket.SetType(packet.Type())
responsePacket.AddFlag(constants.FlagHasSize)
responsePacket.AddFlag(constants.FlagReliable)
responsePacket.AddFlag(constants.FlagNeedsAck)
responsePacket.AddFlag(constants.PacketFlagHasSize)
responsePacket.AddFlag(constants.PacketFlagReliable)
responsePacket.AddFlag(constants.PacketFlagNeedsAck)
responsePacket.SetSourceVirtualPortStreamType(packet.DestinationVirtualPortStreamType())
responsePacket.SetSourceVirtualPortStreamID(packet.DestinationVirtualPortStreamID())
responsePacket.SetDestinationVirtualPortStreamType(packet.SourceVirtualPortStreamType())
@ -149,9 +149,9 @@ func requestTicket(packet nex.PRUDPPacketInterface) {
responsePacket, _ := nex.NewPRUDPPacketV0(authServer, packet.Sender().(*nex.PRUDPConnection), nil)
responsePacket.SetType(packet.Type())
responsePacket.AddFlag(constants.FlagHasSize)
responsePacket.AddFlag(constants.FlagReliable)
responsePacket.AddFlag(constants.FlagNeedsAck)
responsePacket.AddFlag(constants.PacketFlagHasSize)
responsePacket.AddFlag(constants.PacketFlagReliable)
responsePacket.AddFlag(constants.PacketFlagNeedsAck)
responsePacket.SetSourceVirtualPortStreamType(packet.DestinationVirtualPortStreamType())
responsePacket.SetSourceVirtualPortStreamID(packet.DestinationVirtualPortStreamID())
responsePacket.SetDestinationVirtualPortStreamType(packet.SourceVirtualPortStreamType())

View file

@ -135,9 +135,9 @@ func registerEx(packet nex.PRUDPPacketInterface) {
responsePacket, _ := nex.NewPRUDPPacketV0(secureServer, connection, nil)
responsePacket.SetType(packet.Type())
responsePacket.AddFlag(constants.FlagHasSize)
responsePacket.AddFlag(constants.FlagReliable)
responsePacket.AddFlag(constants.FlagNeedsAck)
responsePacket.AddFlag(constants.PacketFlagHasSize)
responsePacket.AddFlag(constants.PacketFlagReliable)
responsePacket.AddFlag(constants.PacketFlagNeedsAck)
responsePacket.SetSourceVirtualPortStreamType(packet.DestinationVirtualPortStreamType())
responsePacket.SetSourceVirtualPortStreamID(packet.DestinationVirtualPortStreamID())
responsePacket.SetDestinationVirtualPortStreamType(packet.SourceVirtualPortStreamType())
@ -183,9 +183,9 @@ func updateAndGetAllInformation(packet nex.PRUDPPacketInterface) {
responsePacket, _ := nex.NewPRUDPPacketV0(secureServer, packet.Sender().(*nex.PRUDPConnection), nil)
responsePacket.SetType(packet.Type())
responsePacket.AddFlag(constants.FlagHasSize)
responsePacket.AddFlag(constants.FlagReliable)
responsePacket.AddFlag(constants.FlagNeedsAck)
responsePacket.AddFlag(constants.PacketFlagHasSize)
responsePacket.AddFlag(constants.PacketFlagReliable)
responsePacket.AddFlag(constants.PacketFlagNeedsAck)
responsePacket.SetSourceVirtualPortStreamType(packet.DestinationVirtualPortStreamType())
responsePacket.SetSourceVirtualPortStreamID(packet.DestinationVirtualPortStreamID())
responsePacket.SetDestinationVirtualPortStreamType(packet.SourceVirtualPortStreamType())
@ -215,9 +215,9 @@ func checkSettingStatus(packet nex.PRUDPPacketInterface) {
responsePacket, _ := nex.NewPRUDPPacketV0(secureServer, packet.Sender().(*nex.PRUDPConnection), nil)
responsePacket.SetType(packet.Type())
responsePacket.AddFlag(constants.FlagHasSize)
responsePacket.AddFlag(constants.FlagReliable)
responsePacket.AddFlag(constants.FlagNeedsAck)
responsePacket.AddFlag(constants.PacketFlagHasSize)
responsePacket.AddFlag(constants.PacketFlagReliable)
responsePacket.AddFlag(constants.PacketFlagNeedsAck)
responsePacket.SetSourceVirtualPortStreamType(packet.DestinationVirtualPortStreamType())
responsePacket.SetSourceVirtualPortStreamID(packet.DestinationVirtualPortStreamID())
responsePacket.SetDestinationVirtualPortStreamType(packet.SourceVirtualPortStreamType())
@ -242,9 +242,9 @@ func updatePresence(packet nex.PRUDPPacketInterface) {
responsePacket, _ := nex.NewPRUDPPacketV0(secureServer, packet.Sender().(*nex.PRUDPConnection), nil)
responsePacket.SetType(packet.Type())
responsePacket.AddFlag(constants.FlagHasSize)
responsePacket.AddFlag(constants.FlagReliable)
responsePacket.AddFlag(constants.FlagNeedsAck)
responsePacket.AddFlag(constants.PacketFlagHasSize)
responsePacket.AddFlag(constants.PacketFlagReliable)
responsePacket.AddFlag(constants.PacketFlagNeedsAck)
responsePacket.SetSourceVirtualPortStreamType(packet.DestinationVirtualPortStreamType())
responsePacket.SetSourceVirtualPortStreamID(packet.DestinationVirtualPortStreamID())
responsePacket.SetDestinationVirtualPortStreamType(packet.SourceVirtualPortStreamType())