diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2014-06-13 03:04:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-13 03:04:12 +0000 |
commit | 87342f29a9bbf15db4867941e4d3bb2e4fd11053 (patch) | |
tree | f116d25c71edea06af35c72f9fe1d48a370d0589 | |
parent | 522930f0659319bf8d3d22b72a7d68280de295fe (diff) | |
parent | b9b471e1e3788a398adeb0a04bfc52d6ba7c3cf6 (diff) | |
download | platform_external_android-clat-87342f29a9bbf15db4867941e4d3bb2e4fd11053.tar.gz platform_external_android-clat-87342f29a9bbf15db4867941e4d3bb2e4fd11053.tar.bz2 platform_external_android-clat-87342f29a9bbf15db4867941e4d3bb2e4fd11053.zip |
am b9b471e1: Log unexpected arguments.
* commit 'b9b471e1e3788a398adeb0a04bfc52d6ba7c3cf6':
Log unexpected arguments.
-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(); |