Since /sys is unavailable in build environments, the list of available TCP network interfaces cannot be obtained via /sys/class/net. This patch provides alternative code that uses the SIOCGIFCONF ioctl to get the names of the available TCP network interfaces. diff --git a/src/uct/tcp/tcp_iface.c b/src/uct/tcp/tcp_iface.c index cad4a2709..7c1d2c9de 100644 --- a/src/uct/tcp/tcp_iface.c +++ b/src/uct/tcp/tcp_iface.c @@ -17,6 +17,8 @@ #include #include #include +#include +#include extern ucs_class_t UCS_CLASS_DECL_NAME(uct_tcp_iface_t); @@ -586,6 +588,68 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h, uct_worker_h, const uct_iface_params_t*, const uct_iface_config_t*); +/* Fetch information about available network devices through an ioctl. */ +static ucs_status_t query_devices_ioctl(uct_md_h md, + uct_tl_device_resource_t **tl_devices_p, + unsigned *num_tl_devices_p) +{ + int sock, err, i; + uct_tl_device_resource_t *resources, *tmp; + unsigned num_resources; + ucs_status_t status; + struct ifconf conf; + struct ifreq reqs[10]; + + conf.ifc_len = sizeof reqs; + conf.ifc_req = reqs; + + sock = socket(SOCK_STREAM, AF_INET, 0); + if (sock < 0) { + ucs_error("socket(2) failed: %m"); + status = UCS_ERR_IO_ERROR; + goto out; + } + + err = ioctl(sock, SIOCGIFCONF, &conf); + if (err < 0) { + ucs_error("SIOCGIFCONF ioctl failed: %m"); + status = UCS_ERR_IO_ERROR; + goto out; + } + + resources = NULL; + num_resources = 0; + for (i = 0; i < conf.ifc_len / sizeof(struct ifreq); i++) { + const char *name = reqs[i].ifr_name; + + if (!ucs_netif_is_active(name)) { + continue; + } + + tmp = ucs_realloc(resources, sizeof(*resources) * (num_resources + 1), + "tcp resources"); + if (tmp == NULL) { + ucs_free(resources); + status = UCS_ERR_NO_MEMORY; + goto out; + } + resources = tmp; + + ucs_snprintf_zero(resources[i].name, sizeof(resources[i].name), + "%s", name); + resources[i].type = UCT_DEVICE_TYPE_NET; + ++num_resources; + } + + *num_tl_devices_p = num_resources; + *tl_devices_p = resources; + status = UCS_OK; + +out: + if (sock >= 0) close(sock); + return status; +} + ucs_status_t uct_tcp_query_devices(uct_md_h md, uct_tl_device_resource_t **devices_p, unsigned *num_devices_p) @@ -599,9 +663,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, dir = opendir(netdev_dir); if (dir == NULL) { - ucs_error("opendir(%s) failed: %m", netdev_dir); - status = UCS_ERR_IO_ERROR; - goto out; + /* When /sys is unavailable, as can be the case in a container, + * resort to a good old 'ioctl'. */ + return query_devices_ioctl(md, devices_p, num_devices_p); } devices = NULL; @@ -655,7 +719,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, out_closedir: closedir(dir); -out: return status; } Likewise. * gnu/packages/databases.scm (sqlitebrowser)[inputs]: Adjust comment. * gnu/packages/games.scm (openrct2)[inputs]: Use nlohmann-json. * gnu/packages/graphics.scm (f3d)[native-inputs]: Likewise. * gnu/packages/hardware.scm (openrgb)[inputs]: Likewise. [arguments]: Adjust accordingly. * gnu/packages/image-processing.scm (paraview)[inputs]: Adjust comment. * gnu/packages/irods.scm (irods, irods-client-icommands)[inputs]: Use nlohmann-json. * gnu/packages/jupyter.scm (xeus)[inputs]: Likewise. * gnu/packages/messaging.scm (mtxclient, nheko)[inputs]: Likewise. * gnu/packages/text-editors.scm (jucipp)[inputs]: Likewise. * gnu/packages/video.scm (mktoolnix)[inputs]: Likewise. * gnu/packages/xdisorg.scm (nwg-launchers)[inputs]: Likewise. Liliana Marie Prikler 2022-05-22gnu: ropgadget: Use HTTPS home page....* gnu/packages/cybersecurity.scm (ropgadget)[home-page]: Use HTTPS. Tobias Geerinckx-Rice 2022-01-14gnu: Add blacksmith....* gnu/packages/cybersecurity.scm (blacksmith): New variable. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr> Raghav Gururajan via Guix-patches via 2021-12-13gnu: Simplify package inputs....This commit was obtained by running: ./pre-inst-env guix style without any additional argument. Ludovic Courtès 2021-10-06gnu: ropgadget: Update to 6.6....* gnu/packages/cybersecurity.scm (ropgadget): Update to 6.6. Tobias Geerinckx-Rice 2021-06-06gnu: Add pwntools....* gnu/packages/cybersecurity.scm (pwntools): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> c4droid 2021-02-15gnu: ropgadget: Update to 6.5....* gnu/packages/cybersecurity.scm (ropgadget): Update to 6.5. Tobias Geerinckx-Rice 2020-12-06gnu: ropgadget: Update to 6.4....* gnu/packages/cybersecurity.scm (ropgadget): Update to 6.4. Tobias Geerinckx-Rice 2020-06-02gnu: ropgadget: Update to 6.3....* gnu/packages/cybersecurity.scm (ropgadget): Update to 6.3. Tobias Geerinckx-Rice 2020-03-26gnu: Add ROPgadget....* gnu/packages/cybersecurity.scm: New file. (ropgadget): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Register the file. Jakub Kądziołka