diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-03 12:21:59 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-03 12:21:59 +0000 |
| commit | 27af5a0dd34b1b392aa69b548e18935aafe66e5f (patch) | |
| tree | 0de777f153dec72a0339c12d360e8bf156d17b45 /networking/libiproute | |
| parent | 87d80dcc3e81d80caa11ed88fe6136ffe3e605dc (diff) | |
| download | busybox-w32-27af5a0dd34b1b392aa69b548e18935aafe66e5f.tar.gz busybox-w32-27af5a0dd34b1b392aa69b548e18935aafe66e5f.tar.bz2 busybox-w32-27af5a0dd34b1b392aa69b548e18935aafe66e5f.zip | |
replacing func() with xfunc() where appropriate
Diffstat (limited to 'networking/libiproute')
| -rw-r--r-- | networking/libiproute/iptunnel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index 4524d4954..806d8657d 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c | |||
| @@ -43,7 +43,7 @@ static int do_ioctl_get_ifindex(char *dev) | |||
| 43 | int fd; | 43 | int fd; |
| 44 | 44 | ||
| 45 | strcpy(ifr.ifr_name, dev); | 45 | strcpy(ifr.ifr_name, dev); |
| 46 | fd = socket(AF_INET, SOCK_DGRAM, 0); | 46 | fd = xsocket(AF_INET, SOCK_DGRAM, 0); |
| 47 | if (ioctl(fd, SIOCGIFINDEX, &ifr)) { | 47 | if (ioctl(fd, SIOCGIFINDEX, &ifr)) { |
| 48 | bb_perror_msg("ioctl"); | 48 | bb_perror_msg("ioctl"); |
| 49 | return 0; | 49 | return 0; |
| @@ -58,7 +58,7 @@ static int do_ioctl_get_iftype(char *dev) | |||
| 58 | int fd; | 58 | int fd; |
| 59 | 59 | ||
| 60 | strcpy(ifr.ifr_name, dev); | 60 | strcpy(ifr.ifr_name, dev); |
| 61 | fd = socket(AF_INET, SOCK_DGRAM, 0); | 61 | fd = xsocket(AF_INET, SOCK_DGRAM, 0); |
| 62 | if (ioctl(fd, SIOCGIFHWADDR, &ifr)) { | 62 | if (ioctl(fd, SIOCGIFHWADDR, &ifr)) { |
| 63 | bb_perror_msg("ioctl"); | 63 | bb_perror_msg("ioctl"); |
| 64 | return -1; | 64 | return -1; |
| @@ -74,7 +74,7 @@ static char *do_ioctl_get_ifname(int idx) | |||
| 74 | int fd; | 74 | int fd; |
| 75 | 75 | ||
| 76 | ifr.ifr_ifindex = idx; | 76 | ifr.ifr_ifindex = idx; |
| 77 | fd = socket(AF_INET, SOCK_DGRAM, 0); | 77 | fd = xsocket(AF_INET, SOCK_DGRAM, 0); |
| 78 | if (ioctl(fd, SIOCGIFNAME, &ifr)) { | 78 | if (ioctl(fd, SIOCGIFNAME, &ifr)) { |
| 79 | bb_perror_msg("ioctl"); | 79 | bb_perror_msg("ioctl"); |
| 80 | return NULL; | 80 | return NULL; |
| @@ -93,7 +93,7 @@ static int do_get_ioctl(char *basedev, struct ip_tunnel_parm *p) | |||
| 93 | 93 | ||
| 94 | strcpy(ifr.ifr_name, basedev); | 94 | strcpy(ifr.ifr_name, basedev); |
| 95 | ifr.ifr_ifru.ifru_data = (void*)p; | 95 | ifr.ifr_ifru.ifru_data = (void*)p; |
| 96 | fd = socket(AF_INET, SOCK_DGRAM, 0); | 96 | fd = xsocket(AF_INET, SOCK_DGRAM, 0); |
| 97 | err = ioctl(fd, SIOCGETTUNNEL, &ifr); | 97 | err = ioctl(fd, SIOCGETTUNNEL, &ifr); |
| 98 | if (err) { | 98 | if (err) { |
| 99 | bb_perror_msg("ioctl"); | 99 | bb_perror_msg("ioctl"); |
| @@ -114,7 +114,7 @@ static int do_add_ioctl(int cmd, char *basedev, struct ip_tunnel_parm *p) | |||
| 114 | strcpy(ifr.ifr_name, basedev); | 114 | strcpy(ifr.ifr_name, basedev); |
| 115 | } | 115 | } |
| 116 | ifr.ifr_ifru.ifru_data = (void*)p; | 116 | ifr.ifr_ifru.ifru_data = (void*)p; |
| 117 | fd = socket(AF_INET, SOCK_DGRAM, 0); | 117 | fd = xsocket(AF_INET, SOCK_DGRAM, 0); |
| 118 | err = ioctl(fd, cmd, &ifr); | 118 | err = ioctl(fd, cmd, &ifr); |
| 119 | if (err) { | 119 | if (err) { |
| 120 | bb_perror_msg("ioctl"); | 120 | bb_perror_msg("ioctl"); |
| @@ -135,7 +135,7 @@ static int do_del_ioctl(char *basedev, struct ip_tunnel_parm *p) | |||
| 135 | strcpy(ifr.ifr_name, basedev); | 135 | strcpy(ifr.ifr_name, basedev); |
| 136 | } | 136 | } |
| 137 | ifr.ifr_ifru.ifru_data = (void*)p; | 137 | ifr.ifr_ifru.ifru_data = (void*)p; |
| 138 | fd = socket(AF_INET, SOCK_DGRAM, 0); | 138 | fd = xsocket(AF_INET, SOCK_DGRAM, 0); |
| 139 | err = ioctl(fd, SIOCDELTUNNEL, &ifr); | 139 | err = ioctl(fd, SIOCDELTUNNEL, &ifr); |
| 140 | if (err) { | 140 | if (err) { |
| 141 | bb_perror_msg("ioctl"); | 141 | bb_perror_msg("ioctl"); |