security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

commond: Introduce FD2NUM to express conversion to number of fds. 

* common/sysutils.h (FD2NUM): New.
* agent/call-pinentry.c (watch_sock): Use FD2NUM.
* agent/gpg-agent.c (handle_connections): Likewise.
* dirmngr/dirmngr.c (handle_connections): Likewise.
* dirmngr/http.c (connect_with_timeout): Likewise.
* kbx/keyboxd.c (handle_connections): Likewise.
* scd/scdaemon.c (handle_connections): Likewise.
* tpm2d/tpm2daemon.c (handle_connections): Likewise.

--

GnuPG-bug-id: 6598
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-07-18 14:43:36 +09:00
parent 521ec40aea
commit ea1935252e
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/call-pinentry.c
View File

@ -1302,7 +1302,7 @@ watch_sock (void *arg)
FD_ZERO (&fdset); FD_ZERO (&fdset);
FD_SET (FD2INT (sock), &fdset); FD_SET (FD2INT (sock), &fdset);
err = npth_select (FD2INT (sock)+1, &fdset, NULL, NULL, &timeout); err = npth_select (FD2NUM (sock)+1, &fdset, NULL, NULL, &timeout);
if (err < 0) if (err < 0)
{ {

8
agent/gpg-agent.c
View File

@ -3070,24 +3070,24 @@ handle_connections (gnupg_fd_t listen_fd,
FD_ZERO (&fdset); FD_ZERO (&fdset);
FD_SET (FD2INT (listen_fd), &fdset); FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd); nfd = FD2NUM (listen_fd);
if (listen_fd_extra != GNUPG_INVALID_FD) if (listen_fd_extra != GNUPG_INVALID_FD)
{ {
FD_SET ( FD2INT(listen_fd_extra), &fdset); FD_SET ( FD2INT(listen_fd_extra), &fdset);
if (FD2INT (listen_fd_extra) > nfd) if (FD2INT (listen_fd_extra) > nfd)
nfd = FD2INT (listen_fd_extra); nfd = FD2NUM (listen_fd_extra);
} }
if (listen_fd_browser != GNUPG_INVALID_FD) if (listen_fd_browser != GNUPG_INVALID_FD)
{ {
FD_SET ( FD2INT(listen_fd_browser), &fdset); FD_SET ( FD2INT(listen_fd_browser), &fdset);
if (FD2INT (listen_fd_browser) > nfd) if (FD2INT (listen_fd_browser) > nfd)
nfd = FD2INT (listen_fd_browser); nfd = FD2NUM (listen_fd_browser);
} }
if (listen_fd_ssh != GNUPG_INVALID_FD) if (listen_fd_ssh != GNUPG_INVALID_FD)
{ {
FD_SET ( FD2INT(listen_fd_ssh), &fdset); FD_SET ( FD2INT(listen_fd_ssh), &fdset);
if (FD2INT (listen_fd_ssh) > nfd) if (FD2INT (listen_fd_ssh) > nfd)
nfd = FD2INT (listen_fd_ssh); nfd = FD2NUM (listen_fd_ssh);
} }
if (sock_inotify_fd != -1) if (sock_inotify_fd != -1)
{ {

2
common/sysutils.h
View File

@ -44,12 +44,14 @@ typedef void *gnupg_fd_t;
# define FD2INT(h) ((unsigned int)(h)) # define FD2INT(h) ((unsigned int)(h))
# endif # endif
#define FD_DBG(h) ((int)(intptr_t)(h)) #define FD_DBG(h) ((int)(intptr_t)(h))
#define FD2NUM(h) ((int)(intptr_t)(h))
#else #else
typedef int gnupg_fd_t; typedef int gnupg_fd_t;
#define GNUPG_INVALID_FD (-1) #define GNUPG_INVALID_FD (-1)
#define INT2FD(s) (s) #define INT2FD(s) (s)
#define FD2INT(h) (h) #define FD2INT(h) (h)
#define FD_DBG(h) (h) #define FD_DBG(h) (h)
#define FD2NUM(h) (h)
#endif #endif
#ifdef HAVE_STAT #ifdef HAVE_STAT

2
dirmngr/dirmngr.c
View File

@ -2377,7 +2377,7 @@ handle_connections (assuan_fd_t listen_fd)
to full second. */ to full second. */
FD_ZERO (&fdset); FD_ZERO (&fdset);
FD_SET (FD2INT (listen_fd), &fdset); FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd); nfd = FD2NUM (listen_fd);
if (my_inotify_fd != -1) if (my_inotify_fd != -1)
{ {
FD_SET (my_inotify_fd, &fdset); FD_SET (my_inotify_fd, &fdset);

2
dirmngr/http.c
View File

@ -2906,7 +2906,7 @@ connect_with_timeout (assuan_fd_t sock,
tval.tv_sec = timeout / 1000; tval.tv_sec = timeout / 1000;
tval.tv_usec = (timeout % 1000) * 1000; tval.tv_usec = (timeout % 1000) * 1000;
n = my_select (FD2INT(sock)+1, &rset, &wset, NULL, &tval); n = my_select (FD2NUM(sock)+1, &rset, &wset, NULL, &tval);
if (n < 0) if (n < 0)
{ {
err = gpg_err_make (default_errsource, gpg_err_code_from_syserror ()); err = gpg_err_make (default_errsource, gpg_err_code_from_syserror ());

2
kbx/keyboxd.c
View File

@ -1521,7 +1521,7 @@ handle_connections (gnupg_fd_t listen_fd)
FD_ZERO (&fdset); FD_ZERO (&fdset);
FD_SET (FD2INT (listen_fd), &fdset); FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd); nfd = FD2NUM (listen_fd);
if (sock_inotify_fd != -1) if (sock_inotify_fd != -1)
{ {
FD_SET (sock_inotify_fd, &fdset); FD_SET (sock_inotify_fd, &fdset);

2
scd/scdaemon.c
View File

@ -1313,7 +1313,7 @@ handle_connections (gnupg_fd_t listen_fd)
if (listen_fd != GNUPG_INVALID_FD) if (listen_fd != GNUPG_INVALID_FD)
{ {
FD_SET (FD2INT (listen_fd), &fdset); FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd); nfd = FD2NUM (listen_fd);
} }
for (;;) for (;;)

2
tpm2d/tpm2daemon.c
View File

@ -1154,7 +1154,7 @@ handle_connections (gnupg_fd_t listen_fd)
if (listen_fd != GNUPG_INVALID_FD) if (listen_fd != GNUPG_INVALID_FD)
{ {
FD_SET (FD2INT (listen_fd), &fdset); FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd); nfd = FD2NUM (listen_fd);
} }
for (;;) for (;;)