summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSusant Sahani <ssahani@redhat.com>2019-04-30 14:53:39 +0530
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-05-03 06:11:52 +0200
commitc2c2793f39352c554b05ebf299374ed02290d816 (patch)
tree49dd9c0cf6b3b257117137a4048c2b0635fba6e8
parentf143c650a35b9f04e25ac58a838a825ab42a955e (diff)
downloadsystemd-c2c2793f39352c554b05ebf299374ed02290d816.tar.gz
networkd: Add support to configure destination address for bridge FDB
Closes #5145. Example conf: ``` [Match] Name=vxlan1309 [BridgeFDB] MACAddress=00:00:00:00:00:00 Destination=10.0.0.2 [BridgeFDB] MACAddress=00:00:00:00:00:00 Destination=10.0.0.4 [BridgeFDB] MACAddress=00:00:00:00:00:00 Destination=10.0.0.5 ```
-rw-r--r--man/systemd.network.xml6
-rw-r--r--src/network/networkd-fdb.c43
-rw-r--r--src/network/networkd-fdb.h6
-rw-r--r--src/network/networkd-network-gperf.gperf1
-rw-r--r--test/fuzz/fuzz-network-parser/directives.network1
5 files changed, 56 insertions, 1 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 4381090d34..604eea4c18 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1914,6 +1914,12 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><varname>Destination=</varname></term>
+ <listitem>
+ <para>Takes an IP address of the destination VXLAN tunnel endpoint.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><varname>VLANId=</varname></term>
<listitem>
<para>The VLAN ID for the new static MAC table entry. If
diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c
index 1934bc66eb..6ebc45267f 100644
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -145,6 +145,12 @@ int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) {
return rtnl_log_create_error(r);
}
+ if (!in_addr_is_null(fdb_entry->family, &fdb_entry->destination_addr)) {
+ r = netlink_message_append_in_addr_union(req, NDA_DST, fdb_entry->family, &fdb_entry->destination_addr);
+ if (r < 0)
+ return log_link_error_errno(link, r, "Could not append NDA_DST attribute: %m");
+ }
+
/* send message to the kernel to update its internal static MAC table. */
r = netlink_call_async(rtnl, NULL, req, set_fdb_handler,
link_netlink_destroy_callback, link);
@@ -258,3 +264,40 @@ int config_parse_fdb_vlan_id(
return 0;
}
+
+int config_parse_fdb_destination(
+ 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) {
+
+ _cleanup_(fdb_entry_free_or_set_invalidp) FdbEntry *fdb_entry = NULL;
+ Network *network = userdata;
+ int r;
+
+ assert(filename);
+ assert(section);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ r = fdb_entry_new_static(network, filename, section_line, &fdb_entry);
+ if (r < 0)
+ return log_oom();
+
+ r = in_addr_from_string_auto(rvalue, &fdb_entry->family, &fdb_entry->destination_addr);
+ if (r < 0)
+ return log_syntax(unit, LOG_ERR, filename, line, r,
+ "FDB destination IP address is invalid, ignoring assignment: %s",
+ rvalue);
+
+ fdb_entry = NULL;
+
+ return 0;
+}
diff --git a/src/network/networkd-fdb.h b/src/network/networkd-fdb.h
index 6b7da2e741..e3c45acd72 100644
--- a/src/network/networkd-fdb.h
+++ b/src/network/networkd-fdb.h
@@ -19,9 +19,12 @@ struct FdbEntry {
Network *network;
NetworkConfigSection *section;
- struct ether_addr *mac_addr;
+ int family;
uint16_t vlan_id;
+ struct ether_addr *mac_addr;
+ union in_addr_union destination_addr;
+
LIST_FIELDS(FdbEntry, static_fdb_entries);
};
@@ -32,3 +35,4 @@ DEFINE_NETWORK_SECTION_FUNCTIONS(FdbEntry, fdb_entry_free);
CONFIG_PARSER_PROTOTYPE(config_parse_fdb_hwaddr);
CONFIG_PARSER_PROTOTYPE(config_parse_fdb_vlan_id);
+CONFIG_PARSER_PROTOTYPE(config_parse_fdb_destination);
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 0db59473ff..653da83c9f 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -179,6 +179,7 @@ Bridge.Learning, config_parse_tristate,
Bridge.Priority, config_parse_bridge_port_priority, 0, offsetof(Network, priority)
BridgeFDB.MACAddress, config_parse_fdb_hwaddr, 0, 0
BridgeFDB.VLANId, config_parse_fdb_vlan_id, 0, 0
+BridgeFDB.Destination, config_parse_fdb_destination, 0, 0
BridgeVLAN.PVID, config_parse_brvlan_pvid, 0, 0
BridgeVLAN.VLAN, config_parse_brvlan_vlan, 0, 0
BridgeVLAN.EgressUntagged, config_parse_brvlan_untagged, 0, 0
diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network
index cd2031150f..fd3256e784 100644
--- a/test/fuzz/fuzz-network-parser/directives.network
+++ b/test/fuzz/fuzz-network-parser/directives.network
@@ -32,6 +32,7 @@ MACAddress=
[BridgeFDB]
VLANId=
MACAddress=
+Destination=
[DHCP]
UseDomains=
UseRoutes=