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

version 1.1.1.1, 2012/02/21 17:26:11 version 1.1.1.2, 2012/10/09 09:22:29
Line 76  if_zebra_new_hook (struct interface *ifp) Line 76  if_zebra_new_hook (struct interface *ifp)
     rtadv->AdvReachableTime = 0;      rtadv->AdvReachableTime = 0;
     rtadv->AdvRetransTimer = 0;      rtadv->AdvRetransTimer = 0;
     rtadv->AdvCurHopLimit = 0;      rtadv->AdvCurHopLimit = 0;
    rtadv->AdvDefaultLifetime = RTADV_ADV_DEFAULT_LIFETIME;    rtadv->AdvDefaultLifetime = -1; /* derive from MaxRtrAdvInterval */
     rtadv->HomeAgentPreference = 0;      rtadv->HomeAgentPreference = 0;
    rtadv->HomeAgentLifetime = RTADV_ADV_DEFAULT_LIFETIME;    rtadv->HomeAgentLifetime = -1; /* derive from AdvDefaultLifetime */
     rtadv->AdvIntervalOption = 0;      rtadv->AdvIntervalOption = 0;
     rtadv->DefaultPreference = RTADV_PREF_MEDIUM;      rtadv->DefaultPreference = RTADV_PREF_MEDIUM;
   
Line 216  if_subnet_delete (struct interface *ifp, struct connec Line 216  if_subnet_delete (struct interface *ifp, struct connec
  * interface will affect only the primary interface/address on Solaris.   * interface will affect only the primary interface/address on Solaris.
  ************************End Solaris flags hacks ***********************   ************************End Solaris flags hacks ***********************
  */   */
static inline voidstatic void
 if_flags_mangle (struct interface *ifp, uint64_t *newflags)  if_flags_mangle (struct interface *ifp, uint64_t *newflags)
 {  {
 #ifdef SUNOS_5  #ifdef SUNOS_5
Line 630  nd_dump_vty (struct vty *vty, struct interface *ifp) Line 630  nd_dump_vty (struct vty *vty, struct interface *ifp)
         vty_out (vty, "  ND router advertisements are sent every "          vty_out (vty, "  ND router advertisements are sent every "
                         "%d seconds%s", interval / 1000,                          "%d seconds%s", interval / 1000,
                  VTY_NEWLINE);                   VTY_NEWLINE);
      vty_out (vty, "  ND router advertisements live for %d seconds%s",      if (rtadv->AdvDefaultLifetime != -1)
               rtadv->AdvDefaultLifetime, VTY_NEWLINE);        vty_out (vty, "  ND router advertisements live for %d seconds%s",
                  rtadv->AdvDefaultLifetime, VTY_NEWLINE);
       else
         vty_out (vty, "  ND router advertisements lifetime tracks ra-interval%s",
                  VTY_NEWLINE);
       vty_out (vty, "  ND router advertisement default router preference is "        vty_out (vty, "  ND router advertisement default router preference is "
                         "%s%s", rtadv_pref_strs[rtadv->DefaultPreference],                          "%s%s", rtadv_pref_strs[rtadv->DefaultPreference],
                  VTY_NEWLINE);                   VTY_NEWLINE);
Line 642  nd_dump_vty (struct vty *vty, struct interface *ifp) Line 646  nd_dump_vty (struct vty *vty, struct interface *ifp)
         vty_out (vty, "  Hosts use stateless autoconfig for addresses.%s",          vty_out (vty, "  Hosts use stateless autoconfig for addresses.%s",
                  VTY_NEWLINE);                   VTY_NEWLINE);
       if (rtadv->AdvHomeAgentFlag)        if (rtadv->AdvHomeAgentFlag)
         {
         vty_out (vty, "  ND router advertisements with "          vty_out (vty, "  ND router advertisements with "
                                 "Home Agent flag bit set.%s",                                  "Home Agent flag bit set.%s",
                  VTY_NEWLINE);                   VTY_NEWLINE);
           if (rtadv->HomeAgentLifetime != -1)
             vty_out (vty, "  Home Agent lifetime is %u seconds%s",
                      rtadv->HomeAgentLifetime, VTY_NEWLINE);
           else
             vty_out (vty, "  Home Agent lifetime tracks ra-lifetime%s",
                      VTY_NEWLINE);
           vty_out (vty, "  Home Agent preference is %u%s",
                    rtadv->HomeAgentPreference, VTY_NEWLINE);
         }
       if (rtadv->AdvIntervalOption)        if (rtadv->AdvIntervalOption)
         vty_out (vty, "  ND router advertisements with Adv. Interval option.%s",          vty_out (vty, "  ND router advertisements with Adv. Interval option.%s",
                  VTY_NEWLINE);                   VTY_NEWLINE);

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


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