Diff for /embedaddon/quagga/ospfd/ospf_dump.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 17:26:12 version 1.1.1.2, 2012/05/29 11:53:41
Line 115  const struct message ospf_network_type_msg[] = Line 115  const struct message ospf_network_type_msg[] =
 };  };
 const int ospf_network_type_msg_max = OSPF_IFTYPE_MAX;  const int ospf_network_type_msg_max = OSPF_IFTYPE_MAX;
   
   /* AuType */
   const struct message ospf_auth_type_str[] =
   {
     { OSPF_AUTH_NULL,          "Null"          },
     { OSPF_AUTH_SIMPLE,        "Simple"        },
     { OSPF_AUTH_CRYPTOGRAPHIC, "Cryptographic" },
   };
   const size_t ospf_auth_type_str_max = sizeof (ospf_auth_type_str) /
     sizeof (ospf_auth_type_str[0]);
   
 /* Configuration debug option variables. */  /* Configuration debug option variables. */
 unsigned long conf_debug_ospf_packet[5] = {0, 0, 0, 0, 0};  unsigned long conf_debug_ospf_packet[5] = {0, 0, 0, 0, 0};
 unsigned long conf_debug_ospf_event = 0;  unsigned long conf_debug_ospf_event = 0;
Line 657  static void Line 667  static void
 ospf_header_dump (struct ospf_header *ospfh)  ospf_header_dump (struct ospf_header *ospfh)
 {  {
   char buf[9];    char buf[9];
     u_int16_t auth_type = ntohs (ospfh->auth_type);
   
   zlog_debug ("Header");    zlog_debug ("Header");
   zlog_debug ("  Version %d", ospfh->version);    zlog_debug ("  Version %d", ospfh->version);
   zlog_debug ("  Type %d (%s)", ospfh->type,    zlog_debug ("  Type %d (%s)", ospfh->type,
             ospf_packet_type_str[ospfh->type]);             LOOKUP (ospf_packet_type_str, ospfh->type));
   zlog_debug ("  Packet Len %d", ntohs (ospfh->length));    zlog_debug ("  Packet Len %d", ntohs (ospfh->length));
   zlog_debug ("  Router ID %s", inet_ntoa (ospfh->router_id));    zlog_debug ("  Router ID %s", inet_ntoa (ospfh->router_id));
   zlog_debug ("  Area ID %s", inet_ntoa (ospfh->area_id));    zlog_debug ("  Area ID %s", inet_ntoa (ospfh->area_id));
   zlog_debug ("  Checksum 0x%x", ntohs (ospfh->checksum));    zlog_debug ("  Checksum 0x%x", ntohs (ospfh->checksum));
  zlog_debug ("  AuType %d", ntohs (ospfh->auth_type));  zlog_debug ("  AuType %s", LOOKUP (ospf_auth_type_str, auth_type));
   
  switch (ntohs (ospfh->auth_type))  switch (auth_type)
     {      {
     case OSPF_AUTH_NULL:      case OSPF_AUTH_NULL:
       break;        break;
Line 1457  DEFUN (show_debugging_ospf, Line 1468  DEFUN (show_debugging_ospf,
     if (IS_DEBUG_OSPF_PACKET (i, SEND) && IS_DEBUG_OSPF_PACKET (i, RECV))      if (IS_DEBUG_OSPF_PACKET (i, SEND) && IS_DEBUG_OSPF_PACKET (i, RECV))
       {        {
         vty_out (vty, "  OSPF packet %s%s debugging is on%s",          vty_out (vty, "  OSPF packet %s%s debugging is on%s",
                 ospf_packet_type_str[i + 1],                 LOOKUP (ospf_packet_type_str, i + 1),
                  IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : "",                   IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : "",
                  VTY_NEWLINE);                   VTY_NEWLINE);
       }        }
Line 1465  DEFUN (show_debugging_ospf, Line 1476  DEFUN (show_debugging_ospf,
       {        {
         if (IS_DEBUG_OSPF_PACKET (i, SEND))          if (IS_DEBUG_OSPF_PACKET (i, SEND))
           vty_out (vty, "  OSPF packet %s send%s debugging is on%s",            vty_out (vty, "  OSPF packet %s send%s debugging is on%s",
                   ospf_packet_type_str[i + 1],                   LOOKUP (ospf_packet_type_str, i + 1),
                    IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : "",                     IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : "",
                    VTY_NEWLINE);                     VTY_NEWLINE);
         if (IS_DEBUG_OSPF_PACKET (i, RECV))          if (IS_DEBUG_OSPF_PACKET (i, RECV))
           vty_out (vty, "  OSPF packet %s receive%s debugging is on%s",            vty_out (vty, "  OSPF packet %s receive%s debugging is on%s",
                   ospf_packet_type_str[i + 1],                   LOOKUP (ospf_packet_type_str, i + 1),
                    IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : "",                     IS_DEBUG_OSPF_PACKET (i, DETAIL) ? " detail" : "",
                    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>