colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/ovs: track key for OpenvswitchPort in same struct

Browse Source
This commit is contained in:
Thomas Haller
2020-11-05 21:16:58 +01:00
parent 2094cbb5d1
commit 51495e4e9a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/devices/ovs/nm-ovsdb.c
View File

@@ -22,6 +22,7 @@
#endif #endif
typedef struct { typedef struct {
char * port_uuid;
char * name; char * name;
char * connection_uuid; char * connection_uuid;
GPtrArray *interfaces; /* interface uuids */ GPtrArray *interfaces; /* interface uuids */
@@ -773,7 +774,7 @@ _add_interface(NMOvsdb * self,
for (pi = 0; pi < ovs_bridge->ports->len; pi++) { for (pi = 0; pi < ovs_bridge->ports->len; pi++) {
port_uuid = g_ptr_array_index(ovs_bridge->ports, pi); port_uuid = g_ptr_array_index(ovs_bridge->ports, pi);
ovs_port = g_hash_table_lookup(priv->ports, port_uuid); ovs_port = g_hash_table_lookup(priv->ports, &port_uuid);
json_array_append_new(ports, json_pack("[s, s]", "uuid", port_uuid)); json_array_append_new(ports, json_pack("[s, s]", "uuid", port_uuid));
@@ -891,7 +892,7 @@ _delete_interface(NMOvsdb *self, json_t *params, const char *ifname)
interfaces = json_array(); interfaces = json_array();
new_interfaces = json_array(); new_interfaces = json_array();
port_uuid = g_ptr_array_index(ovs_bridge->ports, pi); port_uuid = g_ptr_array_index(ovs_bridge->ports, pi);
ovs_port = g_hash_table_lookup(priv->ports, port_uuid); ovs_port = g_hash_table_lookup(priv->ports, &port_uuid);
json_array_append_new(ports, json_pack("[s,s]", "uuid", port_uuid)); json_array_append_new(ports, json_pack("[s,s]", "uuid", port_uuid));
@@ -1313,7 +1314,7 @@ ovsdb_got_update(NMOvsdb *self, json_t *msg)
new = TRUE; new = TRUE;
if (old) { if (old) {
ovs_port = g_hash_table_lookup(priv->ports, key); ovs_port = g_hash_table_lookup(priv->ports, &key);
if (!new || (ovs_port && !nm_streq0(ovs_port->name, name))) { if (!new || (ovs_port && !nm_streq0(ovs_port->name, name))) {
old = FALSE; old = FALSE;
_LOGT("removed a port: %s%s%s", _LOGT("removed a port: %s%s%s",
@@ -1326,18 +1327,19 @@ ovsdb_got_update(NMOvsdb *self, json_t *msg)
ovs_port->name, ovs_port->name,
NM_DEVICE_TYPE_OVS_PORT); NM_DEVICE_TYPE_OVS_PORT);
} }
g_hash_table_remove(priv->ports, key); g_hash_table_remove(priv->ports, &key);
} }
if (new) { if (new) {
ovs_port = g_slice_new(OpenvswitchPort); ovs_port = g_slice_new(OpenvswitchPort);
*ovs_port = (OpenvswitchPort){ *ovs_port = (OpenvswitchPort){
.port_uuid = g_strdup(key),
.name = g_strdup(name), .name = g_strdup(name),
.connection_uuid = _connection_uuid_from_external_ids(external_ids), .connection_uuid = _connection_uuid_from_external_ids(external_ids),
.interfaces = g_ptr_array_new_with_free_func(g_free), .interfaces = g_ptr_array_new_with_free_func(g_free),
}; };
_uuids_to_array(ovs_port->interfaces, items); _uuids_to_array(ovs_port->interfaces, items);
g_hash_table_insert(priv->ports, g_strdup(key), ovs_port); g_hash_table_add(priv->ports, ovs_port);
if (old) { if (old) {
_LOGT("changed a port: %s%s%s", _LOGT("changed a port: %s%s%s",
ovs_port->name, ovs_port->name,
@@ -2001,6 +2003,7 @@ _free_port(gpointer data)
{ {
OpenvswitchPort *ovs_port = data; OpenvswitchPort *ovs_port = data;
g_free(ovs_port->port_uuid);
g_free(ovs_port->name); g_free(ovs_port->name);
g_free(ovs_port->connection_uuid); g_free(ovs_port->connection_uuid);
g_ptr_array_free(ovs_port->interfaces, TRUE); g_ptr_array_free(ovs_port->interfaces, TRUE);
@@ -2028,7 +2031,7 @@ nm_ovsdb_init(NMOvsdb *self)
priv->input = g_string_new(NULL); priv->input = g_string_new(NULL);
priv->output = g_string_new(NULL); priv->output = g_string_new(NULL);
priv->bridges = g_hash_table_new_full(nm_pstr_hash, nm_pstr_equal, _free_bridge, NULL); priv->bridges = g_hash_table_new_full(nm_pstr_hash, nm_pstr_equal, _free_bridge, NULL);
priv->ports = g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, _free_port); priv->ports = g_hash_table_new_full(nm_pstr_hash, nm_pstr_equal, _free_port, NULL);
priv->interfaces = g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, _free_interface); priv->interfaces = g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, _free_interface);
ovsdb_try_connect(self); ovsdb_try_connect(self);