Diff for /embedaddon/quagga/ospf6d/ospf6_snmp.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2013/07/21 23:54:40 version 1.1.1.3, 2016/11/02 10:09:11
Line 40 Line 40
 #include "ospf6_interface.h"  #include "ospf6_interface.h"
 #include "ospf6_message.h"  #include "ospf6_message.h"
 #include "ospf6_neighbor.h"  #include "ospf6_neighbor.h"
   #include "ospf6_abr.h"
   #include "ospf6_asbr.h"
 #include "ospf6d.h"  #include "ospf6d.h"
 #include "ospf6_snmp.h"  #include "ospf6_snmp.h"
   
Line 488  ospfv3GeneralGroup (struct variable *v, oid *name, siz Line 490  ospfv3GeneralGroup (struct variable *v, oid *name, siz
     case OSPFv3DEMANDEXTENSIONS:      case OSPFv3DEMANDEXTENSIONS:
       return SNMP_INTEGER (0);  /* Not supported */        return SNMP_INTEGER (0);  /* Not supported */
     case OSPFv3REFERENCEBANDWIDTH:      case OSPFv3REFERENCEBANDWIDTH:
      return SNMP_INTEGER (100000);      if (ospf6)
         return SNMP_INTEGER (ospf6->ref_bandwidth);
       /* Otherwise, like for "not implemented". */
     case OSPFv3RESTARTSUPPORT:      case OSPFv3RESTARTSUPPORT:
     case OSPFv3RESTARTINTERVAL:      case OSPFv3RESTARTINTERVAL:
     case OSPFv3RESTARTSTRICTLSACHECKING:      case OSPFv3RESTARTSTRICTLSACHECKING:
Line 528  ospfv3AreaEntry (struct variable *v, oid *name, size_t Line 532  ospfv3AreaEntry (struct variable *v, oid *name, size_t
     return NULL;      return NULL;
   
   len = *length - v->namelen;    len = *length - v->namelen;
  len = (len >= 1 ? sizeof 1 : 0);  len = (len >= 1 ? 1 : 0);
   if (exact && len != 1)    if (exact && len != 1)
     return NULL;      return NULL;
   if (len)    if (len)
Line 619  ospfv3WwLsdbEntry (struct variable *v, oid *name, size Line 623  ospfv3WwLsdbEntry (struct variable *v, oid *name, size
                      int exact, size_t *var_len, WriteMethod **write_method)                       int exact, size_t *var_len, WriteMethod **write_method)
 {  {
   struct ospf6_lsa *lsa = NULL;    struct ospf6_lsa *lsa = NULL;
  u_int32_t ifindex, area_id, id, instid, adv_router;  ifindex_t ifindex, area_id, id, instid, adv_router;
   u_int16_t type;    u_int16_t type;
   int len;    int len;
   oid *offset;    oid *offset;
   int offsetlen;    int offsetlen;
  char a[16], b[16], c[16];  struct ospf6_area *oa = NULL;
  struct ospf6_area *oa; 
   struct listnode *node;    struct listnode *node;
   struct interface *iif;    struct interface *iif;
   struct ospf6_interface *oi = NULL;    struct ospf6_interface *oi = NULL;
Line 832  static u_char * Line 835  static u_char *
 ospfv3IfEntry (struct variable *v, oid *name, size_t *length,  ospfv3IfEntry (struct variable *v, oid *name, size_t *length,
                 int exact, size_t *var_len, WriteMethod **write_method)                  int exact, size_t *var_len, WriteMethod **write_method)
 {  {
  unsigned int ifindex, instid;  ifindex_t ifindex = 0;
   unsigned int instid = 0;
   struct ospf6_interface *oi = NULL;    struct ospf6_interface *oi = NULL;
   struct ospf6_lsa *lsa = NULL;    struct ospf6_lsa *lsa = NULL;
   struct interface      *iif;    struct interface      *iif;
Line 846  ospfv3IfEntry (struct variable *v, oid *name, size_t * Line 850  ospfv3IfEntry (struct variable *v, oid *name, size_t *
       == MATCH_FAILED)        == MATCH_FAILED)
     return NULL;      return NULL;
   
   ifindex = instid = 0;  
   
   /* Check OSPFv3 instance. */    /* Check OSPFv3 instance. */
   if (ospf6 == NULL)    if (ospf6 == NULL)
     return NULL;      return NULL;
Line 985  static u_char * Line 987  static u_char *
 ospfv3NbrEntry (struct variable *v, oid *name, size_t *length,  ospfv3NbrEntry (struct variable *v, oid *name, size_t *length,
                 int exact, size_t *var_len, WriteMethod **write_method)                  int exact, size_t *var_len, WriteMethod **write_method)
 {  {
  unsigned int ifindex, instid, rtrid;  ifindex_t ifindex = 0;
   unsigned int instid, rtrid;
   struct ospf6_interface *oi = NULL;    struct ospf6_interface *oi = NULL;
   struct ospf6_neighbor  *on = NULL;    struct ospf6_neighbor  *on = NULL;
   struct interface      *iif;    struct interface      *iif;
Line 998  ospfv3NbrEntry (struct variable *v, oid *name, size_t  Line 1001  ospfv3NbrEntry (struct variable *v, oid *name, size_t 
       == MATCH_FAILED)        == MATCH_FAILED)
     return NULL;      return NULL;
   
  ifindex = instid = rtrid = 0;  instid = rtrid = 0;
   
   /* Check OSPFv3 instance. */    /* Check OSPFv3 instance. */
   if (ospf6 == NULL)    if (ospf6 == NULL)

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


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