Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
iproute2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
iproute2
Commits
e9e9365b
Commit
e9e9365b
authored
Mar 27, 2016
by
Stephen Hemminger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scrub out whitespace issues
Run script that removes trailing whitespace everywhere.
parent
334af761
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
31 additions
and
43 deletions
+31
-43
bridge/fdb.c
bridge/fdb.c
+1
-1
bridge/monitor.c
bridge/monitor.c
+0
-1
genl/ctrl.c
genl/ctrl.c
+1
-1
include/libnetlink.h
include/libnetlink.h
+15
-17
lib/coverity_model.c
lib/coverity_model.c
+0
-2
lib/dnet_ntop.c
lib/dnet_ntop.c
+0
-2
lib/inet_proto.c
lib/inet_proto.c
+0
-2
lib/ipx_ntop.c
lib/ipx_ntop.c
+0
-2
lib/libgenl.c
lib/libgenl.c
+0
-1
lib/libnetlink.c
lib/libnetlink.c
+1
-1
lib/utils.c
lib/utils.c
+3
-3
netem/maketable.c
netem/maketable.c
+2
-2
netem/normal.c
netem/normal.c
+1
-1
netem/pareto.c
netem/pareto.c
+2
-2
netem/paretonormal.c
netem/paretonormal.c
+1
-1
tc/m_action.c
tc/m_action.c
+3
-3
tc/tc_core.c
tc/tc_core.c
+1
-1
No files found.
bridge/fdb.c
View file @
e9e9365b
...
...
@@ -298,7 +298,7 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
req
.
ndm
.
ndm_flags
|=
NTF_MASTER
;
}
else
if
(
matches
(
*
argv
,
"router"
)
==
0
)
{
req
.
ndm
.
ndm_flags
|=
NTF_ROUTER
;
}
else
if
(
matches
(
*
argv
,
"local"
)
==
0
||
}
else
if
(
matches
(
*
argv
,
"local"
)
==
0
||
matches
(
*
argv
,
"permanent"
)
==
0
)
{
req
.
ndm
.
ndm_state
|=
NUD_PERMANENT
;
}
else
if
(
matches
(
*
argv
,
"temp"
)
==
0
||
...
...
bridge/monitor.c
View file @
e9e9365b
...
...
@@ -142,4 +142,3 @@ int do_monitor(int argc, char **argv)
return
0
;
}
genl/ctrl.c
View file @
e9e9365b
...
...
@@ -132,7 +132,7 @@ static void print_ctrl_cmd_flags(FILE *fp, __u32 fl)
fprintf
(
fp
,
"
\n
"
);
}
static
int
print_ctrl_cmds
(
FILE
*
fp
,
struct
rtattr
*
arg
,
__u32
ctrl_ver
)
{
struct
rtattr
*
tb
[
CTRL_ATTR_OP_MAX
+
1
];
...
...
include/libnetlink.h
View file @
e9e9365b
...
...
@@ -11,8 +11,7 @@
#include <linux/neighbour.h>
#include <linux/netconf.h>
struct
rtnl_handle
{
struct
rtnl_handle
{
int
fd
;
struct
sockaddr_nl
local
;
struct
sockaddr_nl
peer
;
...
...
@@ -26,10 +25,10 @@ struct rtnl_handle
extern
int
rcvbuf
;
int
rtnl_open
(
struct
rtnl_handle
*
rth
,
unsigned
subscriptions
)
int
rtnl_open
(
struct
rtnl_handle
*
rth
,
unsigned
int
subscriptions
)
__attribute__
((
warn_unused_result
));
int
rtnl_open_byproto
(
struct
rtnl_handle
*
rth
,
unsigned
subscriptions
,
int
rtnl_open_byproto
(
struct
rtnl_handle
*
rth
,
unsigned
int
subscriptions
,
int
protocol
)
__attribute__
((
warn_unused_result
));
...
...
@@ -56,8 +55,7 @@ typedef int (*rtnl_listen_filter_t)(const struct sockaddr_nl *,
struct
rtnl_ctrl_data
*
,
struct
nlmsghdr
*
n
,
void
*
);
struct
rtnl_dump_filter_arg
{
struct
rtnl_dump_filter_arg
{
rtnl_filter_t
filter
;
void
*
arg1
;
__u16
nc_flags
;
...
...
@@ -140,6 +138,7 @@ static inline __u32 rta_getattr_u32(const struct rtattr *rta)
static
inline
__u64
rta_getattr_u64
(
const
struct
rtattr
*
rta
)
{
__u64
tmp
;
memcpy
(
&
tmp
,
RTA_DATA
(
rta
),
sizeof
(
__u64
));
return
tmp
;
}
...
...
@@ -159,42 +158,42 @@ int rtnl_from_file(FILE *, rtnl_listen_filter_t handler,
#ifndef IFA_RTA
#define IFA_RTA(r) \
((struct rtattr
*)(((char
*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
((struct rtattr
*)(((char
*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
#endif
#ifndef IFA_PAYLOAD
#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,
sizeof(struct ifaddrmsg))
#endif
#ifndef IFLA_RTA
#define IFLA_RTA(r) \
((struct rtattr
*)(((char
*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
((struct rtattr
*)(((char
*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
#endif
#ifndef IFLA_PAYLOAD
#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,
sizeof(struct ifinfomsg))
#endif
#ifndef NDA_RTA
#define NDA_RTA(r) \
((struct rtattr
*)(((char
*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg))))
((struct rtattr
*)(((char
*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg))))
#endif
#ifndef NDA_PAYLOAD
#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndmsg))
#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,
sizeof(struct ndmsg))
#endif
#ifndef NDTA_RTA
#define NDTA_RTA(r) \
((struct rtattr
*)(((char
*)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg))))
((struct rtattr
*)(((char
*)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg))))
#endif
#ifndef NDTA_PAYLOAD
#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg))
#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,
sizeof(struct ndtmsg))
#endif
#ifndef NETNS_RTA
#define NETNS_RTA(r) \
((struct rtattr
*)(((char
*)(r)) + NLMSG_ALIGN(sizeof(struct rtgenmsg))))
((struct rtattr
*)(((char
*)(r)) + NLMSG_ALIGN(sizeof(struct rtgenmsg))))
#endif
#ifndef NETNS_PAYLOAD
#define NETNS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtgenmsg))
#define NETNS_PAYLOAD(n) NLMSG_PAYLOAD(n,
sizeof(struct rtgenmsg))
#endif
/* User defined nlmsg_type which is used mostly for logging netlink
...
...
@@ -202,4 +201,3 @@ int rtnl_from_file(FILE *, rtnl_listen_filter_t handler,
#define NLMSG_TSTAMP 15
#endif
/* __LIBNETLINK_H__ */
lib/coverity_model.c
View file @
e9e9365b
...
...
@@ -15,5 +15,3 @@
* Coverity Scan doesn't pick up modifications automatically. The model file
* must be uploaded by an admin.
*/
lib/dnet_ntop.c
View file @
e9e9365b
...
...
@@ -98,5 +98,3 @@ const char *dnet_ntop(int af, const void *addr, char *str, size_t len)
return
NULL
;
}
lib/inet_proto.c
View file @
e9e9365b
...
...
@@ -67,5 +67,3 @@ int inet_proto_a2n(const char *buf)
}
return
-
1
;
}
lib/ipx_ntop.c
View file @
e9e9365b
...
...
@@ -68,5 +68,3 @@ const char *ipx_ntop(int af, const void *addr, char *str, size_t len)
return
NULL
;
}
lib/libgenl.c
View file @
e9e9365b
...
...
@@ -60,4 +60,3 @@ int genl_resolve_family(struct rtnl_handle *grth, const char *family)
return
genl_parse_getfamily
(
&
req
.
n
);
}
lib/libnetlink.c
View file @
e9e9365b
...
...
@@ -158,7 +158,7 @@ int rtnl_send_check(struct rtnl_handle *rth, const void *buf, int len)
struct
nlmsgerr
*
err
=
(
struct
nlmsgerr
*
)
NLMSG_DATA
(
h
);
if
(
h
->
nlmsg_len
<
NLMSG_LENGTH
(
sizeof
(
struct
nlmsgerr
)))
fprintf
(
stderr
,
"ERROR truncated
\n
"
);
else
else
errno
=
-
err
->
error
;
return
-
1
;
}
...
...
lib/utils.c
View file @
e9e9365b
...
...
@@ -95,7 +95,7 @@ static int get_netmask(unsigned *val, const char *arg, int base)
/* try coverting dotted quad to CIDR */
if
(
!
get_addr_1
(
&
addr
,
arg
,
AF_INET
)
&&
addr
.
family
==
AF_INET
)
{
int
b
=
mask2bits
(
addr
.
data
[
0
]);
if
(
b
>=
0
)
{
*
val
=
b
;
return
0
;
...
...
@@ -191,7 +191,7 @@ int get_time_rtt(unsigned *val, const char *arg, int *raw)
*
val
=
t
;
if
(
*
val
<
t
)
*
val
+=
1
;
return
0
;
}
...
...
@@ -363,7 +363,7 @@ static int get_addr_ipv4(__u8 *ap, const char *cp)
for
(
i
=
0
;
i
<
4
;
i
++
)
{
unsigned
long
n
;
char
*
endp
;
n
=
strtoul
(
cp
,
&
endp
,
0
);
if
(
n
>
255
)
return
-
1
;
/* bogus network value */
...
...
netem/maketable.c
View file @
e9e9365b
...
...
@@ -210,7 +210,7 @@ main(int argc, char **argv)
}
}
else
{
fp
=
stdin
;
}
}
x
=
readdoubles
(
fp
,
&
limit
);
if
(
limit
<=
0
)
{
fprintf
(
stderr
,
"Nothing much read!
\n
"
);
...
...
@@ -221,7 +221,7 @@ main(int argc, char **argv)
fprintf
(
stderr
,
"%d values, mu %10.4f, sigma %10.4f, rho %10.4f
\n
"
,
limit
,
mu
,
sigma
,
rho
);
#endif
table
=
makedist
(
x
,
limit
,
mu
,
sigma
);
free
((
void
*
)
x
);
cumulativedist
(
table
,
DISTTABLESIZE
,
&
total
);
...
...
netem/normal.c
View file @
e9e9365b
...
...
@@ -33,7 +33,7 @@ main(int argc, char **argv)
table
[
i
]
=
x
;
}
printf
(
"# This is the distribution table for the normal distribution.
\n
"
);
for
(
i
=
n
=
0
;
i
<
TABLESIZE
;
i
+=
4
)
{
int
value
=
(
int
)
rint
(
table
[
i
]
*
TABLEFACTOR
);
...
...
netem/pareto.c
View file @
e9e9365b
...
...
@@ -36,6 +36,6 @@ main(int argc, char **argv)
n
=
0
;
}
}
return
0
;
}
}
netem/paretonormal.c
View file @
e9e9365b
...
...
@@ -44,7 +44,7 @@ paretovalue(int i)
if
(
dvalue
>
32767
)
dvalue
=
32767
;
return
(
int
)
rint
(
dvalue
);
}
}
int
main
(
int
argc
,
char
**
argv
)
...
...
tc/m_action.c
View file @
e9e9365b
...
...
@@ -141,9 +141,9 @@ static int
new_cmd
(
char
**
argv
)
{
if
((
matches
(
*
argv
,
"change"
)
==
0
)
||
(
matches
(
*
argv
,
"replace"
)
==
0
)
||
(
matches
(
*
argv
,
"delete"
)
==
0
)
||
(
matches
(
*
argv
,
"get"
)
==
0
)
||
(
matches
(
*
argv
,
"replace"
)
==
0
)
||
(
matches
(
*
argv
,
"delete"
)
==
0
)
||
(
matches
(
*
argv
,
"get"
)
==
0
)
||
(
matches
(
*
argv
,
"add"
)
==
0
))
return
1
;
...
...
tc/tc_core.c
View file @
e9e9365b
...
...
@@ -145,7 +145,7 @@ int tc_calc_rtable(struct tc_ratespec *r, __u32 *rtab,
rtab
[
i
]
=
tc_calc_xmittime
(
bps
,
sz
);
}
r
->
cell_align
=
-
1
;
r
->
cell_align
=
-
1
;
r
->
cell_log
=
cell_log
;
r
->
linklayer
=
(
linklayer
&
TC_LINKLAYER_MASK
);
return
cell_log
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment