From 9a158361da249e0eab1e0f7bd2c7dbe9f32eddfa Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Thu, 6 May 1999 21:38:11 +0000 Subject: I rewrote the interface handling code, so that it supports multiple addresses per interface (needed for example for IPv6 support). Visible changes: o struct iface now contains a list of all interface addresses (represented by struct ifa), iface->addr points to the primary address (if any). o Interface has IF_UP set iff it's up and it has a primary address. o IF_UP is now independent on IF_IGNORED (i.e., you need to test IF_IGNORED in the protocols; I've added this, but please check). o The if_notify_change hook has been simplified (only one interface pointer etc.). o Introduced a ifa_notify_change hook. (For now, only the Direct protocol does use it -- it's wise to just listen to device routes in all other protocols.) o Removed IF_CHANGE_FLAGS notifier flag (it was meaningless anyway). o Updated all the code except netlink (I'll look at it tomorrow) to match the new semantics (please look at your code to ensure I did it right). Things to fix: o Netlink. o Make krt-iface interpret "eth0:1"-type aliases as secondary addresses. --- nest/iface.h | 53 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 16 deletions(-) (limited to 'nest/iface.h') diff --git a/nest/iface.h b/nest/iface.h index 8677be0..1d26e7b 100644 --- a/nest/iface.h +++ b/nest/iface.h @@ -15,48 +15,69 @@ extern list iface_list; struct proto; +struct ifa { /* Interface address */ + node n; + struct iface *iface; /* Interface this address belongs to */ + ip_addr ip; /* IP address of this host */ + ip_addr prefix; /* Network prefix */ + unsigned pxlen; /* Prefix length */ + ip_addr brd; /* Broadcast address */ + ip_addr opposite; /* Opposite end of a point-to-point link */ + unsigned scope; /* Interface address scope */ + unsigned flags; /* Analogous to iface->flags */ +}; + struct iface { node n; char name[16]; unsigned flags; unsigned mtu; unsigned index; /* OS-dependent interface index */ - ip_addr ip; /* IP address of this host (0=unset) */ - ip_addr prefix; /* Network prefix */ - unsigned pxlen; /* Prefix length */ - ip_addr brd; /* Broadcast address */ - ip_addr opposite; /* Opposite end of a point-to-point link */ + list addrs; /* Addresses assigned to this interface */ + struct ifa *addr; /* Primary address */ struct neighbor *neigh; /* List of neighbors on this interface */ }; -#define IF_UP 1 /* IF_LINK_UP, not IF_IGNORE and IP address known */ +#define IF_UP 1 /* IF_LINK_UP and IP address known */ #define IF_MULTIACCESS 2 #define IF_UNNUMBERED 4 #define IF_BROADCAST 8 -#define IF_MULTICAST 16 -#define IF_TUNNEL 32 -#define IF_ADMIN_DOWN 64 -#define IF_LOOPBACK 128 -#define IF_IGNORE 256 -#define IF_LINK_UP 512 +#define IF_MULTICAST 0x10 +#define IF_TUNNEL 0x20 +#define IF_ADMIN_DOWN 0x40 +#define IF_LOOPBACK 0x80 +#define IF_IGNORE 0x100 /* Not to be used by routing protocols (loopbacks etc.) */ +#define IF_LINK_UP 0x200 + +#define IA_PRIMARY 0x10000 /* This address is primary */ +#define IA_SECONDARY 0x20000 /* This address has been reported as secondary by the kernel */ +#define IA_FLAGS 0xff0000 + +#define IF_JUST_CREATED 0x10000000 /* Send creation event as soon as possible */ +#define IF_TMP_DOWN 0x20000000 /* Temporary shutdown due to interface reconfiguration */ #define IF_UPDATED 0x40000000 /* Touched in last scan */ /* Interface change events */ #define IF_CHANGE_UP 1 #define IF_CHANGE_DOWN 2 -#define IF_CHANGE_FLAGS 4 /* Can be converted to down/up internally */ -#define IF_CHANGE_MTU 8 -#define IF_CHANGE_CREATE 16 /* Seen this interface for the first time */ +#define IF_CHANGE_MTU 4 +#define IF_CHANGE_CREATE 8 /* Seen this interface for the first time */ +#define IF_CHANGE_TOO_MUCH 0x40000000 /* Used internally */ void if_init(void); void if_dump(struct iface *); void if_dump_all(void); -void if_update(struct iface *); +void ifa_dump(struct ifa *); +struct iface *if_update(struct iface *); +struct ifa *ifa_update(struct ifa *); +void ifa_delete(struct ifa *); void if_start_update(void); void if_end_update(void); +void if_end_partial_update(struct iface *); void if_feed_baby(struct proto *); struct iface *if_find_by_index(unsigned); +struct iface *if_find_by_name(char *); /* * Neighbor Cache. We hold (direct neighbor, protocol) pairs we've seen -- cgit v1.2.3