September 2015 - libteam - Fedora Mailing-Lists

[jpirko/libteam] fc7cb7: teamd: fix cut&paste issue on delay_up

by GitHub

Branch: refs/heads/master Home: https://github.com/jpirko/libteam Commit: fc7cb7cd00d7ef51defa77537c05b77fd921ba7b https://github.com/jpirko/libteam/commit/fc7cb7cd00d7ef51defa77537c05b77f... Author: Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com> Date: 2015-09-11 (Fri, 11 Sep 2015) Changed paths: M teamd/teamd_lw_ethtool.c Log Message: ----------- teamd: fix cut&paste issue on delay_up While migrating to the new config system, something happened and delay_up variable got renamed to queue_id, which then persisted through a code move. Fixes: b171e6fa41f6 ("teamd: lw: convert to use teamd config getters") Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>

8 years, 7 months

1
0
0 / 0

[patch libteam] teamd: fix cut&paste issue on delay_up

by Marcelo Ricardo Leitner

While migrating to the new config system, something happened and delay_up variable got renamed to queue_id, which then persisted through a code move. Fixes: b171e6fa41f6 ("teamd: lw: convert to use teamd config getters") Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com> --- teamd/teamd_lw_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teamd/teamd_lw_ethtool.c b/teamd/teamd_lw_ethtool.c index 8502109e0647..2010136a4c05 100644 --- a/teamd/teamd_lw_ethtool.c +++ b/teamd/teamd_lw_ethtool.c @@ -109,7 +109,7 @@ static int lw_ethtool_load_options(struct teamd_context *ctx, int err; int tmp; - err = teamd_config_int_get(ctx, &tmp, "@.queue_id", cpcookie); + err = teamd_config_int_get(ctx, &tmp, "@.delay_up", cpcookie); if (!err) { if (tmp < 0) { teamd_log_err("\"delay_up\" must not be negative number."); -- 2.4.3

8 years, 7 months

3
2
0 / 0

[jpirko/libteam] 4a3e2e: Reduce usock file permissions to 700.

by GitHub

Branch: refs/heads/master Home: https://github.com/jpirko/libteam Commit: 4a3e2e381f71e69cbd41156b482910d4c841befb https://github.com/jpirko/libteam/commit/4a3e2e381f71e69cbd41156b482910d4... Author: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M teamd/teamd_usock.c Log Message: ----------- Reduce usock file permissions to 700. No need to expose +rx permissions for group and others, since only owner (root) is supposed to be able to connect. According to unix(7) manpage +w is needed to connect to a unix socket. Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> Commit: 83bf03d7a06a511fbd852b63c3954b38ef07ccd2 https://github.com/jpirko/libteam/commit/83bf03d7a06a511fbd852b63c3954b38... Author: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M .gitignore Log Message: ----------- Add stamp-h1 artifact to .gitignore Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us> Compare: https://github.com/jpirko/libteam/compare/fc98d32866a1...83bf03d7a06a

8 years, 7 months

1
0
0 / 0

[PATCH] Add stamp-h1 artifact to .gitignore

by Pawel Wieczorkiewicz

Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 70c1563..9387fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ Makefile.in /config.* /configure /libtool + +stamp-h1 -- 2.1.4

8 years, 7 months

2
1
0 / 0

[PATCH] Reduce usock file permissions to 700.

by Pawel Wieczorkiewicz

No need to expose +rx permissions for group and others, since only owner (root) is supposed to be able to connect. According to unix(7) manpage +w is needed to connect to a unix socket. Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> --- teamd/teamd_usock.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/teamd/teamd_usock.c b/teamd/teamd_usock.c index 1fd3b66..967f68c 100644 --- a/teamd/teamd_usock.c +++ b/teamd/teamd_usock.c @@ -308,6 +308,13 @@ static int teamd_usock_sock_open(struct teamd_context *ctx) return -errno; } + err = fchmod(sock, 0700); + if (err == -1) { + teamd_log_err("usock: Failed to change socket permissions."); + err = -errno; + goto close_sock; + } + addr.sun_family = AF_UNIX; teamd_usock_get_sockpath(addr.sun_path, sizeof(addr.sun_path), ctx->team_devname); -- 2.1.4

8 years, 7 months

2
1
0 / 0

[jpirko/libteam] fc98d3: Do not fail teamd_add_ports() when one port is mis...

by GitHub

Branch: refs/heads/master Home: https://github.com/jpirko/libteam Commit: fc98d32866a119baf93194c3b5bd42101996c04a https://github.com/jpirko/libteam/commit/fc98d32866a119baf93194c3b5bd4210... Author: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M teamd/teamd.c M teamd/teamd_ctl.c M teamd/teamd_per_port.c Log Message: ----------- Do not fail teamd_add_ports() when one port is missing When multiple ports are specified in the config and one of them is not present (e.g. usb2eth device) during team instance start up time, instead of failing the whole setup, just report failure with a missing port and carry on with the rest. Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>

8 years, 7 months

1
0
0 / 0

[PATCH] Do not fail teamd_add_ports() when one port is missing

by Pawel Wieczorkiewicz

When multiple ports are specified in the config and one of them is not present (e.g. usb2eth device) during team instance start up time, instead of failing the whole setup, just report failure with a missing port and carry on with the rest. Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> --- teamd/teamd.c | 9 ++++++++- teamd/teamd_ctl.c | 5 +++++ teamd/teamd_per_port.c | 6 +----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/teamd/teamd.c b/teamd/teamd.c index a7c0f77..0cb5e7e 100644 --- a/teamd/teamd.c +++ b/teamd/teamd.c @@ -846,8 +846,15 @@ static int teamd_add_ports(struct teamd_context *ctx) teamd_config_for_each_key(key, ctx, "$.ports") { err = teamd_port_add_ifname(ctx, key); - if (err) + if (err == -ENODEV) { + teamd_log_warn("%s: Skipped adding a missing port.", key); + continue; + } + else if (err) { + teamd_log_err("%s: Failed to add port (%s).", key, + strerror(-err)); return err; + } } return 0; } diff --git a/teamd/teamd_ctl.c b/teamd/teamd_ctl.c index 9d57f22..b30b273 100644 --- a/teamd/teamd_ctl.c +++ b/teamd/teamd_ctl.c @@ -102,6 +102,11 @@ static int teamd_ctl_method_port_add(struct teamd_context *ctx, teamd_log_dbgx(ctx, 2, "port_devname \"%s\"", port_devname); err = teamd_port_add_ifname(ctx, port_devname); + if (err) { + teamd_log_err("%s: Failed to add port (%s).", port_devname, + strerror(-err)); + } + switch (err) { case -ENODEV: return ops->reply_err(ops_priv, "NoSuchDev", "No such device."); diff --git a/teamd/teamd_per_port.c b/teamd/teamd_per_port.c index 0e62091..09d1dc7 100644 --- a/teamd/teamd_per_port.c +++ b/teamd/teamd_per_port.c @@ -333,16 +333,12 @@ next_one: int teamd_port_add_ifname(struct teamd_context *ctx, const char *port_name) { - int err; uint32_t ifindex; ifindex = team_ifname2ifindex(ctx->th, port_name); teamd_log_dbg("%s: Adding port (found ifindex \"%d\").", port_name, ifindex); - err = team_port_add(ctx->th, ifindex); - if (err) - teamd_log_err("%s: Failed to add port.", port_name); - return err; + return team_port_add(ctx->th, ifindex); } static int teamd_port_remove(struct teamd_context *ctx, -- 2.1.4

8 years, 7 months

2
1
0 / 0

[PATCH] Do not fail teamd_add_ports() when one port is missing

by Pawel Wieczorkiewicz

When multiple ports are specified in the config and one of them is not present (e.g. usb2eth device) during team instance start up time, instead of failing the whole setup, just report failure with a missing port and carry on with the rest. Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> --- stamp-h1 | 1 + teamd/teamd.c | 9 ++++++++- teamd/teamd_ctl.c | 5 +++++ teamd/teamd_per_port.c | 6 +----- 4 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 stamp-h1 diff --git a/stamp-h1 b/stamp-h1 new file mode 100644 index 0000000..4547fe1 --- /dev/null +++ b/stamp-h1 @@ -0,0 +1 @@ +timestamp for config.h diff --git a/teamd/teamd.c b/teamd/teamd.c index a7c0f77..0cb5e7e 100644 --- a/teamd/teamd.c +++ b/teamd/teamd.c @@ -846,8 +846,15 @@ static int teamd_add_ports(struct teamd_context *ctx) teamd_config_for_each_key(key, ctx, "$.ports") { err = teamd_port_add_ifname(ctx, key); - if (err) + if (err == -ENODEV) { + teamd_log_warn("%s: Skipped adding a missing port.", key); + continue; + } + else if (err) { + teamd_log_err("%s: Failed to add port (%s).", key, + strerror(-err)); return err; + } } return 0; } diff --git a/teamd/teamd_ctl.c b/teamd/teamd_ctl.c index 9d57f22..b30b273 100644 --- a/teamd/teamd_ctl.c +++ b/teamd/teamd_ctl.c @@ -102,6 +102,11 @@ static int teamd_ctl_method_port_add(struct teamd_context *ctx, teamd_log_dbgx(ctx, 2, "port_devname \"%s\"", port_devname); err = teamd_port_add_ifname(ctx, port_devname); + if (err) { + teamd_log_err("%s: Failed to add port (%s).", port_devname, + strerror(-err)); + } + switch (err) { case -ENODEV: return ops->reply_err(ops_priv, "NoSuchDev", "No such device."); diff --git a/teamd/teamd_per_port.c b/teamd/teamd_per_port.c index 0e62091..09d1dc7 100644 --- a/teamd/teamd_per_port.c +++ b/teamd/teamd_per_port.c @@ -333,16 +333,12 @@ next_one: int teamd_port_add_ifname(struct teamd_context *ctx, const char *port_name) { - int err; uint32_t ifindex; ifindex = team_ifname2ifindex(ctx->th, port_name); teamd_log_dbg("%s: Adding port (found ifindex \"%d\").", port_name, ifindex); - err = team_port_add(ctx->th, ifindex); - if (err) - teamd_log_err("%s: Failed to add port.", port_name); - return err; + return team_port_add(ctx->th, ifindex); } static int teamd_port_remove(struct teamd_context *ctx, -- 2.1.4

8 years, 7 months

2
2
0 / 0

[PATCH] Add missing prototypes for admin_state functions

by Pawel Wieczorkiewicz

Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> --- include/team.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/team.h b/include/team.h index da98361..20ebcf6 100644 --- a/include/team.h +++ b/include/team.h @@ -138,6 +138,7 @@ struct team_ifinfo *team_get_next_ifinfo(struct team_handle *th, /* ifinfo getters */ bool team_is_ifinfo_removed(struct team_ifinfo *ifinfo); uint32_t team_get_ifinfo_ifindex(struct team_ifinfo *ifinfo); +bool team_get_ifinfo_admin_state(struct team_ifinfo *ifinfo); struct team_port *team_get_ifinfo_port(struct team_ifinfo *ifinfo); char *team_get_ifinfo_hwaddr(struct team_ifinfo *ifinfo); bool team_is_ifinfo_hwaddr_changed(struct team_ifinfo *ifinfo); @@ -149,6 +150,7 @@ char *team_get_ifinfo_ifname(struct team_ifinfo *ifinfo); bool team_is_ifinfo_ifname_changed(struct team_ifinfo *ifinfo); uint32_t team_get_ifinfo_master_ifindex(struct team_ifinfo *ifinfo); bool team_is_ifinfo_master_ifindex_changed(struct team_ifinfo *ifinfo); +bool team_is_ifinfo_admin_state_changed(struct team_ifinfo *ifinfo); char *team_get_ifinfo_phys_port_id(struct team_ifinfo *ifinfo); bool team_is_ifinfo_phys_port_id_changed(struct team_ifinfo *ifinfo); size_t team_get_ifinfo_phys_port_id_len(struct team_ifinfo *ifinfo); -- 2.1.4

8 years, 7 months

2
1
0 / 0

[jpirko/libteam] 8eb684: Add missing prototypes for admin_state functions

by GitHub

Branch: refs/heads/master Home: https://github.com/jpirko/libteam Commit: 8eb684c8ed338313fe53fa6588bde1d7654ff08a https://github.com/jpirko/libteam/commit/8eb684c8ed338313fe53fa6588bde1d7... Author: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> Date: 2015-09-09 (Wed, 09 Sep 2015) Changed paths: M include/team.h Log Message: ----------- Add missing prototypes for admin_state functions Signed-off-by: Pawel Wieczorkiewicz <pwieczorkiewicz(a)suse.de> Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>

8 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

libteam September 2015