picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-netlink: fix ifi_iftype type 

The iftype is an unsigned short, and not just an unsigned.
This commit is contained in:
Lennart Poettering 2016-02-18 22:47:34 +01:00
parent 7cde237777
commit 1c4a6088ed
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd/sd-netlink/rtnl-message.c
View File

@ -616,7 +616,7 @@ int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *flags) {
return 0;
}
int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned *type) {
int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short *type) {
struct ifinfomsg *ifi;
assert_return(m, -EINVAL);

8
src/network/networkctl.c
View File

@ -58,7 +58,7 @@ static void pager_open_if_enabled(void) {
pager_open(false);
}
static int link_get_type_string(int iftype, sd_device *d, char **ret) {
static int link_get_type_string(unsigned short iftype, sd_device *d, char **ret) {
const char *t;
char *p;
@ -106,7 +106,7 @@ static int link_get_type_string(int iftype, sd_device *d, char **ret) {
typedef struct LinkInfo {
const char *name;
int ifindex;
unsigned iftype;
unsigned short iftype;
} LinkInfo;
static int link_info_compare(const void *a, const void *b) {
@ -123,7 +123,7 @@ static int decode_and_sort_links(sd_netlink_message *m, LinkInfo **ret) {
for (i = m; i; i = sd_netlink_message_next(i)) {
const char *name;
unsigned iftype;
unsigned short iftype;
uint16_t type;
int ifindex;
@ -515,7 +515,7 @@ static int link_status_one(
_cleanup_strv_free_ char **carrier_bound_to = NULL;
_cleanup_strv_free_ char **carrier_bound_by = NULL;
struct ether_addr e;
unsigned iftype;
unsigned short iftype;
int r, ifindex;
bool have_mac;
uint32_t mtu;

2
src/systemd/sd-netlink.h
View File

@ -131,7 +131,7 @@ int sd_rtnl_message_link_set_type(sd_netlink_message *m, unsigned type);
int sd_rtnl_message_link_set_family(sd_netlink_message *m, unsigned family);
int sd_rtnl_message_link_get_ifindex(sd_netlink_message *m, int *ifindex);
int sd_rtnl_message_link_get_flags(sd_netlink_message *m, unsigned *flags);
int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned *type);
int sd_rtnl_message_link_get_type(sd_netlink_message *m, unsigned short *type);
int sd_rtnl_message_route_set_dst_prefixlen(sd_netlink_message *m, unsigned char prefixlen);
int sd_rtnl_message_route_set_src_prefixlen(sd_netlink_message *m, unsigned char prefixlen);