#include "zebra/connected.h"
extern struct zebra_t zebrad;
\f
-/* withdraw a connected address */
+/* communicate the withdrawal of a connected address */
static void
connected_withdraw (struct connected *ifc)
{
listnode_add (ifp->connected, ifc);
/* Update interface address information to protocol daemon. */
- if (! CHECK_FLAG (ifc->conf, ZEBRA_IFC_REAL))
- {
- if (ifc->address->family == AF_INET)
- if_subnet_add (ifp, ifc);
+ if (ifc->address->family == AF_INET)
+ if_subnet_add (ifp, ifc);
- SET_FLAG (ifc->conf, ZEBRA_IFC_REAL);
+ zebra_interface_address_add_update (ifp, ifc);
- zebra_interface_address_add_update (ifp, ifc);
-
- if (if_is_operative(ifp))
- {
- if (ifc->address->family == AF_INET)
- connected_up_ipv4 (ifp, ifc);
+ if (if_is_operative(ifp))
+ {
+ if (ifc->address->family == AF_INET)
+ connected_up_ipv4 (ifp, ifc);
#ifdef HAVE_IPV6
- else
- connected_up_ipv6 (ifp, ifc);
+ else
+ connected_up_ipv6 (ifp, ifc);
#endif
- }
}
}
\f
return NULL;
}
-/* Check if two ifc's describe the same address */
+/* Check if two ifc's describe the same address in the same state */
static int
connected_same (struct connected *ifc1, struct connected *ifc2)
{
if (ifc1->flags != ifc2->flags)
return 0;
+
+ if (ifc1->conf != ifc2->conf)
+ return 0;
return 1;
}
/* Avoid spurious withdraws, this might be just the kernel 'reflecting'
* back an address we have already added.
*/
- if (connected_same (current, ifc) && CHECK_FLAG(current->conf, ZEBRA_IFC_REAL))
+ if (connected_same (current, ifc))
{
/* nothing to do */
connected_free (ifc);
connected_withdraw (current); /* implicit withdraw - freebsd does this */
}
- /* If the connected is new or has changed, announce it */
- connected_announce(ifp, ifc);
+ /* If the connected is new or has changed, announce it, if it is usable */
+ if (CHECK_FLAG(ifc->conf, ZEBRA_IFC_REAL))
+ connected_announce(ifp, ifc);
}
/* Called from if_up(). */
if (label)
ifc->label = XSTRDUP (MTYPE_CONNECTED_LABEL, label);
+ /* For all that I know an IPv4 address is always ready when we receive
+ * the notification. So it should be safe to set the REAL flag here. */
+ SET_FLAG(ifc->conf, ZEBRA_IFC_REAL);
+
connected_update(ifp, ifc);
}
if (label)
ifc->label = XSTRDUP (MTYPE_CONNECTED_LABEL, label);
+ /* On Linux, we only get here when DAD is complete, therefore we can set
+ * ZEBRA_IFC_REAL.
+ *
+ * On BSD, there currently doesn't seem to be a way to check for completion of
+ * DAD, so we replicate the old behaviour and set ZEBRA_IFC_REAL, although DAD
+ * might still be running.
+ */
+ SET_FLAG(ifc->conf, ZEBRA_IFC_REAL);
connected_update(ifp, ifc);
}
ifc = listgetdata (listhead (addr_list));
zebra_interface_address_delete_update (ifp, ifc);
UNSET_FLAG (ifc->flags, ZEBRA_IFA_SECONDARY);
+ /* XXX: Linux kernel removes all the secondary addresses when the primary
+ * address is removed. We could try to work around that, though this is
+ * non-trivial. */
zebra_interface_address_add_update (ifp, ifc);
}
{
if (! if_is_up (ifp))
{
- /* XXX: WTF is it trying to set flags here?
- * caller has just gotten a new interface, has been
- * handed the flags already. This code has no business
- * trying to override administrative status of the interface.
- * The only call path to here which doesn't originate from
- * kernel event is irdp - what on earth is it trying to do?
- *
- * further RUNNING is not a settable flag on any system
- * I (paulj) am aware of.
- */
+ /* Assume zebra is configured like following:
+ *
+ * interface gre0
+ * ip addr 192.0.2.1/24
+ * !
+ *
+ * As soon as zebra becomes first aware that gre0 exists in the
+ * kernel, it will set gre0 up and configure its addresses.
+ *
+ * (This may happen at startup when the interface already exists
+ * or during runtime when the interface is added to the kernel)
+ *
+ * XXX: IRDP code is calling here via if_add_update - this seems
+ * somewhat weird.
+ * XXX: RUNNING is not a settable flag on any system
+ * I (paulj) am aware of.
+ */
if_set_flags (ifp, IFF_UP | IFF_RUNNING);
if_refresh (ifp);
}
continue;
}
- /* Add to subnet chain list. */
- if_subnet_add (ifp, ifc);
-
SET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
- SET_FLAG (ifc->conf, ZEBRA_IFC_REAL);
-
- zebra_interface_address_add_update (ifp, ifc);
-
- if (if_is_operative(ifp))
- connected_up_ipv4 (ifp, ifc);
+ /* The address will be advertised to zebra clients when the notification
+ * from the kernel has been received.
+ * It will also be added to the interface's subnet list then. */
}
#ifdef HAVE_IPV6
if (p->family == AF_INET6)
{
if (! if_is_up (ifp))
{
- /* XXX: See long comment above */
+ /* See long comment above */
if_set_flags (ifp, IFF_UP | IFF_RUNNING);
if_refresh (ifp);
}
safe_strerror(errno));
continue;
}
- SET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
- SET_FLAG (ifc->conf, ZEBRA_IFC_REAL);
-
- zebra_interface_address_add_update (ifp, ifc);
- if (if_is_operative(ifp))
- connected_up_ipv6 (ifp, ifc);
+ SET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
+ /* The address will be advertised to zebra clients when the notification
+ * from the kernel has been received. */
}
#endif /* HAVE_IPV6 */
}
ifc = listgetdata (anode);
p = ifc->address;
-
connected_down_ipv4 (ifp, ifc);
+ /* XXX: We have to send notifications here explicitly, because we destroy
+ * the ifc before receiving the notification about the address being deleted.
+ */
zebra_interface_address_delete_update (ifp, ifc);
UNSET_FLAG (ifc->conf, ZEBRA_IFC_REAL);
return CMD_WARNING;
}
- /* Add to subnet chain list (while marking secondary attribute). */
- if_subnet_add (ifp, ifc);
-
- /* IP address propery set. */
SET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
- SET_FLAG (ifc->conf, ZEBRA_IFC_REAL);
-
- /* Update interface address information to protocol daemon. */
- zebra_interface_address_add_update (ifp, ifc);
-
- /* If interface is up register connected route. */
- if (if_is_operative(ifp))
- connected_up_ipv4 (ifp, ifc);
+ /* The address will be advertised to zebra clients when the notification
+ * from the kernel has been received.
+ * It will also be added to the subnet chain list, then. */
}
return CMD_SUCCESS;
safe_strerror(errno), VTY_NEWLINE);
return CMD_WARNING;
}
- /* success! call returned that the address deletion went through.
- * this is a synchronous operation, so we know it succeeded and can
- * now update all internal state. */
-
- /* the HAVE_NETLINK check is only here because, on BSD, although the
- * call above is still synchronous, we get a second confirmation later
- * through the route socket, and we don't want to touch that behaviour
- * for now. It should work without the #ifdef, but why take the risk...
- * -- equinox 2012-07-13 */
UNSET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
-#ifdef HAVE_NETLINK
-
- /* Remove connected route. */
- connected_down_ipv4 (ifp, ifc);
-
- /* Redistribute this information. */
- zebra_interface_address_delete_update (ifp, ifc);
-
- /* IP address propery set. */
- UNSET_FLAG (ifc->conf, ZEBRA_IFC_REAL);
-
- /* remove from interface, remark secondaries */
- if_subnet_delete (ifp, ifc);
-
- /* Free address information. */
- listnode_delete (ifp->connected, ifc);
- connected_free (ifc);
-#endif
-
+ /* we will receive a kernel notification about this route being removed.
+ * this will trigger its removal from the connected list. */
return CMD_SUCCESS;
}
return CMD_WARNING;
}
- /* IP address propery set. */
SET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
- SET_FLAG (ifc->conf, ZEBRA_IFC_REAL);
-
- /* Update interface address information to protocol daemon. */
- zebra_interface_address_add_update (ifp, ifc);
-
- /* If interface is up register connected route. */
- if (if_is_operative(ifp))
- connected_up_ipv6 (ifp, ifc);
+ /* The address will be advertised to zebra clients when the notification
+ * from the kernel has been received. */
}
return CMD_SUCCESS;
}
UNSET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
-
- /* Redistribute this information. */
- zebra_interface_address_delete_update (ifp, ifc);
-
- /* Remove connected route. */
- connected_down_ipv6 (ifp, ifc);
-
- /* Free address information. */
- listnode_delete (ifp->connected, ifc);
- connected_free (ifc);
-
+ /* This information will be propagated to the zclients when the
+ * kernel notification is received. */
return CMD_SUCCESS;
}
projects / mirror / frr.git / commitdiff