search for: upsconn

tags 439986 upstream thanks Hi Florian, 2007/8/29, Florian Forster <octo at verplant.org>: > Package: nut-dev > Version: 2.2.0-1 > Severity: minor > > After upgrading from version 2.0.something to version 2.2.0-1 the type > `UPSCONN' had been renamed to `UPSCONN_t'. This is a problem for > software that is supposed to work with different versions of this > library - especially since it's not possible to determine the version > from within the preprocessor. > > The arguably best solution would be to a...

...ginal) > +++ trunk/clients/upsclient.h Thu Jan 18 22:07:08 2007 > @@ -78,6 +78,8 @@ > int upscli_splitname(const char *buf, char **upsname, char **hostname, > int *port); > > +int upscli_splitaddr(const char *buf, char **hostname, int *port); > + > int upscli_sslcert(UPSCONN *ups, const char *file, const char *path, int verify); > > int upscli_disconnect(UPSCONN *ups); > > _______________________________________________ > nut-commits mailing list > nut-commits@lists.alioth.debian.org > http://lists.alioth.debian.org/mailman/listinfo/nut-commits...

...Errorcodes are passed in 'ups->upserror' (and 'ups->syserrno'). Uh oh, we don't have a connection to an UPS yet when we call upscli_splitname() or upscli_splitaddr(). The upscli_strerror() function that is used to return the message in upscli_errlist[] needs a pointer to a UPSCONN structure also. The upscli_errlist[] is static, so there is no way to get to the messages without calling upscli_strerror(). The reality is, that this is how it has been for a *very* long time, I didn't invent this. The oldest version in SVN I could find (revision 2) uses fprintf(stderr, ...)...

...Jan 6 19:39:08 2007 > @@ -38,9 +38,6 @@ > #define shutdown_how 2 > #endif > > -/* From IPv6 patch (doesn't seem to be used) > -extern int opt_af; > - */ > struct { > int flags; > const char *str; > @@ -424,8 +421,13 @@ > > int upscli_connect(UPSCONN *ups, const char *host, int port, int flags) > { > +#ifndef HAVE_IPV6 > + struct sockaddr_in local, server; > + struct hostent *serv; > +#else > struct addrinfo hints, *r, *rtmp; > char *service; > +#endif > > /* clear out any lingering junk */ > ups->...

...i Jan 5 21:06:59 2007 > @@ -38,6 +38,9 @@ > #define shutdown_how 2 > #endif > > +/* From IPv6 patch (doesn't seem to be used) > +extern int opt_af; > + */ > struct { > int flags; > const char *str; > @@ -421,8 +424,8 @@ > > int upscli_connect(UPSCONN *ups, const char *host, int port, int flags) > { > - struct sockaddr_in local, server; > - struct hostent *serv; > + struct addrinfo hints, *r, *rtmp; > + char *service; > > /* clear out any lingering junk */ > ups->fd = -1; > @@ -449,78 +452,86 @@ > retur...

...t; #include <unistd.h> > #include <sys/socket.h> > #include <netinet/in.h> > +#include <arpa/inet.h> > > #include "upsclient.h" > > @@ -418,15 +419,15 @@ > } > > #endif /* HAVE_SSL */ > - > + > int upscli_connect(UPSCONN *ups, const char *host, int port, int flags) > { > #ifndef HAVE_IPV6 > - struct sockaddr_in local, server; > - struct hostent *serv; > + struct sockaddr_in local, server; > + struct hostent *serv; > #else > - struct addrinfo hints, *r, *rtmp; > - char *service; > +...