diff --git a/checkin_notes b/checkin_notes index 16bd72045d..ad7517c190 100755 --- a/checkin_notes +++ b/checkin_notes @@ -13982,3 +13982,13 @@ David 2004.06.18 client/ client_state.h cs_scheduler.C + +David 2004.06.18 + - Aaargh! I forgot that gethostbyname() is unavoidably used + when contacting servers, so all this ping stuff + is a total waste of time! + Changed things back to the way they were originally. + + client/ + hostinfo_network.C + net_xfer.C diff --git a/client/hostinfo_network.C b/client/hostinfo_network.C index a837ab51d2..4721aea709 100644 --- a/client/hostinfo_network.C +++ b/client/hostinfo_network.C @@ -52,7 +52,6 @@ // get domain name and IP address of this host // -#ifdef _WIN32 int get_local_network_info( char* domain_name, int domlen, char* ip_addr, int iplen ) { @@ -71,7 +70,7 @@ int get_local_network_info( return 0; } -#else +#if 0 // NEW POLICY: on UNIX, get just the hostname. // the rest (domain name, IP address) is a can of worms, diff --git a/client/net_xfer.C b/client/net_xfer.C index 99ea064404..970c75a39c 100644 --- a/client/net_xfer.C +++ b/client/net_xfer.C @@ -104,7 +104,7 @@ int get_socket_error(int fd) { } int NET_XFER::get_ip_addr(int &ip_addr) { - return get_ip_addr(hostname,ip_addr); + return get_ip_addr(hostname, ip_addr); } int NET_XFER::get_ip_addr(char *hostname, int &ip_addr) {