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

cleanup: remove nm-netlink-compat

Browse source
This commit is contained in:
Pavel Šimerda 2013-03-04 11:53:44 +01:00
parent 47a3e24d32
commit 8f758b0af9
7 changed files with 0 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile.am
View file

@ -180,8 +180,6 @@ NetworkManager_SOURCES = \
nm-netlink-monitor.h \
nm-netlink-utils.c \
nm-netlink-utils.h \
nm-netlink-compat.h \
nm-netlink-compat.c \
nm-activation-request.c \
nm-activation-request.h \
nm-properties-changed-signal.c \

1
src/nm-device.c
View file

@ -49,7 +49,6 @@
#include "nm-logging.h"
#include "nm-netlink-monitor.h"
#include "nm-netlink-utils.h"
#include "nm-netlink-compat.h"
#include "nm-setting-ip4-config.h"
#include "nm-setting-ip6-config.h"
#include "nm-setting-connection.h"

85
src/nm-netlink-compat.c
View file

@ -1,85 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* NetworkManager -- Network link manager
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2011 Caixa Magica Software.
*/
#include <glib.h>
#include "nm-netlink-compat.h"
static struct rtnl_nexthop *
nm_netlink_get_nh (struct rtnl_route * route)
{
int hops;
hops = rtnl_route_get_nnexthops (route);
g_return_val_if_fail(hops > 0, NULL);
return rtnl_route_nexthop_n (route, 0);
}
int
rtnl_route_get_oif (struct rtnl_route * route)
{
struct rtnl_nexthop * nh;
nh = nm_netlink_get_nh(route);
g_return_val_if_fail(nh, -NLE_OBJ_NOTFOUND);
return rtnl_route_nh_get_ifindex (nh);
}
int
rtnl_route_set_oif (struct rtnl_route * route, int ifindex)
{
struct rtnl_nexthop * nh;
nh = rtnl_route_nh_alloc();
rtnl_route_nh_set_ifindex(nh, ifindex);
rtnl_route_add_nexthop(route, nh);
return 0;
}
struct nl_addr *
rtnl_route_get_gateway (struct rtnl_route * route)
{
struct rtnl_nexthop * nh;
nh = nm_netlink_get_nh(route);
g_return_val_if_fail(nh, NULL);
return rtnl_route_nh_get_gateway(nh);
}
int
rtnl_route_set_gateway (struct rtnl_route * route, struct nl_addr * gw_addr)
{
struct rtnl_nexthop * nh;
nh = nm_netlink_get_nh(route);
g_return_val_if_fail(nh, -NLE_OBJ_NOTFOUND);
rtnl_route_nh_set_gateway(nh, gw_addr);
return 0;
}
int
rtnl_route_get_dst_len(struct rtnl_route * rtnlroute)
{
struct nl_addr * dst;
dst = rtnl_route_get_dst(rtnlroute);
return nl_addr_get_prefixlen(dst);
}

34
src/nm-netlink-compat.h
View file

@ -1,34 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* NetworkManager -- Network link manager
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2011 Caixa Magica Software.
* Copyright (C) 2011 - 2012 Red Hat, Inc.
*/
#ifndef NM_NETLINK_COMPAT_H
#define NM_NETLINK_COMPAT_H
#include <netlink/route/route.h>
/* libnl-1 API compatibility for libnl-3 */
int rtnl_route_get_oif(struct rtnl_route *);
int rtnl_route_set_oif(struct rtnl_route *, int);
int rtnl_route_set_gateway(struct rtnl_route *, struct nl_addr *);
int rtnl_route_get_dst_len(struct rtnl_route *);
struct nl_addr * rtnl_route_get_gateway(struct rtnl_route *);
#endif /* NM_NETLINK_COMPAT_H */

1
src/nm-netlink-monitor.c
View file

@ -46,7 +46,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include "nm-netlink-compat.h"
#include "nm-netlink-monitor.h"
#include "nm-logging.h"

2
src/nm-netlink-monitor.h
View file

@ -91,8 +91,6 @@ gboolean nm_netlink_monitor_get_flags_sync (NMNetlinkMonitor *monitor
guint32 *ifflags,
GError **error);
#include "nm-netlink-compat.h"
/* Generic utility functions */
int nm_netlink_iface_to_index (const char *iface);
char * nm_netlink_index_to_iface (int idx);

1
src/nm-system.c
View file

@ -53,7 +53,6 @@
#include "nm-logging.h"
#include "nm-netlink-monitor.h"
#include "nm-netlink-utils.h"
#include "nm-netlink-compat.h"
#include <netlink/route/addr.h>
#include <netlink/route/route.h>