Clatd changes for move of libipchecksum.
libipchecksum is becoming its own library in
frameworks/libs/net and its include files are no longer under
netutils/. Adjust clatd code accordingly.
Also reorder some include files as suggested by clang-format.
Test: m
Test: atest clatd_test
Test: connects to IPv6-only wifi, testipv4.com shows 10/10
Change-Id: I5e4c73065ce828123aef7e8851227f9bdf444ff9
diff --git a/dump.c b/dump.c
index 7332d6c..289f161 100644
--- a/dump.c
+++ b/dump.c
@@ -15,9 +15,7 @@
*
* dump.c - print various headers for debugging
*/
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "dump.h"
#include <arpa/inet.h>
#include <linux/icmp.h>
@@ -29,12 +27,13 @@
#include <netinet/ip_icmp.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
-#include "netutils/checksum.h"
-
+#include "checksum.h"
#include "clatd.h"
#include "debug.h"
-#include "dump.h"
#include "logging.h"
#if CLAT_DEBUG