diff options
| author | glebius <glebius@FreeBSD.org> | 2011-12-16 12:16:56 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2011-12-16 12:16:56 +0000 |
| commit | 27a36f6ac8242750daa092abd7180b10d16f4508 (patch) | |
| tree | 059f66a20d251fa947969ff34292206d47ffc45c /sys/net/if.h | |
| parent | b646d3f6998d3f539bcda6f94be4926461780cf7 (diff) | |
| download | FreeBSD-src-27a36f6ac8242750daa092abd7180b10d16f4508.zip FreeBSD-src-27a36f6ac8242750daa092abd7180b10d16f4508.tar.gz | |
A major overhaul of the CARP implementation. The ip_carp.c was started
from scratch, copying needed functionality from the old implemenation
on demand, with a thorough review of all code. The main change is that
interface layer has been removed from the CARP. Now redundant addresses
are configured exactly on the interfaces, they run on.
The CARP configuration itself is, as before, configured and read via
SIOCSVH/SIOCGVH ioctls. A new prefix created with SIOCAIFADDR or
SIOCAIFADDR_IN6 may now be configured to a particular virtual host id,
which makes the prefix redundant.
ifconfig(8) semantics has been changed too: now one doesn't need
to clone carpXX interface, he/she should directly configure a vhid
on a Ethernet interface.
To supply vhid data from the kernel to an application the getifaddrs(8)
function had been changed to pass ifam_data with each address. [1]
The new implementation definitely closes all PRs related to carp(4)
being an interface, and may close several others. It also allows
to run a single redundant IP per interface.
Big thanks to Bjoern Zeeb for his help with inet6 part of patch, for
idea on using ifam_data and for several rounds of reviewing!
PR: kern/117000, kern/126945, kern/126714, kern/120130, kern/117448
Reviewed by: bz
Submitted by: bz [1]
Diffstat (limited to 'sys/net/if.h')
| -rw-r--r-- | sys/net/if.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/net/if.h b/sys/net/if.h index 4f2dc6f..08420f4 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -85,7 +85,7 @@ struct if_data { u_char ifi_addrlen; /* media address length */ u_char ifi_hdrlen; /* media header length */ u_char ifi_link_state; /* current link state */ - u_char ifi_spare_char1; /* spare byte */ + u_char ifi_vhid; /* carp vhid */ u_char ifi_spare_char2; /* spare byte */ u_char ifi_datalen; /* length of this data struct */ u_long ifi_mtu; /* maximum transmission unit */ @@ -267,6 +267,8 @@ struct ifa_msghdr { int ifam_flags; /* value of ifa_flags */ u_short ifam_index; /* index for associated ifp */ int ifam_metric; /* value of ifa_metric */ + struct if_data ifam_data;/* statistics and other data about if or + * address */ }; /* @@ -357,6 +359,7 @@ struct ifaliasreq { struct sockaddr ifra_addr; struct sockaddr ifra_broadaddr; struct sockaddr ifra_mask; + int ifra_vhid; }; struct ifmediareq { |
