Remove trailing whitespace. Update copyright to include 2004.

[oweals/busybox.git] / networking / libiproute / iptunnel.c

diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 3d73ca81c366126f801d16ae88ec6ef7ee628b9b..3f5d05ae91c47897946f10ba05209519b11f4754 100644 (file)
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -25,8 +25,13 @@
 
 #include <arpa/inet.h>
 #include <netinet/ip.h>
+#include <netinet/in.h>
 
-#include <linux/if_arp.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+
+#include <asm/types.h>
+#define __constant_htons htons
 #include <linux/if_tunnel.h>
 
 #include "rt_names.h"
@@ -42,7 +47,7 @@ static int do_ioctl_get_ifindex(char *dev)
        strcpy(ifr.ifr_name, dev);
        fd = socket(AF_INET, SOCK_DGRAM, 0);
        if (ioctl(fd, SIOCGIFINDEX, &ifr)) {
-               perror_msg("ioctl");
+               bb_perror_msg("ioctl");
                return 0;
        }
        close(fd);
@@ -57,7 +62,7 @@ static int do_ioctl_get_iftype(char *dev)
        strcpy(ifr.ifr_name, dev);
        fd = socket(AF_INET, SOCK_DGRAM, 0);
        if (ioctl(fd, SIOCGIFHWADDR, &ifr)) {
-               perror_msg("ioctl");
+               bb_perror_msg("ioctl");
                return -1;
        }
        close(fd);
@@ -73,7 +78,7 @@ static char *do_ioctl_get_ifname(int idx)
        ifr.ifr_ifindex = idx;
        fd = socket(AF_INET, SOCK_DGRAM, 0);
        if (ioctl(fd, SIOCGIFNAME, &ifr)) {
-               perror_msg("ioctl");
+               bb_perror_msg("ioctl");
                return NULL;
        }
        close(fd);
@@ -93,7 +98,7 @@ static int do_get_ioctl(char *basedev, struct ip_tunnel_parm *p)
        fd = socket(AF_INET, SOCK_DGRAM, 0);
        err = ioctl(fd, SIOCGETTUNNEL, &ifr);
        if (err) {
-               perror_msg("ioctl");
+               bb_perror_msg("ioctl");
        }
        close(fd);
        return err;
@@ -114,7 +119,7 @@ static int do_add_ioctl(int cmd, char *basedev, struct ip_tunnel_parm *p)
        fd = socket(AF_INET, SOCK_DGRAM, 0);
        err = ioctl(fd, cmd, &ifr);
        if (err) {
-               perror_msg("ioctl");
+               bb_perror_msg("ioctl");
        }
        close(fd);
        return err;
@@ -135,7 +140,7 @@ static int do_del_ioctl(char *basedev, struct ip_tunnel_parm *p)
        fd = socket(AF_INET, SOCK_DGRAM, 0);
        err = ioctl(fd, SIOCDELTUNNEL, &ifr);
        if (err) {
-               perror_msg("ioctl");
+               bb_perror_msg("ioctl");
        }
        close(fd);
        return err;
