[vlc-commits] smb2: use smb2_get_fds
vlc/vlc-3.0 | branch: master | Thomas Guillem | Tue Mar 2
15:44:24 2021 +0100| [e44f69983a408df2bbc7d614f7ffe912e644c6b6] | committer:
Thomas Guillem
smb2: use smb2_get_fds
This API allow to connect to all resolved addresses and ports in
parallel, waiting 100ms between each new connection.
This resolves very long timeout or error when the host has more then one
IPs but is listening on only one.
(cherry picked from commit cfa75e38a0715ce158d5d7f9f831cd1e4b780713)
Signed-off-by: Thomas Guillem
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e44f69983a408df2bbc7d614f7ffe912e644c6b6
---
modules/access/smb2.c | 38 +-
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/modules/access/smb2.c b/modules/access/smb2.c
index f8141f515c..ed2b7c9b99 100644
--- a/modules/access/smb2.c
+++ b/modules/access/smb2.c
@@ -161,12 +161,21 @@ vlc_smb2_mainloop(stream_t *access, bool teardown)
sys->res_done = false;
while (sys->error_status == 0 && !sys->res_done)
{
-struct pollfd p_fds[1];
-int ret;
-p_fds[0].fd = smb2_get_fd(sys->smb2);
-p_fds[0].events = smb2_which_events(sys->smb2);
+int ret, smb2_timeout;
+size_t fd_count;
+const t_socket *fds = smb2_get_fds(sys->smb2, _count,
_timeout);
+int events = smb2_which_events(sys->smb2);
-if (p_fds[0].fd == -1 || (ret = poll_func(p_fds, 1, timeout)) < 0)
+struct pollfd p_fds[fd_count];
+for (size_t i = 0; i < fd_count; ++i)
+{
+p_fds[i].events = events;
+p_fds[i].fd = fds[i];
+}
+if (smb2_timeout != -1)
+timeout = smb2_timeout;
+
+if (fds == NULL || (ret = poll_func(p_fds, fd_count, timeout)) < 0)
{
if (errno == EINTR)
{
@@ -189,10 +198,21 @@ vlc_smb2_mainloop(stream_t *access, bool teardown)
}
}
else if (ret == 0)
-sys->error_status = -ETIMEDOUT;
-else if (ret > 0 && p_fds[0].revents
- && smb2_service(sys->smb2, p_fds[0].revents) < 0)
-VLC_SMB2_SET_ERROR(access, "smb2_service", 1);
+{
+if (teardown)
+sys->error_status = -ETIMEDOUT;
+else if (smb2_service_fd(sys->smb2, -1, 0) < 0)
+VLC_SMB2_SET_ERROR(access, "smb2_service", 1);
+}
+else
+{
+for (size_t i = 0; i < fd_count; ++i)
+{
+if (p_fds[i].revents
+ && smb2_service_fd(sys->smb2, p_fds[i].fd, p_fds[i].revents)
< 0)
+VLC_SMB2_SET_ERROR(access, "smb2_service", 1);
+}
+}
}
int ret = sys->error_status == 0 ? 0 : -1;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] smb2: use smb2_get_fds
vlc | branch: master | Thomas Guillem | Tue Mar 2 15:44:24
2021 +0100| [cfa75e38a0715ce158d5d7f9f831cd1e4b780713] | committer: Thomas
Guillem
smb2: use smb2_get_fds
This API allow to connect to all resolved addresses and ports in
parallel, waiting 100ms between each new connection.
This resolves very long timeout or error when the host has more then one
IPs but is listening on only one.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cfa75e38a0715ce158d5d7f9f831cd1e4b780713
---
modules/access/smb2.c | 38 +-
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/modules/access/smb2.c b/modules/access/smb2.c
index aacd0b63a8..d45a573e8a 100644
--- a/modules/access/smb2.c
+++ b/modules/access/smb2.c
@@ -162,12 +162,21 @@ vlc_smb2_mainloop(stream_t *access, bool teardown)
sys->res_done = false;
while (sys->error_status == 0 && !sys->res_done)
{
-struct pollfd p_fds[1];
-int ret;
-p_fds[0].fd = smb2_get_fd(sys->smb2);
-p_fds[0].events = smb2_which_events(sys->smb2);
+int ret, smb2_timeout;
+size_t fd_count;
+const t_socket *fds = smb2_get_fds(sys->smb2, _count,
_timeout);
+int events = smb2_which_events(sys->smb2);
-if (p_fds[0].fd == -1 || (ret = poll_func(p_fds, 1, timeout)) < 0)
+struct pollfd p_fds[fd_count];
+for (size_t i = 0; i < fd_count; ++i)
+{
+p_fds[i].events = events;
+p_fds[i].fd = fds[i];
+}
+if (smb2_timeout != -1)
+timeout = smb2_timeout;
+
+if (fds == NULL || (ret = poll_func(p_fds, fd_count, timeout)) < 0)
{
if (errno == EINTR)
{
@@ -190,10 +199,21 @@ vlc_smb2_mainloop(stream_t *access, bool teardown)
}
}
else if (ret == 0)
-sys->error_status = -ETIMEDOUT;
-else if (ret > 0 && p_fds[0].revents
- && smb2_service(sys->smb2, p_fds[0].revents) < 0)
-VLC_SMB2_SET_ERROR(access, "smb2_service", 1);
+{
+if (teardown)
+sys->error_status = -ETIMEDOUT;
+else if (smb2_service_fd(sys->smb2, -1, 0) < 0)
+VLC_SMB2_SET_ERROR(access, "smb2_service", 1);
+}
+else
+{
+for (size_t i = 0; i < fd_count; ++i)
+{
+if (p_fds[i].revents
+ && smb2_service_fd(sys->smb2, p_fds[i].fd, p_fds[i].revents)
< 0)
+VLC_SMB2_SET_ERROR(access, "smb2_service", 1);
+}
+}
}
int ret = sys->error_status == 0 ? 0 : -1;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
