networkd: fdb - fix const warning

[elogind.git] / src / network / networkd.h

diff --git a/src/network/networkd.h b/src/network/networkd.h
index cd54e9bb067f3398fc858ba32a0be7c2d0bca0cf..7f1f06c811fc9237b3a20967eb48c443da234421 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -97,13 +97,13 @@ struct Network {
         Manager *manager;
 
         char *filename;
         Manager *manager;
 
         char *filename;

+        char *name;

 
         struct ether_addr *match_mac;
 
         struct ether_addr *match_mac;

-        char *match_path;
-        char *match_driver;
-        char *match_type;
-        char *match_name;
-        char *dhcp_vendor_class_identifier;
+        char **match_path;
+        char **match_driver;
+        char **match_type;
+        char **match_name;

 
         Condition *match_host;
         Condition *match_virt;
 
         Condition *match_host;
         Condition *match_virt;


@@ -115,6 +115,7 @@ struct Network {
         NetDev *bond;
         Hashmap *stacked_netdevs;
         AddressFamilyBoolean dhcp;
         NetDev *bond;
         Hashmap *stacked_netdevs;
         AddressFamilyBoolean dhcp;

+        char *dhcp_vendor_class_identifier;

         bool dhcp_dns;
         bool dhcp_ntp;
         bool dhcp_mtu;
         bool dhcp_dns;
         bool dhcp_ntp;
         bool dhcp_mtu;


@@ -125,8 +126,9 @@ struct Network {
         bool dhcp_critical;
         bool dhcp_routes;
         unsigned dhcp_route_metric;
         bool dhcp_critical;
         bool dhcp_routes;
         unsigned dhcp_route_metric;

-        bool ipv4ll;
+        AddressFamilyBoolean link_local;

         bool ipv4ll_route;
         bool ipv4ll_route;

+        union in_addr_union ipv6_token;

 
         bool dhcp_server;
 
 
         bool dhcp_server;
 


@@ -224,6 +226,7 @@ struct Manager {
 
         Hashmap *links;
         Hashmap *netdevs;
 
         Hashmap *links;
         Hashmap *netdevs;

+        Hashmap *networks_by_name;

         LIST_HEAD(Network, networks);
         LIST_HEAD(AddressPool, address_pools);
 
         LIST_HEAD(Network, networks);
         LIST_HEAD(AddressPool, address_pools);
 


@@ -265,6 +268,7 @@ void network_free(Network *network);
 DEFINE_TRIVIAL_CLEANUP_FUNC(Network*, network_free);
 #define _cleanup_network_free_ _cleanup_(network_freep)
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Network*, network_free);
 #define _cleanup_network_free_ _cleanup_(network_freep)
 

+int network_get_by_name(Manager *manager, const char *name, Network **ret);

 int network_get(Manager *manager, struct udev_device *device,
                 const char *ifname, const struct ether_addr *mac,
                 Network **ret);
 int network_get(Manager *manager, struct udev_device *device,
                 const char *ifname, const struct ether_addr *mac,
                 Network **ret);


@@ -318,6 +322,11 @@ int config_parse_vxlan_group_address(const char *unit,
                                      void *data,
                                      void *userdata);
 
                                      void *data,
                                      void *userdata);
 

+extern const sd_bus_vtable network_vtable[];
+
+int network_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
+int network_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
+

 /* gperf */
 const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length);
 
 /* gperf */
 const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length);
 


@@ -343,6 +352,10 @@ int config_parse_destination(const char *unit, const char *filename, unsigned li
 int config_parse_route_priority(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_route_priority(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_route_scope(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);

 /* Address */
 int address_new_static(Network *network, unsigned section, Address **ret);
 int address_new_dynamic(Address **ret);
 /* Address */
 int address_new_static(Network *network, unsigned section, Address **ret);
 int address_new_dynamic(Address **ret);


@@ -370,7 +383,7 @@ int config_parse_label(const char *unit, const char *filename, unsigned line,
                        int ltype, const char *rvalue, void *data, void *userdata);
 
 /* Forwarding database table. */
                        int ltype, const char *rvalue, void *data, void *userdata);
 
 /* Forwarding database table. */

-int fdb_entry_configure(sd_rtnl *const rtnl, FdbEntry *const fdb_entry, const int ifindex);
+int fdb_entry_configure(Link *const link, FdbEntry *const fdb_entry);

 void fdb_entry_free(FdbEntry *fdb_entry);
 int fdb_entry_new_static(Network *const network, const unsigned section, FdbEntry **ret);
 
 void fdb_entry_free(FdbEntry *fdb_entry);
 int fdb_entry_new_static(Network *const network, const unsigned section, FdbEntry **ret);
 


@@ -391,6 +404,17 @@ int config_parse_dhcp(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);
 
                       const char *section, unsigned section_line, const char *lvalue,
                       int ltype, const char *rvalue, void *data, void *userdata);
 

+/* IPv4LL support (legacy) */
+
+int config_parse_ipv4ll(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);
+
+/* IPv6 support */
+int config_parse_token(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);
+

 /* LLMNR support */
 
 const char* llmnr_support_to_string(LLMNRSupport i) _const_;
 /* LLMNR support */
 
 const char* llmnr_support_to_string(LLMNRSupport i) _const_;