*
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
*
- *
- * Changes:
- *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
- * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit
- * Phil Karn <karn@ka9q.ampr.org> 990408: "pmtudisc" flag
*/
#include <stdio.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/ioctl.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
+#include <net/if.h>
+#include <net/if_arp.h>
#include <linux/ip.h>
#include <linux/if_tunnel.h>
static void usage(void)
{
- fprintf(stderr, "Usage: ip tunnel { add | change | del | show } [ NAME ]\n");
+ fprintf(stderr, "Usage: ip tunnel { add | change | del | show | prl | 6rd } [ NAME ]\n");
fprintf(stderr, " [ mode { ipip | gre | sit | isatap } ] [ remote ADDR ] [ local ADDR ]\n");
fprintf(stderr, " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n");
+ fprintf(stderr, " [ prl-default ADDR ] [ prl-nodefault ADDR ] [ prl-delete ADDR ]\n");
+ fprintf(stderr, " [ 6rd-prefix ADDR ] [ 6rd-relay_prefix ADDR ] [ 6rd-reset ]\n");
fprintf(stderr, " [ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]\n");
fprintf(stderr, "\n");
fprintf(stderr, "Where: NAME := STRING\n");
} else if (strcmp(*argv, "dev") == 0) {
NEXT_ARG();
strncpy(medium, *argv, IFNAMSIZ-1);
- } else if (strcmp(*argv, "ttl") == 0) {
+ } else if (strcmp(*argv, "ttl") == 0 ||
+ strcmp(*argv, "hoplimit") == 0) {
unsigned uval;
NEXT_ARG();
if (strcmp(*argv, "inherit") != 0) {
p->iph.ttl = uval;
}
} else if (strcmp(*argv, "tos") == 0 ||
+ strcmp(*argv, "tclass") == 0 ||
matches(*argv, "dsfield") == 0) {
__u32 uval;
NEXT_ARG();
} else {
if (strcmp(*argv, "name") == 0) {
NEXT_ARG();
- }
- if (matches(*argv, "help") == 0)
+ } else if (matches(*argv, "help") == 0)
usage();
if (p->name[0])
duparg2("name", *argv);
}
if (medium[0]) {
- p->link = tnl_ioctl_get_ifindex(medium);
+ p->link = if_nametoindex(medium);
if (p->link == 0)
return -1;
}
fprintf(stderr, "Broadcast tunnel requires a source address.\n");
return -1;
}
- if (isatap) {
- if (p->iph.daddr) {
- fprintf(stderr, "no remote with isatap.\n");
- return -1;
- }
+ if (isatap)
p->i_flags |= SIT_ISATAP;
- }
return 0;
}
static void print_tunnel(struct ip_tunnel_parm *p)
{
+ struct ip_tunnel_6rd ip6rd;
char s1[1024];
char s2[1024];
- char s3[64];
- char s4[64];
- inet_ntop(AF_INET, &p->i_key, s3, sizeof(s3));
- inet_ntop(AF_INET, &p->o_key, s4, sizeof(s4));
+ memset(&ip6rd, 0, sizeof(ip6rd));
/* Do not use format_host() for local addr,
* symbolic name will not be useful.
p->iph.daddr ? format_host(AF_INET, 4, &p->iph.daddr, s1, sizeof(s1)) : "any",
p->iph.saddr ? rt_addr_n2a(AF_INET, 4, &p->iph.saddr, s2, sizeof(s2)) : "any");
+ if (p->i_flags & SIT_ISATAP) {
+ struct ip_tunnel_prl prl[16];
+ int i;
+
+ memset(prl, 0, sizeof(prl));
+ prl[0].datalen = sizeof(prl) - sizeof(prl[0]);
+ prl[0].addr = htonl(INADDR_ANY);
+
+ if (!tnl_prl_ioctl(SIOCGETPRL, p->name, prl))
+ for (i = 1; i < sizeof(prl) / sizeof(prl[0]); i++)
+ {
+ if (prl[i].addr != htonl(INADDR_ANY)) {
+ printf(" %s %s ",
+ (prl[i].flags & PRL_DEFAULT) ? "pdr" : "pr",
+ format_host(AF_INET, 4, &prl[i].addr, s1, sizeof(s1)));
+ }
+ }
+ }
+
if (p->link) {
- char *n = tnl_ioctl_get_ifname(p->link);
+ const char *n = ll_index_to_name(p->link);
if (n)
printf(" dev %s ", n);
}
if (!(p->iph.frag_off&htons(IP_DF)))
printf(" nopmtudisc");
+ if (p->iph.protocol == IPPROTO_IPV6 && !tnl_ioctl_get_6rd(p->name, &ip6rd) && ip6rd.prefixlen) {
+ printf(" 6rd-prefix %s/%u ",
+ inet_ntop(AF_INET6, &ip6rd.prefix, s1, sizeof(s1)),
+ ip6rd.prefixlen);
+ if (ip6rd.relay_prefix) {
+ printf("6rd-relay_prefix %s/%u ",
+ format_host(AF_INET, 4, &ip6rd.relay_prefix, s1, sizeof(s1)),
+ ip6rd.relay_prefixlen);
+ }
+ }
+
if ((p->i_flags&GRE_KEY) && (p->o_flags&GRE_KEY) && p->o_key == p->i_key)
- printf(" key %s", s3);
+ printf(" key %u", ntohl(p->i_key));
else if ((p->i_flags|p->o_flags)&GRE_KEY) {
if (p->i_flags&GRE_KEY)
- printf(" ikey %s ", s3);
+ printf(" ikey %u ", ntohl(p->i_key));
if (p->o_flags&GRE_KEY)
- printf(" okey %s ", s4);
+ printf(" okey %u ", ntohl(p->o_key));
}
if (p->i_flags&GRE_SEQ)
rx_fifo, rx_frame,
tx_bytes, tx_packets, tx_errs, tx_drops,
tx_fifo, tx_colls, tx_carrier, rx_multi;
- int type;
struct ip_tunnel_parm p1;
char buf[512];
return -1;
}
- fgets(buf, sizeof(buf), fp);
- fgets(buf, sizeof(buf), fp);
+ /* skip header lines */
+ if (!fgets(buf, sizeof(buf), fp) ||
+ !fgets(buf, sizeof(buf), fp)) {
+ fprintf(stderr, "/proc/net/dev read error\n");
+ fclose(fp);
+ return -1;
+ }
while (fgets(buf, sizeof(buf), fp) != NULL) {
+ int index, type;
char *ptr;
buf[sizeof(buf) - 1] = 0;
if ((ptr = strchr(buf, ':')) == NULL ||
(*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
fprintf(stderr, "Wrong format of /proc/net/dev. Sorry.\n");
+ fclose(fp);
return -1;
}
if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld",
continue;
if (p->name[0] && strcmp(p->name, name))
continue;
- type = tnl_ioctl_get_iftype(name);
+ index = ll_name_to_index(name);
+ if (index == 0)
+ continue;
+ type = ll_index_to_type(index);
if (type == -1) {
fprintf(stderr, "Failed to get type of [%s]\n", name);
continue;
}
printf("\n");
}
+ fclose(fp);
return 0;
}
int err;
struct ip_tunnel_parm p;
+ ll_init_map(&rth);
if (parse_args(argc, argv, SIOCGETTUNNEL, &p) < 0)
return -1;
return 0;
}
+static int do_prl(int argc, char **argv)
+{
+ struct ip_tunnel_prl p;
+ int count = 0;
+ int devname = 0;
+ int cmd = 0;
+ char medium[IFNAMSIZ];
+
+ memset(&p, 0, sizeof(p));
+ memset(&medium, 0, sizeof(medium));
+
+ while (argc > 0) {
+ if (strcmp(*argv, "prl-default") == 0) {
+ NEXT_ARG();
+ cmd = SIOCADDPRL;
+ p.addr = get_addr32(*argv);
+ p.flags |= PRL_DEFAULT;
+ count++;
+ } else if (strcmp(*argv, "prl-nodefault") == 0) {
+ NEXT_ARG();
+ cmd = SIOCADDPRL;
+ p.addr = get_addr32(*argv);
+ count++;
+ } else if (strcmp(*argv, "prl-delete") == 0) {
+ NEXT_ARG();
+ cmd = SIOCDELPRL;
+ p.addr = get_addr32(*argv);
+ count++;
+ } else if (strcmp(*argv, "dev") == 0) {
+ NEXT_ARG();
+ strncpy(medium, *argv, IFNAMSIZ-1);
+ devname++;
+ } else {
+ fprintf(stderr,"%s: Invalid PRL parameter.\n", *argv);
+ exit(-1);
+ }
+ if (count > 1) {
+ fprintf(stderr,"One PRL entry at a time.\n");
+ exit(-1);
+ }
+ argc--; argv++;
+ }
+ if (devname == 0) {
+ fprintf(stderr, "Must specify dev.\n");
+ exit(-1);
+ }
+
+ return tnl_prl_ioctl(cmd, medium, &p);
+}
+
+static int do_6rd(int argc, char **argv)
+{
+ struct ip_tunnel_6rd ip6rd;
+ int devname = 0;
+ int cmd = 0;
+ char medium[IFNAMSIZ];
+ inet_prefix prefix;
+
+ memset(&ip6rd, 0, sizeof(ip6rd));
+ memset(&medium, 0, sizeof(medium));
+
+ while (argc > 0) {
+ if (strcmp(*argv, "6rd-prefix") == 0) {
+ NEXT_ARG();
+ if (get_prefix(&prefix, *argv, AF_INET6))
+ invarg("invalid 6rd_prefix\n", *argv);
+ cmd = SIOCADD6RD;
+ memcpy(&ip6rd.prefix, prefix.data, 16);
+ ip6rd.prefixlen = prefix.bitlen;
+ } else if (strcmp(*argv, "6rd-relay_prefix") == 0) {
+ NEXT_ARG();
+ if (get_prefix(&prefix, *argv, AF_INET))
+ invarg("invalid 6rd-relay_prefix\n", *argv);
+ cmd = SIOCADD6RD;
+ memcpy(&ip6rd.relay_prefix, prefix.data, 4);
+ ip6rd.relay_prefixlen = prefix.bitlen;
+ } else if (strcmp(*argv, "6rd-reset") == 0) {
+ cmd = SIOCDEL6RD;
+ } else if (strcmp(*argv, "dev") == 0) {
+ NEXT_ARG();
+ strncpy(medium, *argv, IFNAMSIZ-1);
+ devname++;
+ } else {
+ fprintf(stderr,"%s: Invalid 6RD parameter.\n", *argv);
+ exit(-1);
+ }
+ argc--; argv++;
+ }
+ if (devname == 0) {
+ fprintf(stderr, "Must specify dev.\n");
+ exit(-1);
+ }
+
+ return tnl_6rd_ioctl(cmd, medium, &ip6rd);
+}
+
int do_iptunnel(int argc, char **argv)
{
switch (preferred_family) {
return do_add(SIOCADDTUNNEL, argc-1, argv+1);
if (matches(*argv, "change") == 0)
return do_add(SIOCCHGTUNNEL, argc-1, argv+1);
- if (matches(*argv, "del") == 0)
+ if (matches(*argv, "delete") == 0)
return do_del(argc-1, argv+1);
if (matches(*argv, "show") == 0 ||
matches(*argv, "lst") == 0 ||
matches(*argv, "list") == 0)
return do_show(argc-1, argv+1);
+ if (matches(*argv, "prl") == 0)
+ return do_prl(argc-1, argv+1);
+ if (matches(*argv, "6rd") == 0)
+ return do_6rd(argc-1, argv+1);
if (matches(*argv, "help") == 0)
usage();
} else
projects / lisovros / iproute2_canprio.git / blobdiff