diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-11-01 22:48:25 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:11 -0500 |
commit | 284349482f5293a9a23d0f72d7c2aab46b55843b (patch) | |
tree | 6f96931afb18ea841983a2895b62c97fed9f77b7 /source4/utils | |
parent | 9f14afa12c11d02a49f4f310c3f8d834ce8a835d (diff) | |
download | samba-284349482f5293a9a23d0f72d7c2aab46b55843b.tar.gz samba-284349482f5293a9a23d0f72d7c2aab46b55843b.tar.bz2 samba-284349482f5293a9a23d0f72d7c2aab46b55843b.zip |
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)
Diffstat (limited to 'source4/utils')
-rw-r--r-- | source4/utils/nmblookup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c index 8c9eccf424..2ef1470ee4 100644 --- a/source4/utils/nmblookup.c +++ b/source4/utils/nmblookup.c @@ -26,7 +26,7 @@ extern BOOL AllowDebugChange; static BOOL give_flags = False; static BOOL use_bcast = True; static BOOL got_bcast = False; -static struct in_addr bcast_addr; +static struct ipv4_addr bcast_addr; static BOOL recursion_desired = False; static BOOL translate_addresses = False; static int ServerFD= -1; @@ -119,7 +119,7 @@ static char *query_flags(int flags) /**************************************************************************** do a node status query ****************************************************************************/ -static void do_node_status(int fd, const char *name, int type, struct in_addr ip) +static void do_node_status(int fd, const char *name, int type, struct ipv4_addr ip) { struct nmb_name nname; int count, i, j; @@ -151,7 +151,7 @@ send out one query static BOOL query_one(const char *lookup, uint_t lookup_type) { int j, count, flags = 0; - struct in_addr *ip_list=NULL; + struct ipv4_addr *ip_list=NULL; if (got_bcast) { d_printf("querying %s on %s\n", lookup, inet_ntoa(bcast_addr)); @@ -159,7 +159,7 @@ static BOOL query_one(const char *lookup, uint_t lookup_type) use_bcast?True:recursion_desired, bcast_addr,&count, &flags, NULL); } else { - struct in_addr *bcast; + struct ipv4_addr *bcast; for (j=iface_count() - 1; !ip_list && j >= 0; j--) { @@ -299,7 +299,7 @@ int main(int argc,char *argv[]) for (i=optind;i<argc;i++) { char *p; - struct in_addr ip; + struct ipv4_addr ip; fstrcpy(lookup,argv[i]); |