]>
Commit | Line | Data |
---|---|---|
17e7b720 AM |
1 | --- iproute2/misc/ss.c.ss 2002-01-10 01:11:43.000000000 +0100 |
2 | +++ iproute2/misc/ss.c 2003-10-23 16:33:29.000000000 +0200 | |
3 | @@ -33,7 +33,7 @@ | |
4 | #include "tcp_diag.h" | |
5 | #include "SNAPSHOT.h" | |
6 | ||
7 | -#include <linux/tcp.h> | |
8 | +#include <netinet/tcp.h> | |
9 | ||
10 | int resolve_hosts = 0; | |
11 | int resolve_services = 1; | |
12 | --- iproute2/include-glibc/glibc-bugs.h.glibc22 Tue Oct 10 20:12:59 2000 | |
13 | +++ iproute2/include-glibc/glibc-bugs.h Fri Mar 15 00:32:59 2002 | |
14 | @@ -12,8 +12,8 @@ | |
15 | ||
16 | #include <linux/types.h> | |
17 | ||
18 | -typedef __u16 in_port_t; | |
19 | -typedef __u32 in_addr_t; | |
20 | +/* typedef __u16 in_port_t; */ | |
21 | +/* typedef __u32 in_addr_t; */ | |
22 | ||
23 | #endif | |
24 | ||
25 | --- iproute2/ip/iprule.c.fwhex Sun Apr 16 13:42:51 2000 | |
26 | +++ iproute2/ip/iprule.c Fri May 24 22:22:21 2002 | |
27 | @@ -120,7 +120,7 @@ | |
28 | fprintf(fp, "tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1, sizeof(b1))); | |
29 | } | |
30 | if (tb[RTA_PROTOINFO]) { | |
31 | - fprintf(fp, "fwmark %8x ", *(__u32*)RTA_DATA(tb[RTA_PROTOINFO])); | |
32 | + fprintf(fp, "fwmark %#x ", *(__u32*)RTA_DATA(tb[RTA_PROTOINFO])); | |
33 | } | |
34 | ||
35 | if (tb[RTA_IIF]) { | |
36 | @@ -245,7 +245,7 @@ | |
37 | } else if (strcmp(*argv, "fwmark") == 0) { | |
38 | __u32 fwmark; | |
39 | NEXT_ARG(); | |
40 | - if (get_u32(&fwmark, *argv, 16)) | |
41 | + if (get_u32(&fwmark, *argv, 0)) | |
42 | invarg("fwmark value is invalid\n", *argv); | |
43 | addattr32(&req.n, sizeof(req), RTA_PROTOINFO, fwmark); | |
44 | } else if (matches(*argv, "realms") == 0) { |