diff options
| author | San Mehat <san@google.com> | 2009-05-13 12:52:53 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-13 12:52:53 -0700 |
| commit | 4676aacd5e0d2916a093cf407c406b83de3146ee (patch) | |
| tree | 41d8206b74d0da22ec5507cc5a407e9330c79a15 | |
| parent | 06683a0564b2c96a710151070e9a7283bbf8f2e8 (diff) | |
| parent | fa49e2860bebe6bb2a26194c58992e5d5aed0b0d (diff) | |
| download | system_core-4676aacd5e0d2916a093cf407c406b83de3146ee.zip system_core-4676aacd5e0d2916a093cf407c406b83de3146ee.tar.gz system_core-4676aacd5e0d2916a093cf407c406b83de3146ee.tar.bz2 | |
am fa49e28: toolbox: Add \'pointopoint\' support to ifconfig
Merge commit 'fa49e2860bebe6bb2a26194c58992e5d5aed0b0d'
* commit 'fa49e2860bebe6bb2a26194c58992e5d5aed0b0d':
toolbox: Add 'pointopoint' support to ifconfig
| -rw-r--r-- | toolbox/ifconfig.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/toolbox/ifconfig.c b/toolbox/ifconfig.c index e83cd8b..1de362f 100644 --- a/toolbox/ifconfig.c +++ b/toolbox/ifconfig.c @@ -33,6 +33,12 @@ static inline void init_sockaddr_in(struct sockaddr_in *sin, const char *addr) sin->sin_addr.s_addr = inet_addr(addr); } +static void setdstaddr(int s, struct ifreq *ifr, const char *addr) +{ + init_sockaddr_in((struct sockaddr_in *) &ifr->ifr_dstaddr, addr); + if(ioctl(s, SIOCSIFDSTADDR, ifr) < 0) die("SIOCSIFDSTADDR"); +} + static void setnetmask(int s, struct ifreq *ifr, const char *addr) { init_sockaddr_in((struct sockaddr_in *) &ifr->ifr_netmask, addr); @@ -120,6 +126,16 @@ int ifconfig_main(int argc, char *argv[]) while(argc > 0){ if(!strcmp(argv[0], "up")) { setflags(s, &ifr, IFF_UP, 0); + } else if(!strcmp(argv[0], "-pointtopoint")) { + setflags(s, &ifr, IFF_POINTOPOINT, 1); + } else if(!strcmp(argv[0], "pointtopoint")) { + argc--, argv++; + if (0 == argc) { + errno = EINVAL; + die("expecting an IP address for parameter \"pointtopoint\""); + } + setdstaddr(s, &ifr, argv[0]); + setflags(s, &ifr, IFF_POINTOPOINT, 0); } else if(!strcmp(argv[0], "down")) { setflags(s, &ifr, 0, IFF_UP); } else if(!strcmp(argv[0], "netmask")) { |