svn commit: samba r5148 - in branches/SAMBA_4_0/source: librpc/idl librpc/rpc torture/rpc

[metze at samba.org]

Author: metze
Date: 2005-01-31 21:44:39 +0000 (Mon, 31 Jan 2005)
New Revision: 5148

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5148

Log:
use ipv4_addr also in epmapper idl

metze

Modified:
   branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
   branches/SAMBA_4_0/source/torture/rpc/epmapper.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/epmapper.idl	2005-01-31 17:26:47 UTC (rev 5147)
+++ branches/SAMBA_4_0/source/librpc/idl/epmapper.idl	2005-01-31 21:44:39 UTC (rev 5148)
@@ -99,7 +99,7 @@
 	} epm_rhs_tcp;
 
 	typedef struct {
-		uint32 address;
+		ipv4_addr ipaddr;
 	} epm_rhs_ip;
 
 	typedef struct {

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2005-01-31 17:26:47 UTC (rev 5147)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2005-01-31 21:44:39 UTC (rev 5148)
@@ -386,13 +386,13 @@
 		return talloc_asprintf(mem_ctx, "%d", floor->rhs.http.port);
 
 	case EPM_PROTOCOL_IP:
-		if (floor->rhs.ip.address == 0) {
+		if (floor->rhs.ip.ipaddr.addr == 0) {
 			return NULL; 
 		}
 
 		{
 			struct ipv4_addr in;
-			in.addr = htonl(floor->rhs.ip.address);
+			in.addr = htonl(floor->rhs.ip.ipaddr.addr);
 			return talloc_strdup(mem_ctx, sys_inet_ntoa(in));
 		}
 
@@ -458,9 +458,9 @@
 
 	case EPM_PROTOCOL_IP:
 		if (strlen(data) > 0) {
-			floor->rhs.ip.address = ntohl(interpret_addr(data));
+			floor->rhs.ip.ipaddr.addr = ntohl(interpret_addr(data));
 		} else {
-			floor->rhs.ip.address = 0;
+			floor->rhs.ip.ipaddr.addr = 0;
 		}
 		return NT_STATUS_OK;
 

Modified: branches/SAMBA_4_0/source/torture/rpc/epmapper.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/epmapper.c	2005-01-31 17:26:47 UTC (rev 5147)
+++ branches/SAMBA_4_0/source/torture/rpc/epmapper.c	2005-01-31 21:44:39 UTC (rev 5148)
@@ -66,7 +66,7 @@
 			printf(" IP:");
 			{
 				struct ipv4_addr in;
-				in.addr = htonl(rhs->ip.address);
+				in.addr = htonl(rhs->ip.ipaddr.addr);
 				printf("%s", sys_inet_ntoa(in));
 			}
 			break;
@@ -158,7 +158,7 @@
 
 	twr->tower.floors[4].lhs.protocol = EPM_PROTOCOL_IP;
 	twr->tower.floors[4].lhs.info.lhs_data = data_blob(NULL, 0);
-	twr->tower.floors[4].rhs.ip.address = 0;
+	twr->tower.floors[4].rhs.ip.ipaddr.addr = 0;
 
 	status = dcerpc_epm_Map(p, mem_ctx, &r);
 	if (NT_STATUS_IS_OK(status) && r.out.result == 0) {