Updated to latest submodules

loxilb-io · Dec 17, 2024 · 94f30a7 · 94f30a7
1 parent b7b1959
commit 94f30a7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git 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.20240912025939-1e5e76723499
+	github.com/loxilb-io/loxilib v0.8.9-0.20241217033340-39dbcd8d8dc3
 	github.com/osrg/gobgp/v3 v3.29.0
 	github.com/prometheus-community/pro-bing v0.1.0
 	github.com/prometheus/client_model v0.3.0
@@ -53,7 +53,7 @@ require (
 	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/loxilb-io/sctp v0.0.0-20240912025756-01894eac308b // indirect
+	github.com/loxilb-io/sctp v0.0.0-20241217032220-301b591b9ced // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/moby/ipvs v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

diff --git a/go.sum b/go.sum
@@ -173,12 +173,18 @@ github.com/loxilb-io/loxilib v0.8.9-0.20240912025144-088c2b9843ec h1:2iozRGoNW+F
 github.com/loxilb-io/loxilib v0.8.9-0.20240912025144-088c2b9843ec/go.mod h1:HZwYNAmuyvPZwzB5jon8s73V+Tzro8NPuQnYa9oeUQE=
 github.com/loxilb-io/loxilib v0.8.9-0.20240912025939-1e5e76723499 h1:zX/WEmsumpyLPMMkcFzxp3r60x0sqHDSOeJ+CwdfD5c=
 github.com/loxilb-io/loxilib v0.8.9-0.20240912025939-1e5e76723499/go.mod h1:72c3DmIKC53G5f4eNhTElemB08S64Xm/4QsDtwc66vw=
+github.com/loxilb-io/loxilib v0.8.9-0.20241216233038-17d1ef9e89c8 h1:brNeihDQUB2rQlnCdbn+huAzoFQqbfjHJ7nOlkh7i6w=
+github.com/loxilb-io/loxilib v0.8.9-0.20241216233038-17d1ef9e89c8/go.mod h1:72c3DmIKC53G5f4eNhTElemB08S64Xm/4QsDtwc66vw=
+github.com/loxilb-io/loxilib v0.8.9-0.20241217033340-39dbcd8d8dc3 h1:JIq1ffW2Fm77KONpDmn7LdQ3cfE1TTDkSvIxYOSn7B4=
+github.com/loxilb-io/loxilib v0.8.9-0.20241217033340-39dbcd8d8dc3/go.mod h1:Hw/yOnOs3ZbEc53z3Pz1UhoIJun3MaWZKjHJlBJNrBM=
 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/loxilb-io/sctp v0.0.0-20240912024735-b9c5910e672f h1:sm8UnXJa4dAV/wTEbc59F+Gf3FlfvSJY+OcPFfY9Eck=
 github.com/loxilb-io/sctp v0.0.0-20240912024735-b9c5910e672f/go.mod h1:g3xKRvSWoeijv487mRGw3sLDacD9bC+wRQ4QebiafiQ=
 github.com/loxilb-io/sctp v0.0.0-20240912025756-01894eac308b h1:QZHlUZTWMpghNQW/OzdKFY2PhhPFMPAjsfRSLZkAONU=
 github.com/loxilb-io/sctp v0.0.0-20240912025756-01894eac308b/go.mod h1:g3xKRvSWoeijv487mRGw3sLDacD9bC+wRQ4QebiafiQ=
+github.com/loxilb-io/sctp v0.0.0-20241217032220-301b591b9ced h1:XRB++1zTq2epcR8c8K+OK0+8RnEg/Rf6a73qs+rJ0fE=
+github.com/loxilb-io/sctp v0.0.0-20241217032220-301b591b9ced/go.mod h1:g3xKRvSWoeijv487mRGw3sLDacD9bC+wRQ4QebiafiQ=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=

diff --git a/loxilb-ebpf b/loxilb-ebpf
diff --git a/pkg/loxinet/rules.go b/pkg/loxinet/rules.go
@@ -2368,13 +2368,11 @@ func (R *RuleH) AddEPHost(apiCall bool, hostName string, name string, args epHos
 	if apiCall != true {
 		ep.ruleCount = 1
 	}
-	if args.probeType != HostProbeConnectUDP {
-		ep.hID = R.lepHID % MaxEndPointCheckers
-		//ep.sT = time.Now()
-		R.lepHID++
-	} else {
-		ep.hID = 0
-	}
+	// if args.probeType != HostProbeConnectUDP
+	// Set ep.hID = 0, if we need to disable threads
+	ep.hID = R.lepHID % MaxEndPointCheckers
+	//ep.sT = time.Now()
+	R.lepHID++
 
 	R.epMap[epKey] = ep
+1 −1		common/common.mk
+2 −2		common/llb_dpapi.h
+26 −1		kernel/llb_kern_natlbfwd.c