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

networkd: constify more things

Browse source
This commit is contained in:
Lennart Poettering 2016-06-03 19:54:35 +02:00
parent 1b56607157
commit 889b550f2d
4 changed files with 41 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/network/networkd-address.c
View file

@ -338,7 +338,12 @@ static int address_release(Address *address) {
return 0; return 0;
} }
int address_update(Address *address, unsigned char flags, unsigned char scope, struct ifa_cacheinfo *cinfo) { int address_update(
Address *address,
unsigned char flags,
unsigned char scope,
const struct ifa_cacheinfo *cinfo) {
bool ready; bool ready;
int r; int r;

2
src/network/networkd-address.h
View file

@ -63,7 +63,7 @@ void address_free(Address *address);
int address_add_foreign(Link *link, int family, const union in_addr_union *in_addr, unsigned char prefixlen, Address **ret); int address_add_foreign(Link *link, int family, const union in_addr_union *in_addr, unsigned char prefixlen, Address **ret);
int address_add(Link *link, int family, const union in_addr_union *in_addr, unsigned char prefixlen, Address **ret); int address_add(Link *link, int family, const union in_addr_union *in_addr, unsigned char prefixlen, Address **ret);
int address_get(Link *link, int family, const union in_addr_union *in_addr, unsigned char prefixlen, Address **ret); int address_get(Link *link, int family, const union in_addr_union *in_addr, unsigned char prefixlen, Address **ret);
int address_update(Address *address, unsigned char flags, unsigned char scope, struct ifa_cacheinfo *cinfo); int address_update(Address *address, unsigned char flags, unsigned char scope, const struct ifa_cacheinfo *cinfo);
int address_drop(Address *address); int address_drop(Address *address);
int address_configure(Address *address, Link *link, sd_netlink_message_handler_t callback, bool update); int address_configure(Address *address, Link *link, sd_netlink_message_handler_t callback, bool update);
int address_remove(Address *address, Link *link, sd_netlink_message_handler_t callback); int address_remove(Address *address, Link *link, sd_netlink_message_handler_t callback);

51
src/network/networkd-route.c
View file

@ -226,13 +226,17 @@ int route_get(Link *link,
return -ENOENT; return -ENOENT;
} }
static int route_add_internal(Link *link, Set **routes, static int route_add_internal(
int family, Link *link,
union in_addr_union *dst, Set **routes,
unsigned char dst_prefixlen, int family,
unsigned char tos, const union in_addr_union *dst,
uint32_t priority, unsigned char dst_prefixlen,
unsigned char table, Route **ret) { unsigned char tos,
uint32_t priority,
unsigned char table,
Route **ret) {
_cleanup_route_free_ Route *route = NULL; _cleanup_route_free_ Route *route = NULL;
int r; int r;
@ -269,23 +273,29 @@ static int route_add_internal(Link *link, Set **routes,
return 0; return 0;
} }
int route_add_foreign(Link *link, int route_add_foreign(
int family, Link *link,
union in_addr_union *dst, int family,
unsigned char dst_prefixlen, const union in_addr_union *dst,
unsigned char tos, unsigned char dst_prefixlen,
uint32_t priority, unsigned char tos,
unsigned char table, Route **ret) { uint32_t priority,
unsigned char table,
Route **ret) {
return route_add_internal(link, &link->routes_foreign, family, dst, dst_prefixlen, tos, priority, table, ret); return route_add_internal(link, &link->routes_foreign, family, dst, dst_prefixlen, tos, priority, table, ret);
} }
int route_add(Link *link, int route_add(
Link *link,
int family, int family,
union in_addr_union *dst, const union in_addr_union *dst,
unsigned char dst_prefixlen, unsigned char dst_prefixlen,
unsigned char tos, unsigned char tos,
uint32_t priority, uint32_t priority,
unsigned char table, Route **ret) { unsigned char table,
Route **ret) {
Route *route; Route *route;
int r; int r;
@ -318,12 +328,13 @@ int route_add(Link *link,
} }
int route_update(Route *route, int route_update(Route *route,
union in_addr_union *src, const union in_addr_union *src,
unsigned char src_prefixlen, unsigned char src_prefixlen,
union in_addr_union *gw, const union in_addr_union *gw,
union in_addr_union *prefsrc, const union in_addr_union *prefsrc,
unsigned char scope, unsigned char scope,
unsigned char protocol) { unsigned char protocol) {
assert(route); assert(route);
assert(src); assert(src);
assert(gw); assert(gw);

6
src/network/networkd-route.h
View file

@ -58,9 +58,9 @@ int route_configure(Route *route, Link *link, sd_netlink_message_handler_t callb
int route_remove(Route *route, Link *link, sd_netlink_message_handler_t callback); int route_remove(Route *route, Link *link, sd_netlink_message_handler_t callback);
int route_get(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret); int route_get(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret);
int route_add(Link *link, int family, union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret); int route_add(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret);
int route_add_foreign(Link *link, int family, union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret); int route_add_foreign(Link *link, int family, const union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret);
int route_update(Route *route, union in_addr_union *src, unsigned char src_prefixlen, union in_addr_union *gw, union in_addr_union *prefsrc, unsigned char scope, unsigned char protocol); int route_update(Route *route, const union in_addr_union *src, unsigned char src_prefixlen, const union in_addr_union *gw, const union in_addr_union *prefsrc, unsigned char scope, unsigned char protocol);
int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdata); int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdata);