Merge "Fix the flaky netlink_listener_test"
diff --git a/bpf_progs/Android.bp b/bpf_progs/Android.bp
index 4302129..a393035 100644
--- a/bpf_progs/Android.bp
+++ b/bpf_progs/Android.bp
@@ -18,6 +18,19 @@
// bpf kernel programs
//
bpf {
+ name: "clatd.o",
+ srcs: ["clatd.c"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+ include_dirs: [
+ "system/netd/libnetdbpf/include",
+ "system/netd/libnetdutils/include",
+ ],
+}
+
+bpf {
name: "netd.o",
srcs: ["netd.c"],
cflags: [
diff --git a/bpf_progs/clatd.c b/bpf_progs/clatd.c
new file mode 100644
index 0000000..fb31b36
--- /dev/null
+++ b/bpf_progs/clatd.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <linux/pkt_cls.h>
+#include "bpf_helpers.h"
+#include "netdbpf/bpf_shared.h"
+
+struct bpf_map_def SEC("maps") clat_map = {
+ .type = BPF_MAP_TYPE_HASH,
+ .key_size = sizeof(struct ClatKey),
+ .value_size = sizeof(struct ClatValue),
+ .max_entries = 16,
+};
+
+SEC("schedcls/ingress/clat_ether")
+int sched_cls_ingress_clat_ether(struct __sk_buff* skb) {
+ return TC_ACT_OK;
+}
+
+SEC("schedcls/ingress/clat_rawip")
+int sched_cls_ingress_clat_rawip(struct __sk_buff* skb) {
+ return TC_ACT_OK;
+}
+
+char _license[] SEC("license") = "Apache 2.0";
diff --git a/libnetdbpf/include/netdbpf/bpf_shared.h b/libnetdbpf/include/netdbpf/bpf_shared.h
index 4d807a2..1a48e00 100644
--- a/libnetdbpf/include/netdbpf/bpf_shared.h
+++ b/libnetdbpf/include/netdbpf/bpf_shared.h
@@ -17,6 +17,8 @@
#ifndef NETDBPF_BPF_SHARED_H
#define NETDBPF_BPF_SHARED_H
+#include <linux/in.h>
+#include <linux/in6.h>
#include <netdutils/UidConstants.h>
// const values shared by bpf kernel program bpfloader and netd
@@ -106,4 +108,15 @@
#define UID_RULES_CONFIGURATION_KEY 1
#define CURRENT_STATS_MAP_CONFIGURATION_KEY 2
+struct ClatKey {
+ uint32_t iif; // The input interface index
+ struct in6_addr src6; // The source /96 nat64 prefix, bottom 32 bits must be 0
+ struct in6_addr dst6; // The full 128-bits of the destination IPv6 address
+};
+
+struct ClatValue {
+ uint32_t oif; // The output interface to redirect to (0 means don't redirect)
+ struct in_addr dst4; // The destination IPv4 address
+};
+
#endif // NETDBPF_BPF_SHARED_H
