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/smb_server/smb_server.c | |
| 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/smb_server/smb_server.c')
| -rw-r--r-- | source4/smb_server/smb_server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index de3d60a6bd..a1a90852a1 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -728,11 +728,11 @@ static void smbsrv_exit(struct server_service *service, const char *reason) static void add_socket(struct server_service *service, const struct model_ops *model_ops, struct socket_context *socket_ctx, - struct in_addr *ifip) + struct ipv4_addr *ifip) { const char **ports = lp_smb_ports(); int i; - char *ip_str = talloc_strdup(service, inet_ntoa(*ifip)); + char *ip_str = talloc_strdup(service, sys_inet_ntoa(*ifip)); for (i=0;ports[i];i++) { uint16_t port = atoi(ports[i]); @@ -759,7 +759,7 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * socket per interface and bind to only these. */ for(i = 0; i < num_interfaces; i++) { - struct in_addr *ifip = iface_n_ip(i); + struct ipv4_addr *ifip = iface_n_ip(i); if (ifip == NULL) { DEBUG(0,("open_sockets_smbd: interface %d has NULL IP address !\n", i)); @@ -769,7 +769,7 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * add_socket(service, model_ops, NULL, ifip); } } else { - struct in_addr ifip; + struct ipv4_addr ifip; /* Just bind to lp_socket_address() (usually 0.0.0.0) */ ifip = interpret_addr2(lp_socket_address()); add_socket(service, model_ops, NULL, &ifip); |