Revert "DO NOT MERGE: Remove two almost-unused include files."
This reverts commit 86cb1ac3d69805bebcac7a18b408d656603028f4.
Change-Id: If592b80e8107f468c2fe1caf00fcff49f25a9441
diff --git a/clatd.c b/clatd.c
index 1ca46a3..26ecb57 100644
--- a/clatd.c
+++ b/clatd.c
@@ -47,6 +47,8 @@
#include <private/android_filesystem_config.h>
+#include "ipv4.h"
+#include "ipv6.h"
#include "translate.h"
#include "clatd.h"
#include "config.h"
diff --git a/ipv4.c b/ipv4.c
index 47f2422..89e47e4 100644
--- a/ipv4.c
+++ b/ipv4.c
@@ -28,6 +28,7 @@
#include "translate.h"
#include "checksum.h"
+#include "ipv4.h"
#include "logging.h"
#include "debug.h"
#include "dump.h"
diff --git a/ipv4.h b/ipv4.h
new file mode 100644
index 0000000..00befd2
--- /dev/null
+++ b/ipv4.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2011 Daniel Drown
+ *
+ * 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.
+ *
+ * ipv4.h - takes an ipv4 packet and hands it off to the proper translate function
+ */
+#ifndef __IPV4_H__
+#define __IPV4_H__
+
+#include "translate.h"
+
+int ipv4_packet(clat_packet out, int pos, const char *packet, size_t len);
+
+#endif /* __IPV4_H__ */
diff --git a/ipv6.c b/ipv6.c
index faf27ad..ef1e62f 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -29,6 +29,7 @@
#include "translate.h"
#include "checksum.h"
+#include "ipv6.h"
#include "logging.h"
#include "dump.h"
#include "config.h"
diff --git a/ipv6.h b/ipv6.h
new file mode 100644
index 0000000..019de17
--- /dev/null
+++ b/ipv6.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2011 Daniel Drown
+ *
+ * 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.
+ *
+ * ipv6.h - takes an ipv6 packet and hands it off to the proper translate function
+ */
+#ifndef __IPV6_H__
+#define __IPV6_H__
+
+#include "translate.h"
+
+int ipv6_packet(clat_packet out, int pos, const char *packet, size_t len);
+
+#endif /* __IPV6_H__ */
diff --git a/translate.h b/translate.h
index 356050f..fded251 100644
--- a/translate.h
+++ b/translate.h
@@ -47,10 +47,6 @@
void fill_ip6_header(struct ip6_hdr *ip6, uint16_t payload_len, uint8_t protocol,
const struct iphdr *old_header);
-// Translate IPv4 and IPv6 packets.
-int ipv4_packet(clat_packet out, int pos, const char *packet, size_t len);
-int ipv6_packet(clat_packet out, int pos, const char *packet, size_t len);
-
// Translate ICMP packets.
int icmp_to_icmp6(clat_packet out, int pos, const struct icmphdr *icmp, uint32_t checksum,
const char *payload, size_t payload_size);