r3443: the next stage in the include files re-organisation.

I have created the include/system/ directory, which will contain the
wrappers for the system includes for logical subsystems. So far I have
created include/system/kerberos.h and include/system/network.h, which
contain all the system includes for kerberos code and networking code.
These are the included in subsystems that need kerberos or networking
respectively.

Note that this method avoids the mess of #ifdef HAVE_XXX_H in every C
file, instead each C module includes the include/system/XXX.h file for
the logical system support it needs, and the details are kept isolated
in include/system/

This patch also creates a "struct ipv4_addr" which replaces "struct
in_addr" in our code. That avoids every C file needing to import all
the system networking headers.
(This used to be commit 2e25c71853f8996f73755277e448e7d670810349)

1 files changed, 7 insertions, 7 deletions

diff --git a/source4/rpc_server/dcerpc_sock.c b/source4/rpc_server/dcerpc_sock.c
index 508f42d2fb..b131df5de2 100644
--- a/source4/rpc_server/dcerpc_sock.c
+++ b/source4/rpc_server/dcerpc_sock.c
@@ -123,15 +123,15 @@ static void add_socket_rpc_ncalrpc(struct server_service *service,
   add a socket address to the list of events, one event per dcerpc endpoint
 */
 static void add_socket_rpc_tcp_iface(struct server_service *service, 
-		       const struct model_ops *model_ops,
-		       struct dcesrv_context *dce_ctx, 
-			   struct dcesrv_endpoint *e,
-		       struct in_addr *ifip)
+				     const struct model_ops *model_ops,
+				     struct dcesrv_context *dce_ctx, 
+				     struct dcesrv_endpoint *e,
+				     struct ipv4_addr *ifip)
 {
 	struct server_socket *sock;
 	struct dcesrv_socket_context *dcesrv_sock;
 	uint16_t port = 0;
-	char *ip_str = talloc_strdup(service, inet_ntoa(*ifip));
+	char *ip_str = talloc_strdup(service, sys_inet_ntoa(*ifip));
 			
 	if (e->ep_description.endpoint) 
 		port = atoi(e->ep_description.endpoint);
@@ -173,14 +173,14 @@ static void add_socket_rpc_tcp(struct server_service *service,
 		int num_interfaces = iface_count();
 		int i;
 		for(i = 0; i < num_interfaces; i++) {
-			struct in_addr *ifip = iface_n_ip(i);
+			struct ipv4_addr *ifip = iface_n_ip(i);
 			if (ifip == NULL) {
 				continue;
 			}
 			add_socket_rpc_tcp_iface(service, model_ops, dce_ctx, e, ifip);
 		}
 	} else {
-		struct in_addr ifip;
+		struct ipv4_addr ifip;
 		ifip = interpret_addr2(lp_socket_address());
 		add_socket_rpc_tcp_iface(service, model_ops, dce_ctx, e, &ifip);
 	}