@@ -161,26 +166,26 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                        if (strcmp(*argv, "ipip") == 0 ||
                            strcmp(*argv, "ip/ip") == 0) {
                                if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) {
-                                       error_msg("You managed to ask for more than one tunnel mode.");
+                                       bb_error_msg("You managed to ask for more than one tunnel mode.");
                                        exit(-1);
                                }
                                p->iph.protocol = IPPROTO_IPIP;
                        } else if (strcmp(*argv, "gre") == 0 ||
                                   strcmp(*argv, "gre/ip") == 0) {
                                if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) {
-                                       error_msg("You managed to ask for more than one tunnel mode.");
+                                       bb_error_msg("You managed to ask for more than one tunnel mode.");
                                        exit(-1);
                                }
                                p->iph.protocol = IPPROTO_GRE;
                        } else if (strcmp(*argv, "sit") == 0 ||
                                   strcmp(*argv, "ipv6/ip") == 0) {
                                if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) {
-                                       error_msg("You managed to ask for more than one tunnel mode.");
+                                       bb_error_msg("You managed to ask for more than one tunnel mode.");
                                        exit(-1);
                                }
                                p->iph.protocol = IPPROTO_IPV6;
                        } else {
-                               error_msg("Cannot guess tunnel mode.");
+                               bb_error_msg("Cannot guess tunnel mode.");
                                exit(-1);
                        }
                } else if (strcmp(*argv, "key") == 0) {
@@ -192,7 +197,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                                p->i_key = p->o_key = get_addr32(*argv);
                        else {
                                if (get_unsigned(&uval, *argv, 0)<0) {
-                                       error_msg("invalid value of \"key\"");
+                                       bb_error_msg("invalid value of \"key\"");
                                        exit(-1);
                                }
                                p->i_key = p->o_key = htonl(uval);
@@ -205,7 +210,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                                p->o_key = get_addr32(*argv);
                        else {
                                if (get_unsigned(&uval, *argv, 0)<0) {
-                                       error_msg("invalid value of \"ikey\"");
+                                       bb_error_msg("invalid value of \"ikey\"");
                                        exit(-1);
                                }
                                p->i_key = htonl(uval);
@@ -218,7 +223,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                                p->o_key = get_addr32(*argv);
                        else {
                                if (get_unsigned(&uval, *argv, 0)<0) {
-                                       error_msg("invalid value of \"okey\"");
+                                       bb_error_msg("invalid value of \"okey\"");
                                        exit(-1);
                                }
                                p->o_key = htonl(uval);
@@ -303,7 +308,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
 
        if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) {
                if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) {
-                       error_msg("Keys are not allowed with ipip and sit.");
+                       bb_error_msg("Keys are not allowed with ipip and sit.");
                        return -1;
                }
        }
@@ -323,7 +328,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                p->o_flags |= GRE_KEY;
        }
        if (IN_MULTICAST(ntohl(p->iph.daddr)) && !p->iph.saddr) {
-               error_msg("Broadcast tunnel requires a source address.");
+               bb_error_msg("Broadcast tunnel requires a source address.");
                return -1;
        }
        return 0;
@@ -338,7 +343,7 @@ static int do_add(int cmd, int argc, char **argv)
                return -1;
 
        if (p.iph.ttl && p.iph.frag_off == 0) {
-               error_msg("ttl != 0 and noptmudisc are incompatible");
+               bb_error_msg("ttl != 0 and noptmudisc are incompatible");
                return -1;
        }
 
@@ -349,8 +354,8 @@ static int do_add(int cmd, int argc, char **argv)
                return do_add_ioctl(cmd, "gre0", &p);
        case IPPROTO_IPV6:
                return do_add_ioctl(cmd, "sit0", &p);
-       default:        
-               error_msg("cannot determine tunnel mode (ipip, gre or sit)");
+       default:
+               bb_error_msg("cannot determine tunnel mode (ipip, gre or sit)");
                return -1;
        }
        return -1;
@@ -370,7 +375,7 @@ int do_del(int argc, char **argv)
                return do_del_ioctl("gre0", &p);
        case IPPROTO_IPV6:
                return do_del_ioctl("sit0", &p);
-       default:        
+       default:
                return do_del_ioctl(p.name, &p);
        }
        return -1;
@@ -459,7 +464,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
                buf[sizeof(buf) - 1] = 0;
                if ((ptr = strchr(buf, ':')) == NULL ||
                    (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
-                       error_msg("Wrong format of /proc/net/dev. Sorry.");
+                       bb_error_msg("Wrong format of /proc/net/dev. Sorry.");
                        return -1;
                }
                if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld",
@@ -472,7 +477,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
                        continue;
                type = do_ioctl_get_iftype(name);
                if (type == -1) {
-                       error_msg("Failed to get type of [%s]", name);
+                       bb_error_msg("Failed to get type of [%s]", name);
                        continue;
                }
                if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT)
@@ -501,7 +506,7 @@ static int do_show(int argc, char **argv)
                return -1;
 
        switch (p.iph.protocol) {
-       case IPPROTO_IPIP:      
+       case IPPROTO_IPIP:
                err = do_get_ioctl(p.name[0] ? p.name : "tunl0", &p);
                break;
        case IPPROTO_GRE:
@@ -538,6 +543,6 @@ int do_iptunnel(int argc, char **argv)
        } else
                return do_show(0, NULL);
 
-       error_msg("Command \"%s\" is unknown, try \"ip tunnel help\".", *argv);
+       bb_error_msg("Command \"%s\" is unknown, try \"ip tunnel help\".", *argv);
        exit(-1);
 }