Message ID | 20201221131233.190544-1-mark.d.gray@redhat.com |
---|---|
State | Changes Requested |
Headers | show |
Series | [ovs-dev] ovs-monitor-ipsec: Suppress "unknown %d argument" warning | expand |
On 21 Dec 2020, at 14:12, Mark Gray wrote: > As 'ovs-vswitchd' does not understand IPsec tunnel options, it > gives a warning message. This can be safely suppressed. > > Signed-off-by: Mark Gray <mark.d.gray@redhat.com> Reviewed and tested. Acked-by: Eelco Chaudron <echaudro@redhat.com>
On Mon, Dec 21, 2020 at 08:12:33AM -0500, Mark Gray wrote: > As 'ovs-vswitchd' does not understand IPsec tunnel options, it > gives a warning message. This can be safely suppressed. > > Signed-off-by: Mark Gray <mark.d.gray@redhat.com> > --- Acked-by: Flavio Leitner <fbl@sysclose.org>
On 23 Dec 2020, at 16:29, Eelco Chaudron wrote: > On 21 Dec 2020, at 14:12, Mark Gray wrote: > >> As 'ovs-vswitchd' does not understand IPsec tunnel options, it >> gives a warning message. This can be safely suppressed. >> >> Signed-off-by: Mark Gray <mark.d.gray@redhat.com> > > Reviewed and tested. > > Acked-by: Eelco Chaudron <echaudro@redhat.com> I forgot to mention it has a merge conflict due to the bareudp addition, but I guess Ilya can handle this ;)
On 24/12/2020 08:19, Eelco Chaudron wrote: > > > On 23 Dec 2020, at 16:29, Eelco Chaudron wrote: > >> On 21 Dec 2020, at 14:12, Mark Gray wrote: >> >>> As 'ovs-vswitchd' does not understand IPsec tunnel options, it >>> gives a warning message. This can be safely suppressed. >>> >>> Signed-off-by: Mark Gray <mark.d.gray@redhat.com> >> >> Reviewed and tested. >> >> Acked-by: Eelco Chaudron <echaudro@redhat.com> > > I forgot to mention it has a merge conflict due to the bareudp addition, > but I guess Ilya can handle this ;) > I'll rebase it to make his life easier!
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 0252b61dea2b..7c99f790dfc2 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -745,6 +745,14 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args, char **errp) goto out; } } + } else if (!strcmp(node->key, "remote_cert") || + !strcmp(node->key, "remote_name") || + !strcmp(node->key, "psk")) { + /* When configuring OVS for IPsec, these keys may be set in the + tunnel port's 'options' column. 'ovs-vswitchd' does not directly + use them, but they are read by 'ovs-monitor-ipsec'. In order to + suppress the "unknown %s argument" warning message below, we + handle them here by ignoring them. */ } else { ds_put_format(&errors, "%s: unknown %s argument '%s'\n", name, type, node->key);
As 'ovs-vswitchd' does not understand IPsec tunnel options, it gives a warning message. This can be safely suppressed. Signed-off-by: Mark Gray <mark.d.gray@redhat.com> --- lib/netdev-vport.c | 8 ++++++++ 1 file changed, 8 insertions(+)