diff options
| author | Colin Cross <ccross@android.com> | 2014-06-19 00:57:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 00:57:07 +0000 |
| commit | bb8aec417531010eadc27bdfed0c19fc5f669fbc (patch) | |
| tree | a440188b963ccf68ee4be2fa302e7a90d065dd5f /toolbox | |
| parent | 93a67779dc0d85d71dfe333244084341be0aa458 (diff) | |
| parent | 08c704a0fe64927fa8618c576c20e39de7f1aa19 (diff) | |
| download | system_core-bb8aec417531010eadc27bdfed0c19fc5f669fbc.zip system_core-bb8aec417531010eadc27bdfed0c19fc5f669fbc.tar.gz system_core-bb8aec417531010eadc27bdfed0c19fc5f669fbc.tar.bz2 | |
am 08c704a0: am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"
* commit '08c704a0fe64927fa8618c576c20e39de7f1aa19':
Use inet_ntoa to display ipaddr and mask values
Diffstat (limited to 'toolbox')
| -rw-r--r-- | toolbox/ifconfig.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/toolbox/ifconfig.c b/toolbox/ifconfig.c index 80c0e5c..b953176 100644 --- a/toolbox/ifconfig.c +++ b/toolbox/ifconfig.c @@ -61,11 +61,11 @@ int ifconfig_main(int argc, char *argv[]) { struct ifreq ifr; int s; - unsigned int addr, mask, flags; + unsigned int flags; char astring[20]; char mstring[20]; char *updown, *brdcst, *loopbk, *ppp, *running, *multi; - + argc--; argv++; @@ -85,13 +85,17 @@ int ifconfig_main(int argc, char *argv[]) perror(ifr.ifr_name); return -1; } else - addr = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr; + strlcpy(astring, + inet_ntoa(((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr), + sizeof(astring)); if (ioctl(s, SIOCGIFNETMASK, &ifr) < 0) { perror(ifr.ifr_name); return -1; } else - mask = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr; + strlcpy(mstring, + inet_ntoa(((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr), + sizeof(mstring)); if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) { perror(ifr.ifr_name); @@ -99,16 +103,6 @@ int ifconfig_main(int argc, char *argv[]) } else flags = ifr.ifr_flags; - sprintf(astring, "%d.%d.%d.%d", - addr & 0xff, - ((addr >> 8) & 0xff), - ((addr >> 16) & 0xff), - ((addr >> 24) & 0xff)); - sprintf(mstring, "%d.%d.%d.%d", - mask & 0xff, - ((mask >> 8) & 0xff), - ((mask >> 16) & 0xff), - ((mask >> 24) & 0xff)); printf("%s: ip %s mask %s flags [", ifr.ifr_name, astring, mstring |