From 9daa3356a413e84e45cca0d87975684494410503 Mon Sep 17 00:00:00 2001
From: Mark Puha <p.mark95@gmail.com>
Date: Fri, 13 Jun 2025 23:24:28 +0200
Subject: [PATCH] fix: minor fix

---
 device/device.go  | 4 ++--
 device/receive.go | 2 +-
 device/send.go    | 2 +-
 device/uapi.go    | 6 +++++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/device/device.go b/device/device.go
index a72b053..42a81c7 100644
--- a/device/device.go
+++ b/device/device.go
@@ -578,8 +578,8 @@ func (device *Device) BindClose() error {
 	device.net.Unlock()
 	return err
 }
-func (device *Device) isAdvancedSecurityOn() bool {
-	return device.awg.IsASecOn.IsSet()
+func (device *Device) isAWG() bool {
+	return device.version >= VersionAwg
 }
 
 func (device *Device) resetProtocol() {
diff --git a/device/receive.go b/device/receive.go
index 6eaa746..1ab7cd9 100644
--- a/device/receive.go
+++ b/device/receive.go
@@ -139,7 +139,7 @@ func (device *Device) RoutineReceiveIncoming(
 			// check size of packet
 			packet := bufsArrs[i][:size]
 			var msgType uint32
-			if device.isAdvancedSecurityOn() {
+			if device.isAWG() {
 				// TODO:
 				// if awg.WaitResponse.ShouldWait.IsSet() {
 				// 	awg.WaitResponse.Channel <- struct{}{}
diff --git a/device/send.go b/device/send.go
index e38e126..305589a 100644
--- a/device/send.go
+++ b/device/send.go
@@ -212,7 +212,7 @@ func (peer *Peer) SendHandshakeResponse() error {
 		return err
 	}
 	var junkedHeader []byte
-	if peer.device.isAdvancedSecurityOn() {
+	if peer.device.isAWG() {
 		peer.device.awg.ASecMux.RLock()
 		if peer.device.awg.ASecCfg.ResponsePacketJunkSize != 0 {
 			buf := make([]byte, 0, peer.device.awg.ASecCfg.ResponsePacketJunkSize)
diff --git a/device/uapi.go b/device/uapi.go
index 9372228..ea41520 100644
--- a/device/uapi.go
+++ b/device/uapi.go
@@ -98,7 +98,7 @@ func (device *Device) IpcGetOperation(w io.Writer) error {
 			sendf("fwmark=%d", device.net.fwmark)
 		}
 
-		if device.isAdvancedSecurityOn() {
+		if device.isAWG() {
 			if device.awg.ASecCfg.JunkPacketCount != 0 {
 				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 {
 				sendf("h4=%d", device.awg.ASecCfg.TransportPacketMagicHeader)
 			}
+
 			specialJunkIpcFields := device.awg.HandshakeHandler.SpecialJunk.IpcGetFields()
 			for _, field := range specialJunkIpcFields {
 				sendf("%s=%s", field.Key, field.Value)
@@ -134,6 +135,9 @@ func (device *Device) IpcGetOperation(w io.Writer) error {
 			for _, field := range controlledJunkIpcFields {
 				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 {