summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-24 18:43:39 -0800
committerLorenzo Colitti <lorenzo@google.com>2015-03-03 16:38:06 +0900
commite17c0ba1a385e6f0e7053f6b0206ff963d6b5ba5 (patch)
tree0f7b7f1ea84004f63344689650ffb3adf9cba142
parent2596f42a4f4c42bfb96ccbfc2700dbf70502ec75 (diff)
downloadandroid_external_android-clat-e17c0ba1a385e6f0e7053f6b0206ff963d6b5ba5.tar.gz
android_external_android-clat-e17c0ba1a385e6f0e7053f6b0206ff963d6b5ba5.tar.bz2
android_external_android-clat-e17c0ba1a385e6f0e7053f6b0206ff963d6b5ba5.zip
Android-Clatd: Remove unused variable
For build-system CFLAGS clean-up, fix unused-but-set variables. (cherry picked from commit fee9afb1a5d9f7f5df0c79e29368c61d7da16fb8) Change-Id: Icacc158baae40d18f56bb32bb400ae6e765b0dad
-rw-r--r--clatd_test.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/clatd_test.cpp b/clatd_test.cpp
index fe52c21..aa3af74 100644
--- a/clatd_test.cpp
+++ b/clatd_test.cpp
@@ -432,7 +432,6 @@ void do_translate_packet(const uint8_t *original, size_t original_len, uint8_t *
if (socketpair(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0, fds)) {
abort();
}
- struct tun_pi tun_header = { 0, 0 };
char foo[512];
snprintf(foo, sizeof(foo), "%s: Invalid original packet", msg);
@@ -443,13 +442,11 @@ void do_translate_packet(const uint8_t *original, size_t original_len, uint8_t *
int version = ip_version(original);
switch (version) {
case 4:
- tun_header.proto = htons(ETH_P_IP);
expected_proto = htons(ETH_P_IPV6);
read_fd = fds[1];
write_fd = fds[0];
break;
case 6:
- tun_header.proto = htons(ETH_P_IPV6);
expected_proto = htons(ETH_P_IP);
read_fd = fds[0];
write_fd = fds[1];