[m-dev.] diff: fix problem with external debugger and internet sockets

Fergus Henderson fjh at cs.mu.OZ.AU
Sun Oct 24 18:38:15 AEST 1999


Estimated hours taken: 2

trace/mercury_trace_external.c:
	Use inet_addr() rather than inet_network().
	Using inet_network() didn't work,
	because inet_network() returned the address in
	host byte order rather than network byte order.

configure.in:
	Update the autoconf test to match the new source code
	in trace/mercury_trace_external.c.

Workspace: /home/mercury0/fjh/mercury
Index: trace/mercury_trace_external.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_external.c,v
retrieving revision 1.23
diff -u -d -r1.23 mercury_trace_external.c
--- mercury_trace_external.c	1999/10/20 15:16:18	1.23
+++ mercury_trace_external.c	1999/10/24 07:48:23
@@ -261,7 +261,7 @@
 		{
 			fatal_error("MERCURY_DEBUGGER_INET_SOCKET invalid");
 		}
-		host_addr = inet_network(hostname);
+		host_addr = inet_addr(hostname);
 		if (host_addr == -1) {
 			fatal_error("MERCURY_DEBUGGER_INET_SOCKET: "
 				"invalid address");
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.181
diff -u -d -r1.181 configure.in
--- configure.in	1999/09/23 02:15:00	1.181
+++ configure.in	1999/10/24 07:49:05
@@ -2099,7 +2099,7 @@
 		if (unix_socket) {
 		
 			addr_family = AF_UNIX;
-			memset(&unix_address, 0, sizeof(unix_address));
+			(memset)(&unix_address, 0, sizeof(unix_address));
 			unix_address.sun_family = AF_UNIX;
 			strcpy(unix_address.sun_path, unix_socket);
 			addr = (struct sockaddr *) &unix_address;
@@ -2122,7 +2122,7 @@
 			{
 				fatal_error("MERCURY_DEBUGGER_INET_SOCKET invalid");
 			}
-			host_addr = inet_network(hostname);
+			host_addr = inet_addr(hostname);
 			if (host_addr == -1) {
 				fatal_error("MERCURY_DEBUGGER_INET_SOCKET: "
 					"invalid address");

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------



More information about the developers mailing list