Hi, ACK, this can go into 2.3 - dead code removal.
gert On Fri, Nov 30, 2012 at 08:17:47PM +0100, Arne Schwabe wrote: > --- > src/openvpn/socket.c | 2 +- > src/openvpn/socket.h | 5 ----- > 2 files changed, 1 insertion(+), 6 deletions(-) > > diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c > index 505cf3b..21a4b2b 100644 > --- a/src/openvpn/socket.c > +++ b/src/openvpn/socket.c > @@ -158,7 +158,7 @@ openvpn_getaddrinfo (unsigned int flags, > CLEAR(hints); > hints.ai_family = ai_family; > hints.ai_flags = AI_NUMERICHOST; > - hints.ai_socktype = dnsflags_to_socktype(flags); > + hints.ai_socktype = SOCK_STREAM; > > status = getaddrinfo(hostname, NULL, &hints, res); > > diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h > index 44f1098..9cb01fa 100644 > --- a/src/openvpn/socket.h > +++ b/src/openvpn/socket.h > @@ -478,11 +478,6 @@ bool unix_socket_get_peer_uid_gid (const > socket_descriptor_t sd, int *uid, int * > #define GETADDR_UPDATE_MANAGEMENT_STATE (1<<8) > #define GETADDR_RANDOMIZE (1<<9) > > -/* [ab]use flags bits to get socktype info downstream */ > -/* TODO(jjo): resolve tradeoff between hackiness|args-overhead */ > -#define GETADDR_DGRAM (1<<10) > -#define dnsflags_to_socktype(flags) ((flags & GETADDR_DGRAM) ? SOCK_DGRAM : > SOCK_STREAM) > - > in_addr_t getaddr (unsigned int flags, > const char *hostname, > int resolve_retry_seconds, > -- > 1.7.9.5 > > > ------------------------------------------------------------------------------ > Keep yourself connected to Go Parallel: > TUNE You got it built. Now make it sing. Tune shows you how. > http://goparallel.sourceforge.net > _______________________________________________ > Openvpn-devel mailing list > Openvpn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openvpn-devel > -- USENET is *not* the non-clickable part of WWW! //www.muc.de/~gert/ Gert Doering - Munich, Germany g...@greenie.muc.de fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
pgp99SQTXYlK_.pgp
Description: PGP signature
