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

Diff for /embedaddon/quagga/zebra/router-id.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, 2016/11/02 10:09:10
Line 36 Line 36
 #include "log.h"  #include "log.h"
 #include "table.h"  #include "table.h"
 #include "rib.h"  #include "rib.h"
   #include "vrf.h"
   
 #include "zebra/zserv.h"  #include "zebra/zserv.h"
 #include "zebra/router-id.h"  #include "zebra/router-id.h"
 #include "zebra/redistribute.h"  #include "zebra/redistribute.h"
   
 static struct list rid_all_sorted_list;  
 static struct list rid_lo_sorted_list;  
 static struct prefix rid_user_assigned;  
   
 /* master zebra server structure */  /* master zebra server structure */
 extern struct zebra_t zebrad;  extern struct zebra_t zebrad;
   
Line 75  router_id_bad_address (struct connected *ifc) Line 72  router_id_bad_address (struct connected *ifc)
 }  }
   
 void  void
router_id_get (struct prefix *p)router_id_get (struct prefix *p, vrf_id_t vrf_id)
 {  {
   struct listnode *node;    struct listnode *node;
   struct connected *c;    struct connected *c;
     struct zebra_vrf *zvrf = vrf_info_get (vrf_id);
   
   p->u.prefix4.s_addr = 0;    p->u.prefix4.s_addr = 0;
   p->family = AF_INET;    p->family = AF_INET;
   p->prefixlen = 32;    p->prefixlen = 32;
   
  if (rid_user_assigned.u.prefix4.s_addr)  if (zvrf->rid_user_assigned.u.prefix4.s_addr)
    p->u.prefix4.s_addr = rid_user_assigned.u.prefix4.s_addr;    p->u.prefix4.s_addr = zvrf->rid_user_assigned.u.prefix4.s_addr;
  else if (!list_isempty (&rid_lo_sorted_list))  else if (!list_isempty (zvrf->rid_lo_sorted_list))
     {      {
      node = listtail (&rid_lo_sorted_list);      node = listtail (zvrf->rid_lo_sorted_list);
       c = listgetdata (node);        c = listgetdata (node);
       p->u.prefix4.s_addr = c->address->u.prefix4.s_addr;        p->u.prefix4.s_addr = c->address->u.prefix4.s_addr;
     }      }
  else if (!list_isempty (&rid_all_sorted_list))  else if (!list_isempty (zvrf->rid_all_sorted_list))
     {      {
      node = listtail (&rid_all_sorted_list);      node = listtail (zvrf->rid_all_sorted_list);
       c = listgetdata (node);        c = listgetdata (node);
       p->u.prefix4.s_addr = c->address->u.prefix4.s_addr;        p->u.prefix4.s_addr = c->address->u.prefix4.s_addr;
     }      }
 }  }
   
 static void  static void
router_id_set (struct prefix *p)router_id_set (struct prefix *p, vrf_id_t vrf_id)
 {  {
   struct prefix p2;    struct prefix p2;
   struct listnode *node;    struct listnode *node;
   struct zserv *client;    struct zserv *client;
     struct zebra_vrf *zvrf;
   
  rid_user_assigned.u.prefix4.s_addr = p->u.prefix4.s_addr;  if (p->u.prefix4.s_addr == 0) /* unset */
     {
       zvrf = vrf_info_lookup (vrf_id);
       if (! zvrf)
         return;
     }
   else /* set */
     zvrf = vrf_info_get (vrf_id);
   
  router_id_get (&p2);  zvrf->rid_user_assigned.u.prefix4.s_addr = p->u.prefix4.s_addr;
   
     router_id_get (&p2, vrf_id);
   
   for (ALL_LIST_ELEMENTS_RO (zebrad.client_list, node, client))    for (ALL_LIST_ELEMENTS_RO (zebrad.client_list, node, client))
    zsend_router_id_update (client, &p2);    zsend_router_id_update (client, &p2, vrf_id);
 }  }
   
 void  void
