[BACK]Return to zebra_fpm.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / quagga / zebra

Diff for /embedaddon/quagga/zebra/zebra_fpm.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2013/07/21 23:54:41 version 1.1.1.2, 2016/11/02 10:09:10
Line 330  zfpm_is_table_for_fpm (struct route_table *table) Line 330  zfpm_is_table_for_fpm (struct route_table *table)
    * We only send the unicast tables in the main instance to the FPM     * We only send the unicast tables in the main instance to the FPM
    * at this point.     * at this point.
    */     */
  if (info->vrf->id != 0)  if (info->zvrf->vrf_id != 0)
     return 0;      return 0;
   
   if (info->safi != SAFI_UNICAST)    if (info->safi != SAFI_UNICAST)
Line 889  zfpm_route_for_update (rib_dest_t *dest) Line 889  zfpm_route_for_update (rib_dest_t *dest)
   
   RIB_DEST_FOREACH_ROUTE (dest, rib)    RIB_DEST_FOREACH_ROUTE (dest, rib)
     {      {
      if (!CHECK_FLAG (rib->flags, ZEBRA_FLAG_SELECTED))      if (!CHECK_FLAG (rib->status, RIB_ENTRY_SELECTED_FIB))
         continue;          continue;
   
       return rib;        return rib;
Line 1301  void Line 1301  void
 zfpm_trigger_update (struct route_node *rn, const char *reason)  zfpm_trigger_update (struct route_node *rn, const char *reason)
 {  {
   rib_dest_t *dest;    rib_dest_t *dest;
  char buf[INET6_ADDRSTRLEN];  char buf[PREFIX_STRLEN];
   
   /*    /*
    * Ignore if the connection is down. We will update the FPM about     * Ignore if the connection is down. We will update the FPM about
Line 1329  zfpm_trigger_update (struct route_node *rn, const char Line 1329  zfpm_trigger_update (struct route_node *rn, const char
   
   if (reason)    if (reason)
     {      {
      zfpm_debug ("%s/%d triggering update to FPM - Reason: %s",      zfpm_debug ("%s triggering update to FPM - Reason: %s",
                  inet_ntop (rn->p.family, &rn->p.u.prefix, buf, sizeof (buf)),                  prefix2str (&rn->p, buf, sizeof(buf)), reason);
                  rn->p.prefixlen, reason); 
     }      }
   
   SET_FLAG (dest->flags, RIB_DEST_UPDATE_FPM);    SET_FLAG (dest->flags, RIB_DEST_UPDATE_FPM);
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>