| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | Description: remove yp host lookup and fix some types |
| 2 | Author: Jan Delgado <jdelgado@gmx.net> |
| 3 | |
| 4 | --- a/host2ip.c |
| 5 | +++ b/host2ip.c |
| 6 | @@ -4,7 +4,6 @@ |
| 7 | #include <netdb.h> /* gethostbyname() */ |
| 8 | #include <netinet/in.h> /* sockaddr_in */ |
| 9 | #include <arpa/inet.h> /* inet_addr() */ |
| 10 | -#include <rpcsvc/ypclnt.h> /* YP */ |
| 11 | #include <ctype.h> /* isspace() */ |
| 12 | |
| 13 | #include "host2ip.h" |
| 14 | @@ -37,19 +36,9 @@ struct in_addr host2ip(char *host) |
| 15 | else if ((hep = gethostbyname(host))) { |
| 16 | in = *(struct in_addr *)(hep->h_addr_list[0]); |
| 17 | } |
| 18 | - /* As a last resort, try YP. */ |
| 19 | else { |
| 20 | - static char *domain = 0; /* YP domain */ |
| 21 | - char *value; /* key value */ |
| 22 | - int value_len; /* length of returned value */ |
| 23 | - |
| 24 | - if (!domain) yp_get_default_domain(&domain); |
| 25 | - if (yp_match(domain, "hosts.byname", host, strlen(host), &value, &value_len) == 0) { |
| 26 | - in.s_addr = inet_addr(value); |
| 27 | - } else { |
| 28 | /* Everything failed */ |
| 29 | in.s_addr = INADDR_ANY; |
| 30 | - } |
| 31 | } |
| 32 | return in; |
| 33 | } /* host2ip */ |
| 34 | --- a/udptunnel.c |
| 35 | +++ b/udptunnel.c |
| 36 | @@ -423,7 +423,7 @@ static void await_incoming_connections(s |
| 37 | for (i = 0; i < relay_count; i++) { |
| 38 | if (FD_ISSET(relays[i].tcp_listen_sock, &readfds)) { |
| 39 | struct sockaddr_in client_addr; |
| 40 | - int addrlen = sizeof(client_addr); |
| 41 | + socklen_t addrlen = sizeof(client_addr); |
| 42 | |
| 43 | if ((relays[i].tcp_sock = |
| 44 | accept(relays[i].tcp_listen_sock, |
| 45 | @@ -478,7 +478,7 @@ static int udp_to_tcp(struct relay *rela |
| 46 | struct out_packet p; |
| 47 | int buflen; |
| 48 | struct sockaddr_in remote_udpaddr; |
| 49 | - int addrlen = sizeof(remote_udpaddr); |
| 50 | + socklen_t addrlen = sizeof(remote_udpaddr); |
| 51 | |
| 52 | if ((buflen = recvfrom(relay->udp_recv_sock, p.buf, UDPBUFFERSIZE, 0, |
| 53 | (struct sockaddr *) &remote_udpaddr, |
| 54 | @@ -555,7 +555,8 @@ static int tcp_to_udp(struct relay *rela |
| 55 | /* There isn't a UDP listener waiting on the other end, but |
| 56 | * that's okay, it's probably just not up at the moment or something. |
| 57 | * Use getsockopt(SO_ERROR) to clear the error state. */ |
| 58 | - int err, len = sizeof(err); |
| 59 | + int err; |
| 60 | + socklen_t len = sizeof(err); |
| 61 | |
| 62 | if (debug > 1) { |
| 63 | fprintf(stderr, "ECONNREFUSED on udp_send_sock; clearing.\n"); |