X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=726cd836996fcc7c1072a6543f20fe4e9b65fa0d;hb=672682a6b9d6fb6a3722c3fea1a93b4831747b54;hp=bfa01a94f0745492813a4d821ef4cbb5e5816f94;hpb=2ad8416dd057e7e3185169609ca3006e7649f576;p=elogind.git

diff --git a/src/network/networkd.h b/src/network/networkd.h
index bfa01a94f..726cd8369 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -26,6 +26,7 @@
 
 #include "sd-event.h"
 #include "sd-rtnl.h"
+#include "sd-bus.h"
 #include "sd-dhcp-client.h"
 #include "udev.h"
 
@@ -33,43 +34,53 @@
 #include "hashmap.h"
 #include "list.h"
 
-typedef struct Bridge Bridge;
+typedef struct NetDev NetDev;
 typedef struct Network Network;
 typedef struct Link Link;
 typedef struct Address Address;
 typedef struct Route Route;
 typedef struct Manager Manager;
 
-typedef struct bridge_join_callback bridge_join_callback;
+typedef struct netdev_enslave_callback netdev_enslave_callback;
 
-struct bridge_join_callback {
+struct netdev_enslave_callback {
         sd_rtnl_message_handler_t callback;
         Link *link;
 
-        LIST_FIELDS(bridge_join_callback, callbacks);
+        LIST_FIELDS(netdev_enslave_callback, callbacks);
 };
 
-typedef enum BridgeState {
-        BRIDGE_STATE_FAILED,
-        BRIDGE_STATE_CREATING,
-        BRIDGE_STATE_CREATED,
-        BRIDGE_STATE_READY,
-        _BRIDGE_STATE_MAX,
-        _BRIDGE_STATE_INVALID = -1,
-} BridgeState;
-
-struct Bridge {
+typedef enum NetDevKind {
+        NETDEV_KIND_BRIDGE,
+        NETDEV_KIND_BOND,
+        NETDEV_KIND_VLAN,
+        _NETDEV_KIND_MAX,
+        _NETDEV_KIND_INVALID = -1
+} NetDevKind;
+
+typedef enum NetDevState {
+        NETDEV_STATE_FAILED,
+        NETDEV_STATE_CREATING,
+        NETDEV_STATE_READY,
+        _NETDEV_STATE_MAX,
+        _NETDEV_STATE_INVALID = -1,
+} NetDevState;
+
+struct NetDev {
         Manager *manager;
 
         char *filename;
 
         char *description;
         char *name;
+        NetDevKind kind;
 
-        Link *link;
-        BridgeState state;
+        uint64_t vlanid;
+
+        int ifindex;
+        NetDevState state;
 
-        LIST_HEAD(bridge_join_callback, callbacks);
+        LIST_HEAD(netdev_enslave_callback, callbacks);
 };
 
 struct Network {
@@ -84,11 +95,19 @@ struct Network {
         char *match_name;
 
         char *description;
-        Bridge *bridge;
+        NetDev *bridge;
+        NetDev *bond;
+        Hashmap *vlans;
         bool dhcp;
+        bool dhcp_dns;
+        bool dhcp_mtu;
+        bool dhcp_hostname;
+        bool dhcp_domainname;
+        bool dhcp_critical;
 
         LIST_HEAD(Address, static_addresses);
         LIST_HEAD(Route, static_routes);
+        Address *dns;
 
         Hashmap *addresses_by_section;
         Hashmap *routes_by_section;
@@ -104,7 +123,7 @@ struct Address {
         unsigned char prefixlen;
         char *label;
 
-        struct in_addr netmask;
+        struct in_addr broadcast;
 
         union {
                 struct in_addr in;
@@ -119,7 +138,6 @@ struct Route {
         uint64_t section;
 
         unsigned char family;
-        unsigned char dst_family;
         unsigned char dst_prefixlen;
 
         union {
@@ -136,7 +154,7 @@ struct Route {
 };
 
 typedef enum LinkState {
-        LINK_STATE_JOINING_BRIDGE,
+        LINK_STATE_ENSLAVING,
         LINK_STATE_SETTING_ADDRESSES,
         LINK_STATE_SETTING_ROUTES,
         LINK_STATE_CONFIGURED,
@@ -156,26 +174,27 @@ struct Link {
 
         Network *network;
 
-        Route *dhcp_route;
-        Address *dhcp_address;
-
         LinkState state;
 
         unsigned addr_messages;
         unsigned route_messages;
+        unsigned enslaving;
 
-        sd_dhcp_client *dhcp;
+        sd_dhcp_client *dhcp_client;
+        sd_dhcp_lease *dhcp_lease;
+        uint16_t original_mtu;
 };
 
 struct Manager {
         sd_rtnl *rtnl;
         sd_event *event;
+        sd_bus *bus;
         struct udev *udev;
         struct udev_monitor *udev_monitor;
         sd_event_source *udev_event_source;
 
         Hashmap *links;
-        Hashmap *bridges;
+        Hashmap *netdevs;
         LIST_HEAD(Network, networks);
 
         usec_t network_dirs_ts_usec;
@@ -195,22 +214,30 @@ int manager_udev_enumerate_links(Manager *m);
 int manager_udev_listen(Manager *m);
 
 int manager_rtnl_listen(Manager *m);
+int manager_bus_listen(Manager *m);
+
+int manager_update_resolv_conf(Manager *m);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
 #define _cleanup_manager_free_ _cleanup_(manager_freep)
 
-/* Bridge */
+/* NetDev */
 
-int bridge_load(Manager *manager);
+int netdev_load(Manager *manager);
 
-void bridge_free(Bridge *bridge);
+void netdev_free(NetDev *netdev);
 
-DEFINE_TRIVIAL_CLEANUP_FUNC(Bridge*, bridge_free);
-#define _cleanup_bridge_free_ _cleanup_(bridge_freep)
+DEFINE_TRIVIAL_CLEANUP_FUNC(NetDev*, netdev_free);
+#define _cleanup_netdev_free_ _cleanup_(netdev_freep)
 
-int bridge_get(Manager *manager, const char *name, Bridge **ret);
-int bridge_set_link(Manager *m, Link *link);
-int bridge_join(Bridge *bridge, 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_;
+
+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);
 
 /* Network */
 
@@ -228,6 +255,14 @@ int config_parse_bridge(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);
 
+int config_parse_bond(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);
+
+int config_parse_vlan(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);
+
 /* gperf */
 
 const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length);
@@ -259,10 +294,18 @@ int address_drop(Address *address, Link *link, sd_rtnl_message_handler_t callbac
 DEFINE_TRIVIAL_CLEANUP_FUNC(Address*, address_free);
 #define _cleanup_address_free_ _cleanup_(address_freep)
 
+int config_parse_dns(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);
+
 int config_parse_address(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);
 
+int config_parse_broadcast(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);
+
 int config_parse_label(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);
@@ -278,3 +321,32 @@ int link_update(Link *link, sd_rtnl_message *message);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_free);
 #define _cleanup_link_free_ _cleanup_(link_freep)
+
+/* Macros which append INTERFACE= to the message */
+
+#define log_full_link(level, link, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%s: " fmt, link->ifname, ##__VA_ARGS__)
+#define log_debug_link(link, ...)       log_full_link(LOG_DEBUG, link, ##__VA_ARGS__)
+#define log_info_link(link, ...)        log_full_link(LOG_INFO, link, ##__VA_ARGS__)
+#define log_notice_link(link, ...)      log_full_link(LOG_NOTICE, link, ##__VA_ARGS__)
+#define log_warning_link(link, ...)     log_full_link(LOG_WARNING, link, ##__VA_ARGS__)
+#define log_error_link(link, ...)       log_full_link(LOG_ERR, link, ##__VA_ARGS__)
+
+#define log_struct_link(level, link, ...) log_struct(level, "INTERFACE=%s", link->ifname, __VA_ARGS__)
+
+/* More macros which append INTERFACE= to the message */
+
+#define log_full_netdev(level, netdev, fmt, ...) log_meta_object(level, __FILE__, __LINE__, __func__, "INTERFACE=", netdev->name, "%s: " fmt, netdev->name, ##__VA_ARGS__)
+#define log_debug_netdev(netdev, ...)       log_full_netdev(LOG_DEBUG, netdev, ##__VA_ARGS__)
+#define log_info_netdev(netdev, ...)        log_full_netdev(LOG_INFO, netdev, ##__VA_ARGS__)
+#define log_notice_netdev(netdev, ...)      log_full_netdev(LOG_NOTICE, netdev, ##__VA_ARGS__)
+#define log_warning_netdev(netdev, ...)     log_full_netdev(LOG_WARNING, netdev,## __VA_ARGS__)
+#define log_error_netdev(netdev, ...)       log_full_netdev(LOG_ERR, netdev, ##__VA_ARGS__)
+
+#define log_struct_netdev(level, netdev, ...) log_struct(level, "INTERFACE=%s", netdev->name, __VA_ARGS__)
+
+#define NETDEV(netdev) "INTERFACE=%s", netdev->name
+#define ADDRESS_FMT_VAL(address)            \
+        (address).s_addr & 0xFF,            \
+        ((address).s_addr >> 8) & 0xFF,     \
+        ((address).s_addr >> 16) & 0xFF,    \
+        (address).s_addr >> 24