Line 123  router_id_add_address (struct connected *ifc) Line 131  router_id_add_address (struct connected *ifc)
   struct prefix before;    struct prefix before;
   struct prefix after;    struct prefix after;
   struct zserv *client;    struct zserv *client;
     struct zebra_vrf *zvrf = vrf_info_get (ifc->ifp->vrf_id);
   
   if (router_id_bad_address (ifc))    if (router_id_bad_address (ifc))
     return;      return;
   
  router_id_get (&before);  router_id_get (&before, zvrf->vrf_id);
   
   if (!strncmp (ifc->ifp->name, "lo", 2)    if (!strncmp (ifc->ifp->name, "lo", 2)
       || !strncmp (ifc->ifp->name, "dummy", 5))        || !strncmp (ifc->ifp->name, "dummy", 5))
    l = &rid_lo_sorted_list;    l = zvrf->rid_lo_sorted_list;
   else    else
    l = &rid_all_sorted_list;    l = zvrf->rid_all_sorted_list;
       
   if (!router_id_find_node (l, ifc))    if (!router_id_find_node (l, ifc))
     listnode_add_sort (l, ifc);      listnode_add_sort (l, ifc);
   
  router_id_get (&after);  router_id_get (&after, zvrf->vrf_id);
   
   if (prefix_same (&before, &after))    if (prefix_same (&before, &after))
     return;      return;
   
   for (ALL_LIST_ELEMENTS_RO (zebrad.client_list, node, client))    for (ALL_LIST_ELEMENTS_RO (zebrad.client_list, node, client))
    zsend_router_id_update (client, &after);    zsend_router_id_update (client, &after, zvrf->vrf_id);
 }  }
   
 void  void
