Hi,
On Thu, Apr 01, 2021 at 03:13:36PM +0200, Arne Schwabe wrote:
> if (extended_msg)
> {
> - msg(x_cs_info_level, "%s %s [%s]: %s (code=%d)", description,
> + msg(x_cs_info_level, "%s %s [%s]: %s (fd=%d,code=%d)",
> description,
> sock ? proto2ascii(sock->info.proto, sock->info.af,
> true) : "",
> - extended_msg, strerror(my_errno), my_errno);
> + extended_msg, strerror(my_errno), my_errno, sock ?
> sock->sd : -1);
I'm not sure if I'm misreading this, but "fd=%d" is added before "code=%d",
but the "sock->fd" thingie is added at the end.
So I tentatively NAK this.
> --- a/src/openvpn/event.c
> +++ b/src/openvpn/event.c
> @@ -555,7 +555,10 @@ ep_del(struct event_set *es, event_t event)
>
> ASSERT(!eps->fast);
> CLEAR(ev);
> - epoll_ctl(eps->epfd, EPOLL_CTL_DEL, event, &ev);
> + if (epoll_ctl(eps->epfd, EPOLL_CTL_DEL, event, &ev) < 0)
> + {
> + msg(M_WARN|M_ERRNO, "EVENT: epoll_ctl EPOLL_CTL_DEL failed, sd=%d",
> (int)event);
> + }
> }
The rest of the patch looks reasonable.
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
