X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=5a1bf1a4cac8aba722e462d7f0e54fadd02018d4;hb=6afc95b73605833e6e966af1c466b5c08feb953f;hp=e9ca38f59765fda5ea342f92422c5cb3bed2c43b;hpb=a6cc569e33a05b07550c6c7b4d67d83d868f8bc1;p=elogind.git

diff --git a/src/network/networkd.h b/src/network/networkd.h
index e9ca38f59..5a1bf1a4c 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <arpa/inet.h>
-#include <linux/rtnetlink.h>
 
 #include "sd-event.h"
 #include "sd-rtnl.h"
@@ -34,7 +33,7 @@
 #include "hashmap.h"
 #include "list.h"
 
-typedef struct Netdev Netdev;
+typedef struct NetDev NetDev;
 typedef struct Network Network;
 typedef struct Link Link;
 typedef struct Address Address;
@@ -50,35 +49,35 @@ struct netdev_enslave_callback {
         LIST_FIELDS(netdev_enslave_callback, callbacks);
 };
 
-typedef enum NetdevKind {
+typedef enum NetDevKind {
         NETDEV_KIND_BRIDGE,
         NETDEV_KIND_BOND,
         NETDEV_KIND_VLAN,
         _NETDEV_KIND_MAX,
         _NETDEV_KIND_INVALID = -1
-} NetdevKind;
+} NetDevKind;
 
-typedef enum NetdevState {
+typedef enum NetDevState {
         NETDEV_STATE_FAILED,
         NETDEV_STATE_CREATING,
         NETDEV_STATE_READY,
         _NETDEV_STATE_MAX,
         _NETDEV_STATE_INVALID = -1,
-} NetdevState;
+} NetDevState;
 
-struct Netdev {
+struct NetDev {
         Manager *manager;
 
         char *filename;
 
         char *description;
         char *name;
-        NetdevKind kind;
+        NetDevKind kind;
 
-        int vlanid;
+        uint64_t vlanid;
 
         int ifindex;
-        NetdevState state;
+        NetDevState state;
 
         LIST_HEAD(netdev_enslave_callback, callbacks);
 };
@@ -95,9 +94,9 @@ struct Network {
         char *match_name;
 
         char *description;
-        Netdev *bridge;
-        Netdev *bond;
-        Netdev *vlan;
+        NetDev *bridge;
+        NetDev *bond;
+        Hashmap *vlans;
         bool dhcp;
         bool dhcp_dns;
         bool dhcp_mtu;
@@ -221,21 +220,21 @@ int manager_update_resolv_conf(Manager *m);
 DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
 #define _cleanup_manager_free_ _cleanup_(manager_freep)
 
-/* Netdev */
+/* NetDev */
 
 int netdev_load(Manager *manager);
 
-void netdev_free(Netdev *netdev);
+void netdev_free(NetDev *netdev);
 
-DEFINE_TRIVIAL_CLEANUP_FUNC(Netdev*, netdev_free);
+DEFINE_TRIVIAL_CLEANUP_FUNC(NetDev*, netdev_free);
 #define _cleanup_netdev_free_ _cleanup_(netdev_freep)
 
-int netdev_get(Manager *manager, const char *name, Netdev **ret);
-int netdev_set_ifindex(Netdev *netdev, int ifindex);
-int netdev_enslave(Netdev *netdev, Link *link, sd_rtnl_message_handler_t cb);
+int netdev_get(Manager *manager, const char *name, NetDev **ret);
+int netdev_set_ifindex(NetDev *netdev, int ifindex);
+int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t cb);
 
-const char *netdev_kind_to_string(NetdevKind d) _const_;
-NetdevKind netdev_kind_from_string(const char *d) _pure_;
+const char *netdev_kind_to_string(NetDevKind d) _const_;
+NetDevKind netdev_kind_from_string(const char *d) _pure_;
 
 int config_parse_netdev_kind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 
@@ -314,6 +313,7 @@ int config_parse_label(const char *unit, const char *filename, unsigned line,
 
 int link_new(Manager *manager, struct udev_device *device, Link **ret);
 void link_free(Link *link);
+int link_get(Manager *m, int ifindex, Link **ret);
 int link_add(Manager *manager, struct udev_device *device, Link **ret);
 int link_configure(Link *link);