From 29a802408c60adf8c102ef30ea7bc5914ea79ffc Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Mon, 26 Aug 2024 16:23:49 +0900 Subject: [PATCH 1/3] gh-726 Overall fixes --- go.mod | 2 +- go.sum | 2 ++ loxilb-ebpf | 2 +- pkg/loxinet/rules.go | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 47b1bc2b8..da4d1b228 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-openapi/validate v0.22.0 github.com/jessevdk/go-flags v1.5.0 github.com/loxilb-io/ipvs v0.1.0 - github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f + github.com/loxilb-io/loxilib v0.8.9-0.20240826070926-6929c7b669f1 github.com/osrg/gobgp/v3 v3.5.0 github.com/prometheus-community/pro-bing v0.1.0 github.com/prometheus/client_model v0.3.0 diff --git a/go.sum b/go.sum index bf726af99..31169234e 100644 --- a/go.sum +++ b/go.sum @@ -296,6 +296,8 @@ github.com/loxilb-io/loxilib v0.8.9-0.20240124072521-f37fbddfb4e8 h1:PYkgIX2fv1U github.com/loxilb-io/loxilib v0.8.9-0.20240124072521-f37fbddfb4e8/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg= github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f h1:Zeas0eEF60hK+UwMp9QRqPtUuFQV6pC0X2re+yuqCEM= github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg= +github.com/loxilb-io/loxilib v0.8.9-0.20240826070926-6929c7b669f1 h1:6nwOmOypZLqBkm1x5DulX0BEROD04wD9yO/CCOjQWes= +github.com/loxilb-io/loxilib v0.8.9-0.20240826070926-6929c7b669f1/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg= github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4 h1:oDc2lsbfuQEcVP3k+Pw4v6Xdm3t4M9vBc1Y9egszv6g= github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4/go.mod h1:1a6hv8ISVQhnW5IVpW9o+OL6BAFlWiVpC0O4d19g+wQ= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= diff --git a/loxilb-ebpf b/loxilb-ebpf index f0f5b4f9e..4487bc9ed 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit f0f5b4f9e0c5dc2b735a7b8af45f1f71097a2b4c +Subproject commit 4487bc9ed19dbfb472a1dc59f47ba210089b5c24 diff --git a/pkg/loxinet/rules.go b/pkg/loxinet/rules.go index d4e2889fc..a67d974b8 100644 --- a/pkg/loxinet/rules.go +++ b/pkg/loxinet/rules.go @@ -2255,6 +2255,10 @@ func (R *RuleH) epCheckNow(ep *epHost) { ep.opts.probeType == HostProbeConnectSCTP { if ep.opts.probeType == HostProbeConnectTCP { sType = "tcp" + ret, sIP, _ := R.zone.L3.IfaSelectAny(net.ParseIP(ep.hostName), true) + if ret == 0 { + sHint = sIP.String() + } } else if ep.opts.probeType == HostProbeConnectUDP { sType = "udp" ret, sIP, _ := R.zone.L3.IfaSelectAny(net.ParseIP(ep.hostName), true) From 85e31c8051be59dca47e921107d78a65d6cfd5c5 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Mon, 26 Aug 2024 17:20:25 +0900 Subject: [PATCH 2/3] updated to latest loxilib --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index da4d1b228..8dca8535e 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-openapi/validate v0.22.0 github.com/jessevdk/go-flags v1.5.0 github.com/loxilb-io/ipvs v0.1.0 - github.com/loxilb-io/loxilib v0.8.9-0.20240826070926-6929c7b669f1 + github.com/loxilb-io/loxilib v0.8.9-0.20240826081440-53bcf7b9aed2 github.com/osrg/gobgp/v3 v3.5.0 github.com/prometheus-community/pro-bing v0.1.0 github.com/prometheus/client_model v0.3.0 diff --git a/go.sum b/go.sum index 31169234e..147be928d 100644 --- a/go.sum +++ b/go.sum @@ -298,6 +298,8 @@ github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f h1:Zeas0eEF60h github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg= github.com/loxilb-io/loxilib v0.8.9-0.20240826070926-6929c7b669f1 h1:6nwOmOypZLqBkm1x5DulX0BEROD04wD9yO/CCOjQWes= github.com/loxilb-io/loxilib v0.8.9-0.20240826070926-6929c7b669f1/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg= +github.com/loxilb-io/loxilib v0.8.9-0.20240826081440-53bcf7b9aed2 h1:id1unRAYmtM3asSpsE50LZJy7Z6cHjl8gNB4vZHMoQU= +github.com/loxilb-io/loxilib v0.8.9-0.20240826081440-53bcf7b9aed2/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg= github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4 h1:oDc2lsbfuQEcVP3k+Pw4v6Xdm3t4M9vBc1Y9egszv6g= github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4/go.mod h1:1a6hv8ISVQhnW5IVpW9o+OL6BAFlWiVpC0O4d19g+wQ= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= From 2fba99cccfa61d5d999770105414e802654d8ee2 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Mon, 26 Aug 2024 20:48:38 +0900 Subject: [PATCH 3/3] gh-726 Overall fixes --- loxilb-ebpf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loxilb-ebpf b/loxilb-ebpf index 4487bc9ed..d892b807a 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit 4487bc9ed19dbfb472a1dc59f47ba210089b5c24 +Subproject commit d892b807a68ff3816da0387aef3f4e40b0c7ee53