summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-01 04:12:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:28 -0500
commit9b9c23b19be5a90821e1075a76f8b94fdb2424e2 (patch)
treef968db44bf97befaa4d19136e83c508cd3932b35 /source4/torture
parentc4f115aa1b0029f716d495fa8fa3052d1a833439 (diff)
downloadsamba-9b9c23b19be5a90821e1075a76f8b94fdb2424e2.tar.gz
samba-9b9c23b19be5a90821e1075a76f8b94fdb2424e2.tar.bz2
samba-9b9c23b19be5a90821e1075a76f8b94fdb2424e2.zip
r5155: define ipv4address as a based IDL type, mapped to a "const char *" in
the header, and defined on the wire as a 4 byte network byte order IP. This means the calling code doesn't have to worry about network byte order conversions. (This used to be commit 72048e37179dd5b9ada0c5280d2f0d8c23d1a17d)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rpc/epmapper.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index ea1166b4ed..b8cd93a4db 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -63,12 +63,7 @@ static void display_tower(TALLOC_CTX *mem_ctx, struct epm_tower *twr)
break;
case EPM_PROTOCOL_IP:
- printf(" IP:");
- {
- struct ipv4_addr in;
- in.addr = htonl(rhs->ip.ipaddr.addr);
- printf("%s", sys_inet_ntoa(in));
- }
+ printf(" IP:%s", rhs->ip.ipaddr);
break;
case EPM_PROTOCOL_PIPE:
@@ -158,7 +153,7 @@ static BOOL test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
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.ipaddr.addr = 0;
+ twr->tower.floors[4].rhs.ip.ipaddr = "0.0.0.0";
status = dcerpc_epm_Map(p, mem_ctx, &r);
if (NT_STATUS_IS_OK(status) && r.out.result == 0) {