diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2014-06-09 19:39:01 +0900 |
---|---|---|
committer | Lorenzo Colitti <lorenzo@google.com> | 2014-06-13 11:51:43 +0900 |
commit | b9b471e1e3788a398adeb0a04bfc52d6ba7c3cf6 (patch) | |
tree | f116d25c71edea06af35c72f9fe1d48a370d0589 | |
parent | 7564761e2d98ce52a128b2338ec5edcd13aaed01 (diff) | |
download | android_external_android-clat-b9b471e1e3788a398adeb0a04bfc52d6ba7c3cf6.tar.gz android_external_android-clat-b9b471e1e3788a398adeb0a04bfc52d6ba7c3cf6.tar.bz2 android_external_android-clat-b9b471e1e3788a398adeb0a04bfc52d6ba7c3cf6.zip |
Log unexpected arguments.
(cherry picked from commit 3e7b1d8f783320d38382089a3c9a790ba13772dc)
Bug: 15340961
Change-Id: Iff172b066aa468f9ee36aab661a8b51cb03db95b
-rw-r--r-- | clatd.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -458,10 +458,11 @@ int main(int argc, char **argv) { mark_str = optarg; break; case 'h': - default: print_help(); + exit(0); + default: + logmsg(ANDROID_LOG_FATAL, "Unknown option -%c. Exiting.", (char) optopt); exit(1); - break; } } @@ -480,8 +481,10 @@ int main(int argc, char **argv) { exit(1); } - logmsg(ANDROID_LOG_INFO, "Starting clat version %s on %s netid=%s mark=%s", CLATD_VERSION, - uplink_interface, net_id_str, mark_str); + logmsg(ANDROID_LOG_INFO, "Starting clat version %s on %s netid=%s mark=%s", + CLATD_VERSION, uplink_interface, + net_id_str ? net_id_str : "(none)", + mark_str ? mark_str : "(none)"); // open the tunnel device and our raw sockets before dropping privs tunnel.fd4 = tun_open(); |