Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "config: Fix incorrect packet path with IPsec and endpoint rou… #17057

Merged
merged 1 commit into from
Aug 5, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/datapath/linux/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,6 @@ func (h *HeaderfileWriter) WriteNodeConfig(w io.Writer, cfg *datapath.LocalNodeC
cDefinesMap["ENABLE_EGRESS_GATEWAY"] = "1"
}

if option.Config.EnableEndpointRoutes {
cDefinesMap["ENABLE_ENDPOINT_ROUTES"] = "1"
}

if option.Config.EnableHostReachableServices {
if option.Config.EnableHostServicesTCP {
cDefinesMap["ENABLE_HOST_SERVICES_TCP"] = "1"
Expand Down Expand Up @@ -819,6 +815,10 @@ func (h *HeaderfileWriter) writeTemplateConfig(fw *bufio.Writer, e datapath.Endp
fmt.Fprintf(fw, "#define ENABLE_ROUTING 1\n")
}

if e.RequireEndpointRoute() {
fmt.Fprintf(fw, "#define ENABLE_ENDPOINT_ROUTES 1\n")
}

if e.DisableSIPVerification() {
fmt.Fprintf(fw, "#define DISABLE_SIP_VERIFICATION 1\n")
}
Expand Down