diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-02-01 04:12:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:28 -0500 |
| commit | 9b9c23b19be5a90821e1075a76f8b94fdb2424e2 (patch) | |
| tree | f968db44bf97befaa4d19136e83c508cd3932b35 /source4/librpc/ndr | |
| parent | c4f115aa1b0029f716d495fa8fa3052d1a833439 (diff) | |
| download | samba-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/librpc/ndr')
| -rw-r--r-- | source4/librpc/ndr/ndr_basic.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c index 9601421044..507ee1594b 100644 --- a/source4/librpc/ndr/ndr_basic.c +++ b/source4/librpc/ndr/ndr_basic.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/network.h" #define NDR_BE(ndr) (((ndr)->flags & (LIBNDR_FLAG_BIGENDIAN|LIBNDR_FLAG_LITTLE_ENDIAN)) == LIBNDR_FLAG_BIGENDIAN) #define NDR_SVAL(ndr, ofs) (NDR_BE(ndr)?RSVAL(ndr->data,ofs):SVAL(ndr->data,ofs)) @@ -1017,6 +1018,39 @@ NTSTATUS ndr_pull_time_t(struct ndr_pull *ndr, time_t *t) } +/* + pull a ipv4address +*/ +NTSTATUS ndr_pull_ipv4address(struct ndr_pull *ndr, const char **address) +{ + struct ipv4_addr in; + NDR_CHECK(ndr_pull_uint32(ndr, &in.addr)); + in.addr = htonl(in.addr); + *address = talloc_strdup(ndr, sys_inet_ntoa(in)); + NT_STATUS_HAVE_NO_MEMORY(*address); + return NT_STATUS_OK; +} + +/* + push a ipv4address +*/ +NTSTATUS ndr_push_ipv4address(struct ndr_push *ndr, const char *address) +{ + uint32_t addr = interpret_addr(address); + NDR_CHECK(ndr_push_uint32(ndr, htonl(addr))); + return NT_STATUS_OK; +} + +/* + print a ipv4address +*/ +void ndr_print_ipv4address(struct ndr_print *ndr, const char *name, + const char *address) +{ + ndr->print(ndr, "%-25s: %s", name, address); +} + + void ndr_print_struct(struct ndr_print *ndr, const char *name, const char *type) { ndr->print(ndr, "%s: struct %s", name, type); |