Hi! > +int safe_bind(const char *file, const int lineno, void (cleanup_fn)(void), > + int socket, const struct sockaddr *address, > + socklen_t address_len) > +{ > + int err, ret, i; > + > + for (i = 0; i < 30; i++) { > + ret = bind(socket, address, address_len); > + err = errno; > + > + if (!ret) > + return 0; > + > + if (err != EADDRINUSE) { > + tst_brkm(TBROK | TERRNO, cleanup_fn, > + "%s:%d: bind(%d, %p, %d) failed", file, lineno, > + socket, address, address_len);
I think that it would be a bit nicer if we created a helper to translate the socket structure to it's string representation (and use it whenever we deal with struct sockaddr passed from user). We would have to switch on sa_family and then print either ip address or path (for unix sockets), etc. But that would get us bind(8, '127.0.0.1:1024', ...) failed instead of the raw pointer to the structure which is kind of useless. > + } > + > + tst_resm(TINFO, "bind('%p') failed with %s, try %2i...", > + address, tst_strerrno(err), i+1); Hmm, why do we do tst_strerno(err) here when the only value for errno can be EADDRINUSE (since we exit with tst_brkm() otherwise) Why not just hardcode EADDRINUSE to the message? > + if (i == 0 && err == EADDRINUSE) > + tst_resm(TINFO, "The given address is already in use."); This message is not really useful because we allready printed that bind failed with EADDRINUSE with the tst_resm above. > + usleep(1000000); We can use sleep(1) instead now. > + } > + > + tst_brkm(TBROK | TERRNO, cleanup_fn, > + "%s:%d: Failed to bind(%d, %p, %d) after 30 retries", > + file, lineno, socket, address, address_len); > +} > + > +int safe_listen(const char *file, const int lineno, void (cleanup_fn)(void), > + int socket, int backlog) > +{ > + int rval; > + > + rval = listen(socket, backlog); > + > + if (rval < 0) { > + tst_brkm(TBROK | TERRNO, cleanup_fn, > + "%s:%d: listen(%d, %d) failed", file, lineno, socket, > + backlog); > + } > + > + return rval; > +} > + > +int safe_connect(const char *file, const int lineno, void (cleanup_fn)(void), > + int sockfd, const struct sockaddr *addr, socklen_t addrlen) > +{ > + int rval; > + > + rval = connect(sockfd, addr, addrlen); > + > + if (rval < 0) { > + tst_brkm(TBROK | TERRNO, cleanup_fn, > + "%s:%d: connect(%d, %p, %d) failed", file, lineno, > + sockfd, addr, addrlen); > + } > + > + return rval; > +} > + > +int safe_getsockname(const char *file, const int lineno, > + void (cleanup_fn)(void), int sockfd, struct sockaddr *addr, > + socklen_t *addrlen) > +{ > + int rval; > + > + rval = getsockname(sockfd, addr, addrlen); > + > + if (rval < 0) { > + tst_brkm(TBROK | TERRNO, cleanup_fn, > + "%s:%d: getsockname(%d, %p, %p) failed", file, lineno, > + sockfd, addr, addrlen); > + } > + > + return rval; > +} -- Cyril Hrubis chru...@suse.cz ------------------------------------------------------------------------------ _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list