fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 08:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

trivial: formatting fixes

Browse source
This commit is contained in:
Dan Williams 2012-03-21 22:58:00 -05:00
parent 2290a70385
commit 1ecc9c215c
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/nm-netlink-utils.c
View file

@ -185,33 +185,30 @@ _route_add (struct rtnl_route *route,
const void *gateway, /* in_addr or in6_addr */
int flags)
{
struct nl_sock * sk;
struct nl_addr * dest_addr, * gw_addr;
void * tmp_addr;
struct nl_sock *sk;
struct nl_addr *dest_addr, *gw_addr;
void *tmp_addr;
int addrlen, err, log;
if(family == AF_INET) {
addrlen = sizeof(struct in_addr);
if (family == AF_INET) {
addrlen = sizeof (struct in_addr);
log = LOGD_IP4;
}
else if (family == AF_INET6) {
addrlen = sizeof(struct in6_addr);
} else if (family == AF_INET6) {
addrlen = sizeof (struct in6_addr);
log = LOGD_IP6;
} else {
} else
g_assert_not_reached ();
}
sk = nm_netlink_get_default_handle();
sk = nm_netlink_get_default_handle ();
/* Build up the destination address */
if (dest) {
/* Copy to preserve const */
tmp_addr = g_malloc0(addrlen);
memcpy(tmp_addr, dest, addrlen);
tmp_addr = g_malloc0 (addrlen);
memcpy (tmp_addr, dest, addrlen);
dest_addr = nl_addr_build (family, tmp_addr, addrlen);
g_free(tmp_addr);
g_free (tmp_addr);
g_return_val_if_fail (dest_addr != NULL, -NLE_INVAL);
nl_addr_set_prefixlen (dest_addr, dest_prefix);
@ -222,20 +219,19 @@ _route_add (struct rtnl_route *route,
/* Build up the gateway address */
if (gateway) {
tmp_addr = g_malloc0(addrlen);
memcpy(tmp_addr, gateway, addrlen);
tmp_addr = g_malloc0 (addrlen);
memcpy (tmp_addr, gateway, addrlen);
gw_addr = nl_addr_build (family, tmp_addr, addrlen);
g_free(tmp_addr);
g_free (tmp_addr);
if (gw_addr) {
nl_addr_set_prefixlen (gw_addr, 0);
rtnl_route_set_gateway (route, gw_addr);
rtnl_route_set_scope (route, RT_SCOPE_UNIVERSE);
nl_addr_put(gw_addr);
} else {
nl_addr_put (gw_addr);
} else
nm_log_err (LOGD_DEVICE | log, "Invalid gateway");
}
}
err = rtnl_route_add (sk, route, flags);