Line 156  router_id_del_address (struct connected *ifc) Line 165  router_id_del_address (struct connected *ifc)
   struct prefix before;    struct prefix before;
   struct listnode *node;    struct listnode *node;
   struct zserv *client;    struct zserv *client;
     struct zebra_vrf *zvrf = vrf_info_get (ifc->ifp->vrf_id);
   
   if (router_id_bad_address (ifc))    if (router_id_bad_address (ifc))
     return;      return;
   
  router_id_get (&before);  router_id_get (&before, zvrf->vrf_id);
   
   if (!strncmp (ifc->ifp->name, "lo", 2)    if (!strncmp (ifc->ifp->name, "lo", 2)
       || !strncmp (ifc->ifp->name, "dummy", 5))        || !strncmp (ifc->ifp->name, "dummy", 5))
    l = &rid_lo_sorted_list;    l = zvrf->rid_lo_sorted_list;
   else    else
    l = &rid_all_sorted_list;    l = zvrf->rid_all_sorted_list;
   
   if ((c = router_id_find_node (l, ifc)))    if ((c = router_id_find_node (l, ifc)))
     listnode_delete (l, c);      listnode_delete (l, c);
   
  router_id_get (&after);  router_id_get (&after, zvrf->vrf_id);
   
   if (prefix_same (&before, &after))    if (prefix_same (&before, &after))
     return;      return;
   
   for (ALL_LIST_ELEMENTS_RO (zebrad.client_list, node, client))    for (ALL_LIST_ELEMENTS_RO (zebrad.client_list, node, client))
    zsend_router_id_update (client, &after);    zsend_router_id_update (client, &after, zvrf->vrf_id);
 }  }
   
 void  void
 router_id_write (struct vty *vty)  router_id_write (struct vty *vty)
 {  {
  if (rid_user_assigned.u.prefix4.s_addr)  struct zebra_vrf *zvrf;
    vty_out (vty, "router-id %s%s", inet_ntoa (rid_user_assigned.u.prefix4),  vrf_iter_t iter;
             VTY_NEWLINE);
   for (iter = vrf_first (); iter != VRF_ITER_INVALID; iter = vrf_next (iter))
     if ((zvrf = vrf_iter2info (iter)) != NULL)
       if (zvrf->rid_user_assigned.u.prefix4.s_addr)
         {
           if (zvrf->vrf_id == VRF_DEFAULT)
             vty_out (vty, "router-id %s%s",
                      inet_ntoa (zvrf->rid_user_assigned.u.prefix4),
                      VTY_NEWLINE);
           else
             vty_out (vty, "router-id %s vrf %u%s",
                      inet_ntoa (zvrf->rid_user_assigned.u.prefix4),
                      zvrf->vrf_id,
                      VTY_NEWLINE);
         }
 }  }
   
 DEFUN (router_id,  DEFUN (router_id,
Line 195  DEFUN (router_id, Line 219  DEFUN (router_id,
        "IP address to use for router-id\n")         "IP address to use for router-id\n")
 {  {
   struct prefix rid;    struct prefix rid;
     vrf_id_t vrf_id = VRF_DEFAULT;
   
   rid.u.prefix4.s_addr = inet_addr (argv[0]);    rid.u.prefix4.s_addr = inet_addr (argv[0]);
   if (!rid.u.prefix4.s_addr)    if (!rid.u.prefix4.s_addr)
Line 203  DEFUN (router_id, Line 228  DEFUN (router_id,
   rid.prefixlen = 32;    rid.prefixlen = 32;
   rid.family = AF_INET;    rid.family = AF_INET;
   
  router_id_set (&rid);  if (argc > 1)
     VTY_GET_INTEGER ("VRF ID", vrf_id, argv[1]);
   
     router_id_set (&rid, vrf_id);
   
   return CMD_SUCCESS;    return CMD_SUCCESS;
 }  }
   
   ALIAS (router_id,
          router_id_vrf_cmd,
          "router-id A.B.C.D " VRF_CMD_STR,
          "Manually set the router-id\n"
          "IP address to use for router-id\n"
          VRF_CMD_HELP_STR)
   
 DEFUN (no_router_id,  DEFUN (no_router_id,
        no_router_id_cmd,         no_router_id_cmd,
        "no router-id",         "no router-id",
Line 215  DEFUN (no_router_id, Line 250  DEFUN (no_router_id,
        "Remove the manually configured router-id\n")         "Remove the manually configured router-id\n")
 {  {
   struct prefix rid;    struct prefix rid;
     vrf_id_t vrf_id = VRF_DEFAULT;
   
   rid.u.prefix4.s_addr = 0;    rid.u.prefix4.s_addr = 0;
   rid.prefixlen = 0;    rid.prefixlen = 0;
   rid.family = AF_INET;    rid.family = AF_INET;
   
  router_id_set (&rid);  if (argc > 0)
     VTY_GET_INTEGER ("VRF ID", vrf_id, argv[0]);
   
     router_id_set (&rid, vrf_id);
   
   return CMD_SUCCESS;    return CMD_SUCCESS;
 }  }
   
   ALIAS (no_router_id,
          no_router_id_vrf_cmd,
          "no router-id " VRF_CMD_STR,
          NO_STR
          "Remove the manually configured router-id\n"
          VRF_CMD_HELP_STR)
   
 static int  static int
 router_id_cmp (void *a, void *b)  router_id_cmp (void *a, void *b)
 {  {
   const struct connected *ifa = (const struct connected *)a;    const struct connected *ifa = (const struct connected *)a;
   const struct connected *ifb = (const struct connected *)b;    const struct connected *ifb = (const struct connected *)b;
   unsigned int A = ntohl(ifa->address->u.prefix4.s_addr);  
   unsigned int B = ntohl(ifb->address->u.prefix4.s_addr);  
   
  return (int) (A - B);  return IPV4_ADDR_CMP(&ifa->address->u.prefix4.s_addr,&ifb->address->u.prefix4.s_addr);
 }  }
   
 void  void
router_id_init (void)router_id_cmd_init (void)
 {  {
   install_element (CONFIG_NODE, &router_id_cmd);    install_element (CONFIG_NODE, &router_id_cmd);
   install_element (CONFIG_NODE, &no_router_id_cmd);    install_element (CONFIG_NODE, &no_router_id_cmd);
     install_element (CONFIG_NODE, &router_id_vrf_cmd);
     install_element (CONFIG_NODE, &no_router_id_vrf_cmd);
   }
   
  memset (&rid_all_sorted_list, 0, sizeof (rid_all_sorted_list));void
  memset (&rid_lo_sorted_list, 0, sizeof (rid_lo_sorted_list));router_id_init (struct zebra_vrf *zvrf)
  memset (&rid_user_assigned, 0, sizeof (rid_user_assigned));{
   zvrf->rid_all_sorted_list = &zvrf->_rid_all_sorted_list;
   zvrf->rid_lo_sorted_list = &zvrf->_rid_lo_sorted_list;
   
  rid_all_sorted_list.cmp = router_id_cmp;  memset (zvrf->rid_all_sorted_list, 0, sizeof (zvrf->_rid_all_sorted_list));
  rid_lo_sorted_list.cmp = router_id_cmp;  memset (zvrf->rid_lo_sorted_list, 0, sizeof (zvrf->_rid_lo_sorted_list));
   memset (&zvrf->rid_user_assigned, 0, sizeof (zvrf->rid_user_assigned));
   
  rid_user_assigned.family = AF_INET;  zvrf->rid_all_sorted_list->cmp = router_id_cmp;
  rid_user_assigned.prefixlen = 32;  zvrf->rid_lo_sorted_list->cmp = router_id_cmp;
 
   zvrf->rid_user_assigned.family = AF_INET;
   zvrf->rid_user_assigned.prefixlen = 32;
 }  }
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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