mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-01 05:45:45 +00:00
132 lines
3.2 KiB
C
132 lines
3.2 KiB
C
--- src/connect.c.ori Fri Aug 17 20:38:25 2001
|
|
+++ src/connect.c Sat Feb 7 02:11:10 2004
|
|
@@ -24,9 +24,11 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
+#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <fcntl.h>
|
|
#include <netdb.h>
|
|
+#include <netinet/in_systm.h>
|
|
#include <netinet/in.h>
|
|
#include <netinet/ip.h>
|
|
#include <netdb.h>
|
|
@@ -42,51 +44,58 @@
|
|
#include "runtime.h"
|
|
#include "debug.h"
|
|
|
|
+static pthread_mutex_t __thread_safe_lock = PTHREAD_MUTEX_INITIALIZER;
|
|
+
|
|
uerr_t connect_to_server(int *sock, char *name, int port, int timeout)
|
|
{
|
|
unsigned int portnum;
|
|
+ char szPort[10];
|
|
int status;
|
|
- struct sockaddr_in server;
|
|
- struct hostent *hp, hostbuf;
|
|
extern int h_errno;
|
|
/* int opt; */
|
|
int noblock, flags;
|
|
|
|
- char *tmphstbuf;
|
|
- size_t hstbuflen = 2048;
|
|
- tmphstbuf = kmalloc(hstbuflen);
|
|
+ struct addrinfo hints, *res=NULL;
|
|
+ struct addrinfo *res0=NULL;
|
|
+ int error;
|
|
+
|
|
+ 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;
|
|
}
|
|
|