#include <linux/if.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
+#include <i18n/i18n.h>
#include <log/log.h>
#include <list/list.h>
bool dry_run;
};
+static char *mac_bytes_to_string(void *ctx, uint8_t *addr, int len)
+{
+ const int l = strlen("xx:");
+ char *buf;
+ int i;
+
+ if (len <= 0)
+ return talloc_strdup(ctx, "");
+
+ buf = talloc_array(ctx, char, (len * l) + 1);
+
+ for (i = 0; i < len; i++)
+ sprintf(buf + (l * i), "%02x:", addr[i]);
+
+ *(buf + (l * len) - 1) = '\0';
+
+ return buf;
+}
+
static const struct interface_config *find_config_by_hwaddr(
uint8_t *hwaddr)
{
return NULL;
}
+static struct interface *find_interface_by_uuid(struct network *network,
+ const char *uuid)
+{
+ struct interface *interface;
+ char *mac;
+
+ list_for_each_entry(&network->interfaces, interface, list) {
+ mac = mac_bytes_to_string(interface, interface->hwaddr,
+ sizeof(interface->hwaddr));
+ if (!strcmp(mac, uuid)) {
+ talloc_free(mac);
+ return interface;
+ }
+ talloc_free(mac);
+ }
+
+ return NULL;
+}
+
uint8_t *find_mac_by_name(void *ctx, struct network *network,
const char *name)
{
return 0;
}
-static char *mac_bytes_to_string(void *ctx, uint8_t *addr, int len)
-{
- const int l = strlen("xx:");
- char *buf;
- int i;
-
- if (len <= 0)
- return talloc_strdup(ctx, "");
-
- buf = talloc_array(ctx, char, (len * l) + 1);
-
- for (i = 0; i < len; i++)
- sprintf(buf + (l * i), "%02x:", addr[i]);
-
- *(buf + (l * len) - 1) = '\0';
-
- return buf;
-}
-
-static void add_interface(struct network *network,
+static void create_interface_dev(struct network *network,
struct interface *interface)
{
- list_add(&network->interfaces, &interface->list);
- interface->dev = discover_device_create(network->handler,
- interface->name);
+ char *uuid = mac_bytes_to_string(interface, interface->hwaddr,
+ sizeof(interface->hwaddr));
+
+ interface->dev = discover_device_create(network->handler, uuid,
+ interface->name);
interface->dev->device->type = DEVICE_TYPE_NETWORK;
- interface->dev->uuid = mac_bytes_to_string(interface->dev,
- interface->hwaddr, sizeof(interface->hwaddr));
device_handler_add_device(network->handler, interface->dev);
+ talloc_free(uuid);
}
static void remove_interface(struct network *network,
{
struct interface *iface;
- iface = find_interface_by_name(network, dev->device->id);
+ if (dev->uuid)
+ iface = find_interface_by_uuid(network, dev->uuid);
+ else
+ iface = find_interface_by_name(network, dev->label);
if (!iface)
return;
{
struct interface *iface;
- iface = find_interface_by_name(network, dev->device->id);
+ iface = find_interface_by_uuid(network, dev->uuid);
if (!iface)
return;
process_release(process);
}
-static void configure_interface_dhcp(struct interface *interface)
+static void configure_interface_dhcp(struct network *network,
+ struct interface *interface)
{
const struct platform *platform;
char pidfile[256], id[10];
NULL,
};
+ device_handler_status_dev_info(network->handler, interface->dev,
+ _("Configuring with DHCP"));
+
snprintf(pidfile, sizeof(pidfile), "%s/udhcpc-%s.pid",
PIDFILE_BASE, interface->name);
{
int rc;
+ device_handler_status_dev_info(network->handler, interface->dev,
+ _("Configuring with static address (ip: %s)"),
+ config->static_config.address);
+
rc = process_run_simple(interface, pb_system_apps.ip,
"address", "add", config->static_config.address,
"dev", interface->name, NULL);
return;
}
+ system_info_set_interface_address(sizeof(interface->hwaddr),
+ interface->hwaddr,
+ config->static_config.address);
+
/* we need the interface up before we can route through it */
rc = interface_up(interface);
if (rc)
if (config->static_config.url) {
pb_log("config URL %s\n", config->static_config.url);
device_handler_process_url(network->handler,
- config->static_config.url);
+ config->static_config.url,
+ mac_bytes_to_string(interface->dev,
+ interface->hwaddr,
+ sizeof(interface->hwaddr)),
+ config->static_config.address);
}
return;
interface->state = IFSTATE_NEW;
else if (!link)
interface->state = IFSTATE_UP_WAITING_LINK;
- else
+ else {
+ pb_debug("network: skipping configured interface %s\n",
+ interface->name);
return;
+ }
}
/* always up the lookback, no other handling required */
pb_log("network: configuring interface %s\n", interface->name);
if (!config || config->method == CONFIG_METHOD_DHCP) {
- configure_interface_dhcp(interface);
+ configure_interface_dhcp(network, interface);
} else if (config->method == CONFIG_METHOD_STATIC) {
configure_interface_static(network, interface, config);
}
+
+ interface->state = IFSTATE_CONFIGURED;
}
static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
{
bool have_ifaddr, have_ifname;
- struct interface *interface;
+ struct interface *interface, *tmp;
struct ifinfomsg *info;
struct rtattr *attr;
unsigned int mtu;
return 0;
}
+ /* ignore the default tun device in some environments */
+ if (strncmp(ifname, "tun", strlen("tun")) == 0)
+ return 0;
interface = find_interface_by_ifindex(network, info->ifi_index);
if (!interface) {
interface->state = IFSTATE_NEW;
memcpy(interface->hwaddr, ifaddr, sizeof(interface->hwaddr));
strncpy(interface->name, ifname, sizeof(interface->name) - 1);
- add_interface(network, interface);
+
+ list_for_each_entry(&network->interfaces, tmp, list)
+ if (memcmp(interface->hwaddr, tmp->hwaddr,
+ sizeof(interface->hwaddr)) == 0) {
+ pb_log("%s: %s has duplicate MAC address, ignoring\n",
+ __func__, interface->name);
+ talloc_free(interface);
+ return -1;
+ }
+
+ list_add(&network->interfaces, &interface->list);
+ create_interface_dev(network, interface);
}
/* A repeated RTM_NEWLINK can represent an interface name change */
interface->hwaddr, interface->name,
info->ifi_flags & IFF_LOWER_UP);
+ if (!interface->dev)
+ create_interface_dev(network, interface);
+
configure_interface(network, interface,
info->ifi_flags & IFF_UP,
info->ifi_flags & IFF_LOWER_UP);