summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clatd.c2
-rw-r--r--config.c2
-rw-r--r--icmp.c2
-rw-r--r--ipv6.c1
-rw-r--r--translate.c1
5 files changed, 2 insertions, 6 deletions
diff --git a/clatd.c b/clatd.c
index 09a86de..a0ee07d 100644
--- a/clatd.c
+++ b/clatd.c
@@ -144,7 +144,6 @@ void deconfigure_tun_ipv6(const struct tun_data *tunnel) {
* tunnel - tun device data
*/
void configure_tun_ipv6(const struct tun_data *tunnel) {
- struct in6_addr local_nat64_prefix_6;
int status;
status = if_route(tunnel->device6, AF_INET6, &Global_Clatd_Config.ipv6_local_subnet,
@@ -377,7 +376,6 @@ void read_packet(int active_fd, const struct tun_data *tunnel) {
logmsg(ANDROID_LOG_WARN,"read_packet/tun interface removed");
running = 0;
} else {
- struct tun_pi tun_header;
ssize_t header_size = sizeof(struct tun_pi);
if(readlen < header_size) {
diff --git a/config.c b/config.c
index 61a4ebb..b82ac6c 100644
--- a/config.c
+++ b/config.c
@@ -154,7 +154,7 @@ void free_config() {
* does dns lookups to set the plat subnet or exits on failure, waits forever for a dns response with a query backoff timer
*/
void dns64_detection() {
- int i, backoff_sleep, status;
+ int backoff_sleep, status;
struct in6_addr tmp_ptr;
backoff_sleep = 1;
diff --git a/icmp.c b/icmp.c
index af96b83..75a4a4d 100644
--- a/icmp.c
+++ b/icmp.c
@@ -139,7 +139,7 @@ uint8_t icmp6_to_icmp_type(uint8_t type, uint8_t code) {
}
// We don't understand this ICMP type. Return parameter problem so the caller will bail out.
- logmsg_dbg(ANDROID_LOG_DEBUG, "icmp6_to_icmp_type: unhandled ICMP type %d", type);
+ logmsg_dbg(ANDROID_LOG_DEBUG, "icmp6_to_icmp_type: unhandled ICMP type/code %d/%d", type, code);
return ICMP_PARAMETERPROB;
}
diff --git a/ipv6.c b/ipv6.c
index 04d9f9c..79303ec 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -90,7 +90,6 @@ int ipv6_packet(clat_packet out, int pos, const char *packet, size_t len) {
size_t len_left;
uint32_t checksum;
int iov_len;
- int i;
if(len < sizeof(struct ip6_hdr)) {
logmsg_dbg(ANDROID_LOG_ERROR, "ipv6_packet/too short for an ip6 header: %d", len);
diff --git a/translate.c b/translate.c
index 927b49c..00ea0b9 100644
--- a/translate.c
+++ b/translate.c
@@ -244,7 +244,6 @@ int icmp6_to_icmp(clat_packet out, int pos, const struct icmp6_hdr *icmp6,
const char *payload, size_t payload_size) {
struct icmphdr *icmp_targ = out[pos].iov_base;
uint8_t icmp_type;
- int ttl;
int clat_packet_len;
memset(icmp_targ, 0, sizeof(struct icmphdr));