summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-10-10 18:25:16 -0700
committerJeremy Allison <jra@samba.org>2007-10-10 18:25:16 -0700
commit8e54530b52fd256137740107e9fdf000f00a7a30 (patch)
treef9ca56cc0b2eff78c3550c924c79ee4ca0666fd2 /source3/include
parent0ec55a246238b6cfb3727942c20cd55a16ab4d4a (diff)
downloadsamba-8e54530b52fd256137740107e9fdf000f00a7a30.tar.gz
samba-8e54530b52fd256137740107e9fdf000f00a7a30.tar.bz2
samba-8e54530b52fd256137740107e9fdf000f00a7a30.zip
Add start of IPv6 implementation. Currently most of this is avoiding
IPv6 in winbindd, but moves most of the socket functions that were wrongly in lib/util.c into lib/util_sock.c and provides generic IPv4/6 independent versions of most things. Still lots of work to do, but now I can see how I'll fix the access check code. Nasty part that remains is the name resolution code which is used to returning arrays of in_addr structs. Jeremy. (This used to be commit 3f6bd0e1ec5cc6670f3d08f76fc2cd94c9cd1a08)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/interfaces.h19
-rw-r--r--source3/include/smb.h8
2 files changed, 10 insertions, 17 deletions
diff --git a/source3/include/interfaces.h b/source3/include/interfaces.h
index 371f64292f..66ea151f02 100644
--- a/source3/include/interfaces.h
+++ b/source3/include/interfaces.h
@@ -1,4 +1,4 @@
-/*
+/*
This structure is used by lib/interfaces.c to return the list of network
interfaces on the machine
*/
@@ -7,17 +7,8 @@
struct iface_struct {
char name[16];
- sa_family_t sa_family;
- union {
- struct in_addr ip;
-#ifdef AF_INET6
- struct in6_addr ip6;
-#endif
- } iface_addr;
- union {
- struct in_addr netmask;
-#ifdef AF_INET6
- struct in6_addr netmask6;
-#endif
- } iface_netmask;
+ int flags;
+ struct sockaddr_storage ip;
+ struct sockaddr_storage netmask;
+ struct sockaddr_storage bcast;
};
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 75ec4363d0..7386613029 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -726,9 +726,11 @@ struct server_info_struct {
/* used for network interfaces */
struct interface {
struct interface *next, *prev;
- struct in_addr ip;
- struct in_addr bcast;
- struct in_addr nmask;
+ char *name;
+ int flags;
+ struct sockaddr_storage ip;
+ struct sockaddr_storage netmask;
+ struct sockaddr_storage bcast;
};
/* Internal message queue for deferred opens. */