diff options
| author | Guenther Deschner <gd@samba.org> | 2007-10-11 15:18:50 +0200 |
|---|---|---|
| committer | Guenther Deschner <gd@samba.org> | 2007-10-11 15:18:50 +0200 |
| commit | 89d33395e31a7ccb6b091e4a99a30d12e3367238 (patch) | |
| tree | f2ec7c4ddbf9134ecae18e27bf792b90da372663 /source3/include/interfaces.h | |
| parent | 6b441e9e74b11bee4b661eaa17682d6351c264ff (diff) | |
| parent | edfcfefa37bf948c990e7ad3a1aea1dd4c3cea09 (diff) | |
| download | samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.tar.gz samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.tar.bz2 samba-89d33395e31a7ccb6b091e4a99a30d12e3367238.zip | |
Merge commit 'origin/v3-2-test' into my_branch
(This used to be commit fbe5edec375c99421d19af086c4f597e70c963b8)
Diffstat (limited to 'source3/include/interfaces.h')
| -rw-r--r-- | source3/include/interfaces.h | 19 |
1 files changed, 5 insertions, 14 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; }; |