[automerger skipped] cleanup - remove config.c am: 2d35cdbd89 am: c26d3df4fc -s ours
am skip reason: Change-Id I8500881852f1255a69b49eba6354777883fe438f with SHA-1 2d35cdbd89 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736440
Change-Id: I7caba6ca05b157725107a9217911c4275e94aee5
diff --git a/Android.bp b/Android.bp
index 7c1c1df..ac24a00 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,12 +65,6 @@
],
}
-// The configuration file.
-prebuilt_etc {
- name: "clatd.conf",
- src: "clatd.conf",
-}
-
// Unit tests.
cc_test {
name: "clatd_test",
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: NOTICE
+}
diff --git a/clatd.c b/clatd.c
index 7063215..422cded 100644
--- a/clatd.c
+++ b/clatd.c
@@ -426,7 +426,8 @@
}
time_t now = time(NULL);
- if (last_interface_poll < (now - INTERFACE_POLL_FREQUENCY)) {
+ if (now >= (last_interface_poll + INTERFACE_POLL_FREQUENCY)) {
+ last_interface_poll = now;
if (ipv6_address_changed(Global_Clatd_Config.native_ipv6_interface)) {
break;
}
diff --git a/clatd.conf b/clatd.conf
deleted file mode 100644
index e69de29..0000000
--- a/clatd.conf
+++ /dev/null