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.

Sign up for GitHub

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

Jump to bottom

datapath: Pass proxy port in to-proxy traces #17595

Merged
merged 1 commit into from
Nov 4, 2021
Merged

datapath: Pass proxy port in to-proxy traces #17595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions bpf/bpf_lxc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ static __always_inline int ipv6_l3_from_lxc(struct __ctx_buff *ctx,
if (redirect_to_proxy(verdict, reason)) {
/* Trace the packet before it is forwarded to proxy */
send_trace_notify(ctx, TRACE_TO_PROXY, SECLABEL, 0,
0, 0, reason, monitor);
bpf_ntohs(verdict), 0, reason, monitor);
return ctx_redirect_to_proxy6(ctx, tuple, verdict, false);
}

Expand Down Expand Up @@ -739,7 +739,7 @@ static __always_inline int handle_ipv4_from_lxc(struct __ctx_buff *ctx,
if (redirect_to_proxy(verdict, reason)) {
/* Trace the packet before it is forwarded to proxy */
send_trace_notify(ctx, TRACE_TO_PROXY, SECLABEL, 0,
0, 0, reason, monitor);
bpf_ntohs(verdict), 0, reason, monitor);
return ctx_redirect_to_proxy4(ctx, &tuple, verdict, false);
}

Expand Down Expand Up @@ -1073,7 +1073,7 @@ ipv6_policy(struct __ctx_buff *ctx, int ifindex, __u32 src_label, __u8 *reason,
* into ctx->mark and *proxy_port can be left unset.
*/
send_trace_notify6(ctx, TRACE_TO_PROXY, src_label, SECLABEL, &orig_sip,
0, ifindex, 0, monitor);
0, ifindex, 0, monitor);
if (tuple_out)
memcpy(tuple_out, &tuple, sizeof(tuple));
return POLICY_ACT_PROXY_REDIRECT;
Expand Down Expand Up @@ -1141,7 +1141,7 @@ ipv6_policy(struct __ctx_buff *ctx, int ifindex, __u32 src_label, __u8 *reason,
if (redirect_to_proxy(verdict, *reason)) {
*proxy_port = verdict;
send_trace_notify6(ctx, TRACE_TO_PROXY, src_label, SECLABEL, &orig_sip,
0, ifindex, *reason, monitor);
bpf_ntohs(verdict), ifindex, *reason, monitor);
if (tuple_out)
memcpy(tuple_out, &tuple, sizeof(tuple));
return POLICY_ACT_PROXY_REDIRECT;
Expand Down Expand Up @@ -1351,7 +1351,7 @@ ipv4_policy(struct __ctx_buff *ctx, int ifindex, __u32 src_label, __u8 *reason,
* into ctx->mark and *proxy_port can be left unset.
*/
send_trace_notify4(ctx, TRACE_TO_PROXY, src_label, SECLABEL, orig_sip,
0, ifindex, 0, monitor);
0, ifindex, 0, monitor);
if (tuple_out)
*tuple_out = tuple;
return POLICY_ACT_PROXY_REDIRECT;
Expand Down Expand Up @@ -1443,7 +1443,7 @@ ipv4_policy(struct __ctx_buff *ctx, int ifindex, __u32 src_label, __u8 *reason,
if (redirect_to_proxy(verdict, *reason)) {
*proxy_port = verdict;
send_trace_notify4(ctx, TRACE_TO_PROXY, src_label, SECLABEL, orig_sip,
0, ifindex, *reason, monitor);
bpf_ntohs(verdict), ifindex, *reason, monitor);
if (tuple_out)
*tuple_out = tuple;
return POLICY_ACT_PROXY_REDIRECT;
Expand Down
13 changes: 11 additions & 2 deletions pkg/monitor/datapath_trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@ func (n *TraceNotify) traceSummary() string {
case api.TraceToLxc:
return fmt.Sprintf("-> endpoint %d", n.DstID)
case api.TraceToProxy:
return "-> proxy"
pp := ""
if n.DstID != 0 {
pp = fmt.Sprintf(" port %d", n.DstID)
}
return "-> proxy" + pp
case api.TraceToHost:
return "-> host from"
case api.TraceToStack:
Expand Down Expand Up @@ -216,13 +220,18 @@ func (n *TraceNotify) DumpVerbose(dissect bool, data []byte, prefix string, nume
}

if n.SrcLabel != 0 || n.DstLabel != 0 {
fmt.Fprintf(buf, ", ")
n.dumpIdentity(buf, numeric)
}

fmt.Fprintf(buf, ", orig-ip %s", n.OriginalIP().String())

if n.DstID != 0 {
fmt.Fprintf(buf, ", to endpoint %d\n", n.DstID)
dst := "endpoint"
if n.ObsPoint == api.TraceToProxy {
dst = "proxy-port"
}
fmt.Fprintf(buf, ", to %s %d\n", dst, n.DstID)
} else {
fmt.Fprintf(buf, "\n")
}
Expand Down