bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-07-26 04:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ubuntu Oneiric: OpenSSL w/o SSLv2, bsd/libutil.h, unused vars

Browse source
This commit is contained in:
Gerhard Rieger 2011-12-04 15:14:34 +01:00
parent 76291f6a67
commit 4c9898446d
16 changed files with 98 additions and 74 deletions

4
xio-socket.c
View file

@ -736,7 +736,6 @@ int _xioopen_connect(struct single *xfd, struct sockaddr *us, size_t uslen,
union sockaddr_union sin, *sinp;
unsigned short *port, i, N;
div_t dv;
bool problem;
/* prepare sockaddr for bind probing */
if (us) {
@ -784,7 +783,6 @@ int _xioopen_connect(struct single *xfd, struct sockaddr *us, size_t uslen,
}
dv = div(random(), IPPORT_RESERVED-XIO_IPPORT_LOWER);
i = N = XIO_IPPORT_LOWER + dv.rem;
problem = false;
do { /* loop over lowport bind() attempts */
*port = htons(i);
if (Bind(xfd->fd, (struct sockaddr *)sinp, sizeof(*sinp)) < 0) {
@ -1187,7 +1185,6 @@ int _xioopen_dgram_recvfrom(struct single *xfd, int xioflags,
struct opt *opts,
int pf, int socktype, int proto, int level) {
char *rangename;
socklen_t salen;
bool dofork = false;
pid_t pid; /* mostly int; only used with fork */
char infobuff[256];
@ -1312,7 +1309,6 @@ int _xioopen_dgram_recvfrom(struct single *xfd, int xioflags,
struct msghdr msgh = {0};
socket_init(pf, pa);
salen = sizeof(struct sockaddr);
if (drop) {
char *dummy[2];