sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Workaround lack of reentrant gethostbyname()

Browse source 
PR:		ports/60740
Submitted by:	maintainer
This commit is contained in:
Pav Lucistnik 2004-02-07 19:55:21 +00:00
parent 38e021570c
commit bcd2c14358
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=100279
2 changed files with 120 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ftp/prozilla/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= prozilla PORTNAME= prozilla
PORTVERSION= 1.3.6 PORTVERSION= 1.3.6
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= ftp CATEGORIES= ftp
MASTER_SITES= http://prozilla.genesys.ro/downloads/prozilla/tarballs/ MASTER_SITES= http://prozilla.genesys.ro/downloads/prozilla/tarballs/

136
ftp/prozilla/files/patch-connect.c
View file

@ -1,6 +1,10 @@
--- src/connect.c.orig Fri Aug 17 20:38:25 2001 --- src/connect.c.ori Fri Aug 17 20:38:25 2001
+++ src/connect.c Sat Jan 25 19:38:06 2003 +++ src/connect.c Sat Feb 7 02:11:10 2004
@@ -27,6 +27,7 @@ @@ -24,9 +24,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <fcntl.h> #include <fcntl.h>
#include <netdb.h> #include <netdb.h>
@ -8,22 +12,120 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netdb.h> #include <netdb.h>
@@ -341,6 +342,8 @@ @@ -42,51 +44,58 @@
struct hostent *hp; #include "runtime.h"
int herr,res; #include "debug.h"
+#ifndef __FreeBSD__ +static pthread_mutex_t __thread_safe_lock = PTHREAD_MUTEX_INITIALIZER;
+ +
if (*hstbuflen == 0) uerr_t connect_to_server(int *sock, char *name, int port, int timeout)
{ {
*hstbuflen = 2048; unsigned int portnum;
@@ -364,5 +367,9 @@ + char szPort[10];
} int status;
if (res) - struct sockaddr_in server;
return NULL; - struct hostent *hp, hostbuf;
+#else extern int h_errno;
+ hp = gethostbyname(host); /* int opt; */
+#endif int noblock, flags;
- char *tmphstbuf;
- size_t hstbuflen = 2048;
- tmphstbuf = kmalloc(hstbuflen);
+ struct addrinfo hints, *res=NULL;
+ struct addrinfo *res0=NULL;
+ int error;
+ +
return hp; + memset(&hints, 0, sizeof(hints));
+ memset(szPort, 0, sizeof(szPort));
+ sprintf(szPort, "%d", port);
+ hints.ai_family = AF_INET;
+ hints.ai_socktype = SOCK_STREAM;
assert(name != NULL);
- portnum = port;
- memset((void *) &server, 0, sizeof(server));
-
message("Resolving %s", name);
- hp=k_gethostname (name,&hostbuf,&tmphstbuf,&hstbuflen);
-
- if (hp == NULL)
- {
- message("Failed to resolve %s", name);
- return HOSTERR;
- }
+ pthread_mutex_lock(&__thread_safe_lock);
- message("Resolved %s !", name);
-
-
- memcpy((void *) &server.sin_addr, hp->h_addr, hp->h_length);
- server.sin_family = hp->h_addrtype;
- server.sin_port = htons(portnum);
+ error = getaddrinfo(name, szPort, &hints, &res);
+ if (error) {
+ message("Failed to resolve %s", name);
+ pthread_mutex_unlock(&__thread_safe_lock);
+ freeaddrinfo(res);
+ return HOSTERR;
+ }
+
+ message("Resolved %s !", name);
+
+ res0 = (struct addrinfo *) malloc(sizeof(struct addrinfo));
+ memcpy(res0, res, sizeof(struct addrinfo));
+ freeaddrinfo(res);
+ pthread_mutex_unlock(&__thread_safe_lock);
/*
* create socket
*/
- if ((*sock = socket(AF_INET, SOCK_STREAM, 0)) < 1)
+ if ((*sock = socket(res0->ai_family, res0->ai_socktype, 0)) < 1)
{
message("unable to create socket\n");
- free(tmphstbuf);
+ free(res0);
return CONSOCKERR;
} }
+
/*Experimental */
flags = fcntl(*sock, F_GETFL, 0);
if (flags != -1)
@@ -96,8 +105,7 @@
message("Connecting to server.......");
-
- status = connect(*sock, (struct sockaddr *) &server, sizeof(server));
+ status = connect(*sock, res0->ai_addr, res0->ai_addrlen);
if (status == -1 && noblock != -1 && errno == EINPROGRESS)
{
@@ -135,11 +143,11 @@
if (errno == ECONNREFUSED)
{
- free(tmphstbuf);
+ free(res0);
return CONREFUSED;
} else
{
- free(tmphstbuf);
+ free(res0);
return CONERROR;
}
} else
@@ -156,8 +164,9 @@
/* setsockopt(*sock, SOL_SOCKET, SO_KEEPALIVE,
* (char *) &opt, (int) sizeof(opt));
*/
+
message("Connect OK!");
- free(tmphstbuf);
+ free(res0);
return NOCONERROR;
}