From 9b9c23b19be5a90821e1075a76f8b94fdb2424e2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 1 Feb 2005 04:12:44 +0000 Subject: 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) --- source4/torture/rpc/epmapper.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'source4/torture/rpc/epmapper.c') 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) { -- cgit