Skip to content

Commit 8314678

Browse files
committed
MINOR: bind: add tcp-ss option
1 parent 79b2977 commit 8314678

File tree

16 files changed

+86
-4
lines changed

16 files changed

+86
-4
lines changed

config-parser/params/bind-options.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ var bindOptionFactoryMethods = map[string]func() BindOption{ //nolint:gochecknog
306306
"ssl-max-ver": func() BindOption { return &BindOptionValue{Name: "ssl-max-ver"} },
307307
"ssl-min-ver": func() BindOption { return &BindOptionValue{Name: "ssl-min-ver"} },
308308
"tcp-md5sig": func() BindOption { return &BindOptionValue{Name: "tcp-md5sig"} },
309+
"tcp-ss": func() BindOption { return &BindOptionValue{Name: "tcp-ss"} },
309310
"tcp-ut": func() BindOption { return &BindOptionValue{Name: "tcp-ut"} },
310311
"thread": func() BindOption { return &BindOptionValue{Name: "thread"} },
311312
"tls-ticket-keys": func() BindOption { return &BindOptionValue{Name: "tls-ticket-keys"} },

config-parser/tests/bind_generated_test.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/configs/haproxy_generated.cfg.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/integration/frontend_data_test.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/tests/integration/frontend_test.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config-parser/types/types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,8 @@ type ACL struct{}
276276
//test:ok:bind :443 ktls off
277277
//test:fail:bind :443 ktls
278278
//test:fail:bind :443 ktls something
279+
//test:ok:bind :443 tcp-ss 1
280+
//test:fail:bind :443 tcp-ss
279281
type Bind struct {
280282
Path string // can be address:port or socket path
281283
Params []params.BindOption

configuration/bind.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,11 @@ func parseBindParams(bindOptions []params.BindOption) (models.BindParams, string
306306
name = v.Value
307307
case "tcp-ut":
308308
b.TCPUserTimeout = misc.ParseTimeout(v.Value)
309+
case "tcp-ss":
310+
tcpss, err := strconv.ParseInt(v.Value, 10, 64)
311+
if err == nil {
312+
b.TCPSs = tcpss
313+
}
309314
case "tcp-md5sig":
310315
b.TCPMd5sig = v.Value
311316
case "crt":
@@ -486,6 +491,9 @@ func serializeBindParams(b models.BindParams, name string, path string, opt *opt
486491
if b.CaVerifyFile != "" {
487492
options = append(options, &params.BindOptionValue{Name: "ca-verify-file", Value: b.CaVerifyFile})
488493
}
494+
if b.TCPSs != 0 {
495+
options = append(options, &params.BindOptionValue{Name: "tcp-ss", Value: strconv.FormatInt(b.TCPSs, 10)})
496+
}
489497
if b.TCPUserTimeout != nil {
490498
options = append(options, &params.BindOptionValue{Name: "tcp-ut", Value: strconv.FormatInt(*b.TCPUserTimeout, 10)})
491499
}

models/bind_params.go

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/bind_params_compare_test.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/bindparams_diff_generated.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)