diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-25 15:09:40 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-30 12:32:48 +0100 |
| commit | 2ce409569093f7c2c6732246978a901a27f2bce3 (patch) | |
| tree | b244e69c3cd1dadade8a55b3f93a345f891760c5 /src/network/networkd-dhcp4.c | |
| parent | cb2266f9312a12d7e80c688bf31a9d4b148d5ce6 (diff) | |
networkd: route - rename fields in struct
Diffstat (limited to 'src/network/networkd-dhcp4.c')
| -rw-r--r-- | src/network/networkd-dhcp4.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index c412a2cc31..4f7f595adc 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -87,9 +87,9 @@ static int link_set_dhcp_routes(Link *link) { * route for the gw host so that we can route no matter the * netmask or existing kernel route tables. */ route_gw->family = AF_INET; - route_gw->dst_addr.in = gateway; + route_gw->dst.in = gateway; route_gw->dst_prefixlen = 32; - route_gw->prefsrc_addr.in = address; + route_gw->prefsrc.in = address; route_gw->scope = RT_SCOPE_LINK; route_gw->protocol = RTPROT_DHCP; route_gw->metrics = link->network->dhcp_route_metric; @@ -101,8 +101,8 @@ static int link_set_dhcp_routes(Link *link) { link->dhcp4_messages ++; route->family = AF_INET; - route->in_addr.in = gateway; - route->prefsrc_addr.in = address; + route->gw.in = gateway; + route->prefsrc.in = address; route->metrics = link->network->dhcp_route_metric; r = route_configure(route, link, &dhcp4_route_handler); @@ -130,8 +130,8 @@ static int link_set_dhcp_routes(Link *link) { route->family = AF_INET; route->protocol = RTPROT_DHCP; - route->in_addr.in = static_routes[i].gw_addr; - route->dst_addr.in = static_routes[i].dst_addr; + route->gw.in = static_routes[i].gw_addr; + route->dst.in = static_routes[i].dst_addr; route->dst_prefixlen = static_routes[i].dst_prefixlen; route->metrics = link->network->dhcp_route_metric; @@ -170,8 +170,8 @@ static int dhcp_lease_lost(Link *link) { r = route_new(&route); if (r >= 0) { route->family = AF_INET; - route->in_addr.in = routes[i].gw_addr; - route->dst_addr.in = routes[i].dst_addr; + route->gw.in = routes[i].gw_addr; + route->dst.in = routes[i].dst_addr; route->dst_prefixlen = routes[i].dst_prefixlen; route_remove(route, link, @@ -191,7 +191,7 @@ static int dhcp_lease_lost(Link *link) { r = route_new(&route_gw); if (r >= 0) { route_gw->family = AF_INET; - route_gw->dst_addr.in = gateway; + route_gw->dst.in = gateway; route_gw->dst_prefixlen = 32; route_gw->scope = RT_SCOPE_LINK; @@ -202,7 +202,7 @@ static int dhcp_lease_lost(Link *link) { r = route_new(&route); if (r >= 0) { route->family = AF_INET; - route->in_addr.in = gateway; + route->gw.in = gateway; route_remove(route, link, &link_route_remove_handler); |