void/amneziawg-go
2
0
Fork 0
mirror of https://github.com/amnezia-vpn/amneziawg-go.git synced 2025-08-02 17:52:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: minor fix

Browse source
This commit is contained in:
Mark Puha 2025-06-13 23:24:28 +02:00
parent 33f1ee033c
commit 9daa3356a4
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
device/device.go
View file

@ -578,8 +578,8 @@ func (device *Device) BindClose() error {
device.net.Unlock() device.net.Unlock()
return err return err
} }
func (device *Device) isAdvancedSecurityOn() bool { func (device *Device) isAWG() bool {
return device.awg.IsASecOn.IsSet() return device.version >= VersionAwg
} }
func (device *Device) resetProtocol() { func (device *Device) resetProtocol() {

2
device/receive.go
View file

@ -139,7 +139,7 @@ func (device *Device) RoutineReceiveIncoming(
// check size of packet // check size of packet
packet := bufsArrs[i][:size] packet := bufsArrs[i][:size]
var msgType uint32 var msgType uint32
if device.isAdvancedSecurityOn() { if device.isAWG() {
// TODO: // TODO:
// if awg.WaitResponse.ShouldWait.IsSet() { // if awg.WaitResponse.ShouldWait.IsSet() {
// awg.WaitResponse.Channel <- struct{}{} // awg.WaitResponse.Channel <- struct{}{}

2
device/send.go
View file

@ -212,7 +212,7 @@ func (peer *Peer) SendHandshakeResponse() error {
return err return err
} }
var junkedHeader []byte var junkedHeader []byte
if peer.device.isAdvancedSecurityOn() { if peer.device.isAWG() {
peer.device.awg.ASecMux.RLock() peer.device.awg.ASecMux.RLock()
if peer.device.awg.ASecCfg.ResponsePacketJunkSize != 0 { if peer.device.awg.ASecCfg.ResponsePacketJunkSize != 0 {
buf := make([]byte, 0, peer.device.awg.ASecCfg.ResponsePacketJunkSize) buf := make([]byte, 0, peer.device.awg.ASecCfg.ResponsePacketJunkSize)

6
device/uapi.go
View file

@ -98,7 +98,7 @@ func (device *Device) IpcGetOperation(w io.Writer) error {
sendf("fwmark=%d", device.net.fwmark) sendf("fwmark=%d", device.net.fwmark)
} }
if device.isAdvancedSecurityOn() { if device.isAWG() {
if device.awg.ASecCfg.JunkPacketCount != 0 { if device.awg.ASecCfg.JunkPacketCount != 0 {
sendf("jc=%d", device.awg.ASecCfg.JunkPacketCount) sendf("jc=%d", device.awg.ASecCfg.JunkPacketCount)
} }
@ -126,6 +126,7 @@ func (device *Device) IpcGetOperation(w io.Writer) error {
if device.awg.ASecCfg.TransportPacketMagicHeader != 0 { if device.awg.ASecCfg.TransportPacketMagicHeader != 0 {
sendf("h4=%d", device.awg.ASecCfg.TransportPacketMagicHeader) sendf("h4=%d", device.awg.ASecCfg.TransportPacketMagicHeader)
} }
specialJunkIpcFields := device.awg.HandshakeHandler.SpecialJunk.IpcGetFields() specialJunkIpcFields := device.awg.HandshakeHandler.SpecialJunk.IpcGetFields()
for _, field := range specialJunkIpcFields { for _, field := range specialJunkIpcFields {
sendf("%s=%s", field.Key, field.Value) sendf("%s=%s", field.Key, field.Value)
@ -134,6 +135,9 @@ func (device *Device) IpcGetOperation(w io.Writer) error {
for _, field := range controlledJunkIpcFields { for _, field := range controlledJunkIpcFields {
sendf("%s=%s", field.Key, field.Value) sendf("%s=%s", field.Key, field.Value)
} }
if device.awg.HandshakeHandler.ITimeout != 0 {
sendf("itime=%d", device.awg.HandshakeHandler.ITimeout/time.Second)
}
} }
for _, peer := range device.peers.keyMap { for _, peer := range device.peers.keyMap {