2014-11-13 10:07:02 -05:00
|
|
|
#include "config.h"
|
|
|
|
|
|
2013-03-27 22:23:24 +01:00
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
2013-03-27 22:23:24 +01:00
|
|
|
#include <arpa/inet.h>
|
2013-03-27 22:23:24 +01:00
|
|
|
|
|
|
|
|
#include "nm-platform.h"
|
|
|
|
|
#include "nm-linux-platform.h"
|
|
|
|
|
#include "nm-fake-platform.h"
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dump_interface (NMPlatformLink *link)
|
|
|
|
|
{
|
2013-03-27 22:23:24 +01:00
|
|
|
GArray *ip6_addresses;
|
|
|
|
|
GArray *ip4_addresses;
|
|
|
|
|
const NMPlatformIP6Address *ip6_address;
|
|
|
|
|
const NMPlatformIP4Address *ip4_address;
|
2013-03-27 22:23:24 +01:00
|
|
|
GArray *ip6_routes;
|
|
|
|
|
GArray *ip4_routes;
|
|
|
|
|
const NMPlatformIP6Route *ip6_route;
|
|
|
|
|
const NMPlatformIP4Route *ip4_route;
|
|
|
|
|
char networkstr[INET6_ADDRSTRLEN];
|
|
|
|
|
char gatewaystr[INET6_ADDRSTRLEN];
|
2013-03-27 22:53:55 +01:00
|
|
|
int vlan_id, vlan_parent;
|
2013-03-27 22:53:55 +01:00
|
|
|
const char *address;
|
|
|
|
|
size_t addrlen;
|
2013-03-27 22:23:24 +01:00
|
|
|
int i;
|
|
|
|
|
|
2013-03-27 22:23:24 +01:00
|
|
|
g_assert (link->up || !link->connected);
|
|
|
|
|
|
2015-04-28 10:11:04 +02:00
|
|
|
printf ("%d: %s: %s", link->ifindex, link->name, nm_link_type_to_string (link->type));
|
2013-03-27 22:23:24 +01:00
|
|
|
if (link->up)
|
|
|
|
|
printf (" %s", link->connected ? "CONNECTED" : "DISCONNECTED");
|
|
|
|
|
else
|
|
|
|
|
printf (" DOWN");
|
|
|
|
|
if (!link->arp)
|
|
|
|
|
printf (" noarp");
|
2013-03-27 22:53:55 +01:00
|
|
|
if (link->master)
|
|
|
|
|
printf (" master %d", link->master);
|
2013-06-03 11:49:55 -03:00
|
|
|
if (link->parent)
|
|
|
|
|
printf (" parent %d", link->parent);
|
2013-04-15 21:48:12 +02:00
|
|
|
printf (" mtu %d", link->mtu);
|
2013-03-27 22:23:24 +01:00
|
|
|
printf ("\n");
|
2013-05-29 12:00:50 -03:00
|
|
|
if (link->driver)
|
|
|
|
|
printf (" driver: %s\n", link->driver);
|
|
|
|
|
printf (" UDI: %s\n", link->udi);
|
platform: add self argument to platform functions
Most nm_platform_*() functions operate on the platform
singleton nm_platform_get(). That made sense because the
NMPlatform instance was mainly to hook fake platform for
testing.
While the implicit argument saved some typing, I think explicit is
better. Especially, because NMPlatform could become a more usable
object then just a hook for testing.
With this change, NMPlatform instances can be used individually, not
only as a singleton instance.
Before this change, the constructor of NMLinuxPlatform could not
call any nm_platform_*() functions because the singleton was not
yet initialized. We could only instantiate an incomplete instance,
register it via nm_platform_setup(), and then complete initialization
via singleton->setup().
With this change, we can create and fully initialize NMPlatform instances
before/without setting them up them as singleton.
Also, currently there is no clear distinction between functions
that operate on the NMPlatform instance, and functions that can
be used stand-alone (e.g. nm_platform_ip4_address_to_string()).
The latter can not be mocked for testing. With this change, the
distinction becomes obvious. That is also useful because it becomes
clearer which functions make use of the platform cache and which not.
Inside nm-linux-platform.c, continue the pattern that the
self instance is named @platform. That makes sense because
its type is NMPlatform, and not NMLinuxPlatform what we
would expect from a paramter named @self.
This is a major diff that causes some pain when rebasing. Try
to rebase to the parent commit of this commit as a first step.
Then rebase on top of this commit using merge-strategy "ours".
2015-04-18 12:36:09 +02:00
|
|
|
if (!nm_platform_vlan_get_info (NM_PLATFORM_GET, link->ifindex, &vlan_parent, &vlan_id))
|
2013-10-31 14:13:33 +01:00
|
|
|
g_assert_not_reached ();
|
2013-03-27 22:53:55 +01:00
|
|
|
if (vlan_parent)
|
|
|
|
|
printf (" vlan parent %d id %d\n", vlan_parent, vlan_id);
|
2013-03-27 22:23:24 +01:00
|
|
|
|
platform: add self argument to platform functions
Most nm_platform_*() functions operate on the platform
singleton nm_platform_get(). That made sense because the
NMPlatform instance was mainly to hook fake platform for
testing.
While the implicit argument saved some typing, I think explicit is
better. Especially, because NMPlatform could become a more usable
object then just a hook for testing.
With this change, NMPlatform instances can be used individually, not
only as a singleton instance.
Before this change, the constructor of NMLinuxPlatform could not
call any nm_platform_*() functions because the singleton was not
yet initialized. We could only instantiate an incomplete instance,
register it via nm_platform_setup(), and then complete initialization
via singleton->setup().
With this change, we can create and fully initialize NMPlatform instances
before/without setting them up them as singleton.
Also, currently there is no clear distinction between functions
that operate on the NMPlatform instance, and functions that can
be used stand-alone (e.g. nm_platform_ip4_address_to_string()).
The latter can not be mocked for testing. With this change, the
distinction becomes obvious. That is also useful because it becomes
clearer which functions make use of the platform cache and which not.
Inside nm-linux-platform.c, continue the pattern that the
self instance is named @platform. That makes sense because
its type is NMPlatform, and not NMLinuxPlatform what we
would expect from a paramter named @self.
This is a major diff that causes some pain when rebasing. Try
to rebase to the parent commit of this commit as a first step.
Then rebase on top of this commit using merge-strategy "ours".
2015-04-18 12:36:09 +02:00
|
|
|
if (nm_platform_link_is_software (NM_PLATFORM_GET, link->ifindex))
|
2013-06-20 12:48:44 +02:00
|
|
|
printf (" class software\n");
|
platform: add self argument to platform functions
Most nm_platform_*() functions operate on the platform
singleton nm_platform_get(). That made sense because the
NMPlatform instance was mainly to hook fake platform for
testing.
While the implicit argument saved some typing, I think explicit is
better. Especially, because NMPlatform could become a more usable
object then just a hook for testing.
With this change, NMPlatform instances can be used individually, not
only as a singleton instance.
Before this change, the constructor of NMLinuxPlatform could not
call any nm_platform_*() functions because the singleton was not
yet initialized. We could only instantiate an incomplete instance,
register it via nm_platform_setup(), and then complete initialization
via singleton->setup().
With this change, we can create and fully initialize NMPlatform instances
before/without setting them up them as singleton.
Also, currently there is no clear distinction between functions
that operate on the NMPlatform instance, and functions that can
be used stand-alone (e.g. nm_platform_ip4_address_to_string()).
The latter can not be mocked for testing. With this change, the
distinction becomes obvious. That is also useful because it becomes
clearer which functions make use of the platform cache and which not.
Inside nm-linux-platform.c, continue the pattern that the
self instance is named @platform. That makes sense because
its type is NMPlatform, and not NMLinuxPlatform what we
would expect from a paramter named @self.
This is a major diff that causes some pain when rebasing. Try
to rebase to the parent commit of this commit as a first step.
Then rebase on top of this commit using merge-strategy "ours".
2015-04-18 12:36:09 +02:00
|
|
|
if (nm_platform_link_supports_slaves (NM_PLATFORM_GET, link->ifindex))
|
2013-06-20 12:48:44 +02:00
|
|
|
printf (" class supports-slaves\n");
|
platform: add self argument to platform functions
Most nm_platform_*() functions operate on the platform
singleton nm_platform_get(). That made sense because the
NMPlatform instance was mainly to hook fake platform for
testing.
While the implicit argument saved some typing, I think explicit is
better. Especially, because NMPlatform could become a more usable
object then just a hook for testing.
With this change, NMPlatform instances can be used individually, not
only as a singleton instance.
Before this change, the constructor of NMLinuxPlatform could not
call any nm_platform_*() functions because the singleton was not
yet initialized. We could only instantiate an incomplete instance,
register it via nm_platform_setup(), and then complete initialization
via singleton->setup().
With this change, we can create and fully initialize NMPlatform instances
before/without setting them up them as singleton.
Also, currently there is no clear distinction between functions
that operate on the NMPlatform instance, and functions that can
be used stand-alone (e.g. nm_platform_ip4_address_to_string()).
The latter can not be mocked for testing. With this change, the
distinction becomes obvious. That is also useful because it becomes
clearer which functions make use of the platform cache and which not.
Inside nm-linux-platform.c, continue the pattern that the
self instance is named @platform. That makes sense because
its type is NMPlatform, and not NMLinuxPlatform what we
would expect from a paramter named @self.
This is a major diff that causes some pain when rebasing. Try
to rebase to the parent commit of this commit as a first step.
Then rebase on top of this commit using merge-strategy "ours".
2015-04-18 12:36:09 +02:00
|
|
|
if (nm_platform_link_supports_carrier_detect (NM_PLATFORM_GET, link->ifindex))
|
2013-03-27 22:53:55 +01:00
|
|
|
printf (" feature carrier-detect\n");
|
platform: add self argument to platform functions
Most nm_platform_*() functions operate on the platform
singleton nm_platform_get(). That made sense because the
NMPlatform instance was mainly to hook fake platform for
testing.
While the implicit argument saved some typing, I think explicit is
better. Especially, because NMPlatform could become a more usable
object then just a hook for testing.
With this change, NMPlatform instances can be used individually, not
only as a singleton instance.
Before this change, the constructor of NMLinuxPlatform could not
call any nm_platform_*() functions because the singleton was not
yet initialized. We could only instantiate an incomplete instance,
register it via nm_platform_setup(), and then complete initialization
via singleton->setup().
With this change, we can create and fully initialize NMPlatform instances
before/without setting them up them as singleton.
Also, currently there is no clear distinction between functions
that operate on the NMPlatform instance, and functions that can
be used stand-alone (e.g. nm_platform_ip4_address_to_string()).
The latter can not be mocked for testing. With this change, the
distinction becomes obvious. That is also useful because it becomes
clearer which functions make use of the platform cache and which not.
Inside nm-linux-platform.c, continue the pattern that the
self instance is named @platform. That makes sense because
its type is NMPlatform, and not NMLinuxPlatform what we
would expect from a paramter named @self.
This is a major diff that causes some pain when rebasing. Try
to rebase to the parent commit of this commit as a first step.
Then rebase on top of this commit using merge-strategy "ours".
2015-04-18 12:36:09 +02:00
|
|
|
if (nm_platform_link_supports_vlans (NM_PLATFORM_GET, link->ifindex))
|
2013-03-27 22:53:55 +01:00
|
|
|
printf (" feature vlans\n");
|
|
|
|
|
|
platform: add self argument to platform functions
Most nm_platform_*() functions operate on the platform
singleton nm_platform_get(). That made sense because the
NMPlatform instance was mainly to hook fake platform for
testing.
While the implicit argument saved some typing, I think explicit is
better. Especially, because NMPlatform could become a more usable
object then just a hook for testing.
With this change, NMPlatform instances can be used individually, not
only as a singleton instance.
Before this change, the constructor of NMLinuxPlatform could not
call any nm_platform_*() functions because the singleton was not
yet initialized. We could only instantiate an incomplete instance,
register it via nm_platform_setup(), and then complete initialization
via singleton->setup().
With this change, we can create and fully initialize NMPlatform instances
before/without setting them up them as singleton.
Also, currently there is no clear distinction between functions
that operate on the NMPlatform instance, and functions that can
be used stand-alone (e.g. nm_platform_ip4_address_to_string()).
The latter can not be mocked for testing. With this change, the
distinction becomes obvious. That is also useful because it becomes
clearer which functions make use of the platform cache and which not.
Inside nm-linux-platform.c, continue the pattern that the
self instance is named @platform. That makes sense because
its type is NMPlatform, and not NMLinuxPlatform what we
would expect from a paramter named @self.
This is a major diff that causes some pain when rebasing. Try
to rebase to the parent commit of this commit as a first step.
Then rebase on top of this commit using merge-strategy "ours".
2015-04-18 12:36:09 +02:00
|
|
|
address = nm_platform_link_get_address (NM_PLATFORM_GET, link->ifindex, &addrlen);
|
2013-03-27 22:53:55 +01:00
|
|
|
if (address) {
|
|
|
|
|
printf (" link-address ");
|
|
|
|
|
for (i = 0; i < addrlen; i++)
|
|
|
|
|
printf ("%s%02hhx", i ? ":" : "", address[i]);
|
|
|
|
|
printf ("\n");
|
|
|
|
|
}
|
|
|
|
|
|
platform: add self argument to platform functions
Most nm_platform_*() functions operate on the platform
singleton nm_platform_get(). That made sense because the
NMPlatform instance was mainly to hook fake platform for
testing.
While the implicit argument saved some typing, I think explicit is
better. Especially, because NMPlatform could become a more usable
object then just a hook for testing.
With this change, NMPlatform instances can be used individually, not
only as a singleton instance.
Before this change, the constructor of NMLinuxPlatform could not
call any nm_platform_*() functions because the singleton was not
yet initialized. We could only instantiate an incomplete instance,
register it via nm_platform_setup(), and then complete initialization
via singleton->setup().
With this change, we can create and fully initialize NMPlatform instances
before/without setting them up them as singleton.
Also, currently there is no clear distinction between functions
that operate on the NMPlatform instance, and functions that can
be used stand-alone (e.g. nm_platform_ip4_address_to_string()).
The latter can not be mocked for testing. With this change, the
distinction becomes obvious. That is also useful because it becomes
clearer which functions make use of the platform cache and which not.
Inside nm-linux-platform.c, continue the pattern that the
self instance is named @platform. That makes sense because
its type is NMPlatform, and not NMLinuxPlatform what we
would expect from a paramter named @self.
This is a major diff that causes some pain when rebasing. Try
to rebase to the parent commit of this commit as a first step.
Then rebase on top of this commit using merge-strategy "ours".
2015-04-18 12:36:09 +02:00
|
|
|
ip4_addresses = nm_platform_ip4_address_get_all (NM_PLATFORM_GET, link->ifindex);
|
|
|
|
|
ip6_addresses = nm_platform_ip6_address_get_all (NM_PLATFORM_GET, link->ifindex);
|
2013-03-27 22:23:24 +01:00
|
|
|
|
|
|
|
|
g_assert (ip4_addresses);
|
|
|
|
|
g_assert (ip6_addresses);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ip4_addresses->len; i++) {
|
|
|
|
|
ip4_address = &g_array_index (ip4_addresses, NMPlatformIP4Address, i);
|
2014-06-09 10:11:31 +02:00
|
|
|
printf (" ip4-address %s\n", nm_platform_ip4_address_to_string (ip4_address));
|
2013-03-27 22:23:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ip6_addresses->len; i++) {
|
|
|
|
|
ip6_address = &g_array_index (ip6_addresses, NMPlatformIP6Address, i);
|
2014-06-09 10:11:31 +02:00
|
|
|
printf (" ip6-address %s\n", nm_platform_ip6_address_to_string (ip6_address));
|
2013-03-27 22:23:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
g_array_unref (ip4_addresses);
|
|
|
|
|
g_array_unref (ip6_addresses);
|
2013-03-27 22:23:24 +01:00
|
|
|
|
platform: add self argument to platform functions
Most nm_platform_*() functions operate on the platform
singleton nm_platform_get(). That made sense because the
NMPlatform instance was mainly to hook fake platform for
testing.
While the implicit argument saved some typing, I think explicit is
better. Especially, because NMPlatform could become a more usable
object then just a hook for testing.
With this change, NMPlatform instances can be used individually, not
only as a singleton instance.
Before this change, the constructor of NMLinuxPlatform could not
call any nm_platform_*() functions because the singleton was not
yet initialized. We could only instantiate an incomplete instance,
register it via nm_platform_setup(), and then complete initialization
via singleton->setup().
With this change, we can create and fully initialize NMPlatform instances
before/without setting them up them as singleton.
Also, currently there is no clear distinction between functions
that operate on the NMPlatform instance, and functions that can
be used stand-alone (e.g. nm_platform_ip4_address_to_string()).
The latter can not be mocked for testing. With this change, the
distinction becomes obvious. That is also useful because it becomes
clearer which functions make use of the platform cache and which not.
Inside nm-linux-platform.c, continue the pattern that the
self instance is named @platform. That makes sense because
its type is NMPlatform, and not NMLinuxPlatform what we
would expect from a paramter named @self.
This is a major diff that causes some pain when rebasing. Try
to rebase to the parent commit of this commit as a first step.
Then rebase on top of this commit using merge-strategy "ours".
2015-04-18 12:36:09 +02:00
|
|
|
ip4_routes = nm_platform_ip4_route_get_all (NM_PLATFORM_GET, link->ifindex, NM_PLATFORM_GET_ROUTE_MODE_ALL);
|
|
|
|
|
ip6_routes = nm_platform_ip6_route_get_all (NM_PLATFORM_GET, link->ifindex, NM_PLATFORM_GET_ROUTE_MODE_ALL);
|
2013-03-27 22:23:24 +01:00
|
|
|
|
|
|
|
|
g_assert (ip4_routes);
|
|
|
|
|
g_assert (ip6_routes);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ip4_routes->len; i++) {
|
|
|
|
|
ip4_route = &g_array_index (ip4_routes, NMPlatformIP4Route, i);
|
|
|
|
|
inet_ntop (AF_INET, &ip4_route->network, networkstr, sizeof (networkstr));
|
|
|
|
|
inet_ntop (AF_INET, &ip4_route->gateway, gatewaystr, sizeof (gatewaystr));
|
|
|
|
|
printf (" ip4-route %s/%d via %s\n", networkstr, ip4_route->plen, gatewaystr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ip6_routes->len; i++) {
|
|
|
|
|
ip6_route = &g_array_index (ip6_routes, NMPlatformIP6Route, i);
|
|
|
|
|
inet_ntop (AF_INET6, &ip6_route->network, networkstr, sizeof (networkstr));
|
|
|
|
|
inet_ntop (AF_INET6, &ip6_route->gateway, gatewaystr, sizeof (gatewaystr));
|
|
|
|
|
printf (" ip6-route %s/%d via %s\n", networkstr, ip6_route->plen, gatewaystr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
g_array_unref (ip4_routes);
|
|
|
|
|
g_array_unref (ip6_routes);
|
2013-03-27 22:23:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
dump_all (void)
|
|
|
|
|
{
|
platform: add self argument to platform functions
Most nm_platform_*() functions operate on the platform
singleton nm_platform_get(). That made sense because the
NMPlatform instance was mainly to hook fake platform for
testing.
While the implicit argument saved some typing, I think explicit is
better. Especially, because NMPlatform could become a more usable
object then just a hook for testing.
With this change, NMPlatform instances can be used individually, not
only as a singleton instance.
Before this change, the constructor of NMLinuxPlatform could not
call any nm_platform_*() functions because the singleton was not
yet initialized. We could only instantiate an incomplete instance,
register it via nm_platform_setup(), and then complete initialization
via singleton->setup().
With this change, we can create and fully initialize NMPlatform instances
before/without setting them up them as singleton.
Also, currently there is no clear distinction between functions
that operate on the NMPlatform instance, and functions that can
be used stand-alone (e.g. nm_platform_ip4_address_to_string()).
The latter can not be mocked for testing. With this change, the
distinction becomes obvious. That is also useful because it becomes
clearer which functions make use of the platform cache and which not.
Inside nm-linux-platform.c, continue the pattern that the
self instance is named @platform. That makes sense because
its type is NMPlatform, and not NMLinuxPlatform what we
would expect from a paramter named @self.
This is a major diff that causes some pain when rebasing. Try
to rebase to the parent commit of this commit as a first step.
Then rebase on top of this commit using merge-strategy "ours".
2015-04-18 12:36:09 +02:00
|
|
|
GArray *links = nm_platform_link_get_all (NM_PLATFORM_GET);
|
2013-03-27 22:23:24 +01:00
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < links->len; i++)
|
|
|
|
|
dump_interface (&g_array_index (links, NMPlatformLink, i));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
main (int argc, char **argv)
|
|
|
|
|
{
|
2014-05-27 16:47:15 +02:00
|
|
|
#if !GLIB_CHECK_VERSION (2, 35, 0)
|
2013-03-27 22:23:24 +01:00
|
|
|
g_type_init ();
|
2014-05-27 16:47:15 +02:00
|
|
|
#endif
|
2013-03-27 22:23:24 +01:00
|
|
|
|
|
|
|
|
g_assert (argc <= 2);
|
|
|
|
|
if (argc > 1 && !g_strcmp0 (argv[1], "--fake"))
|
|
|
|
|
nm_fake_platform_setup ();
|
|
|
|
|
else
|
|
|
|
|
nm_linux_platform_setup ();
|
|
|
|
|
|
|
|
|
|
dump_all ();
|
|
|
|
|
|
|
|
|
|
return EXIT_SUCCESS;
|
|
|
|
|
}
|
