diff -X .diff-exclude -u -r zebra-cvs-20020112-001.vanilla/ospf6d/ospf6_asbr.c zebra-cvs-20020112-001/ospf6d/ospf6_asbr.c --- zebra-cvs-20020112-001.vanilla/ospf6d/ospf6_asbr.c Fri Dec 21 15:51:44 2001 +++ zebra-cvs-20020112-001/ospf6d/ospf6_asbr.c Sat Jan 12 13:11:34 2002 @@ -471,7 +471,7 @@ "T" : "-")); vty_out (vty, " Bits: %s%s", buf, VTY_NEWLINE); - vty_out (vty, " Metric: %5hu%s", OSPF6_ASBR_METRIC (external), + vty_out (vty, " Metric: %5lu%s", OSPF6_ASBR_METRIC (external), VTY_NEWLINE); ospf6_prefix_options_str (external->prefix.prefix_options, diff -X .diff-exclude -u -r zebra-cvs-20020112-001.vanilla/ospf6d/ospf6_lsa.c zebra-cvs-20020112-001/ospf6d/ospf6_lsa.c --- zebra-cvs-20020112-001.vanilla/ospf6d/ospf6_lsa.c Tue Nov 20 03:14:35 2001 +++ zebra-cvs-20020112-001/ospf6d/ospf6_lsa.c Sat Jan 12 13:10:43 2002 @@ -406,7 +406,7 @@ type, VTY_NEWLINE); vty_out (vty, "Link State ID: %s%s", id, VTY_NEWLINE); vty_out (vty, "Advertising Router: %s%s", adv_router, VTY_NEWLINE); - vty_out (vty, "LS Sequence Number: %#x%s", ntohl (lsa->header->seqnum), + vty_out (vty, "LS Sequence Number: %#lx%s", ntohl (lsa->header->seqnum), VTY_NEWLINE); vty_out (vty, "CheckSum: %#hx Length: %hu%s", ntohs (lsa->header->checksum), ntohs (lsa->header->length), VTY_NEWLINE); diff -X .diff-exclude -u -r zebra-cvs-20020112-001.vanilla/ospf6d/ospf6_message.c zebra-cvs-20020112-001/ospf6d/ospf6_message.c --- zebra-cvs-20020112-001.vanilla/ospf6d/ospf6_message.c Mon Nov 19 19:14:30 2001 +++ zebra-cvs-20020112-001/ospf6d/ospf6_message.c Sat Jan 12 13:10:04 2002 @@ -75,7 +75,7 @@ ospf6_lsa_type_string (lsa_header->type, typebuf, sizeof (typebuf)), buf_id, buf_router); - zlog_info (" Age=%hu SeqNum=%#x Cksum=%#hx Len=%hu", + zlog_info (" Age=%hu SeqNum=%#lx Cksum=%#hx Len=%hu", ntohs (lsa_header->age), ntohl (lsa_header->seqnum), ntohs (lsa_header->checksum), ntohs (lsa_header->length)); } @@ -106,7 +106,7 @@ inet_ntop (AF_INET, &hello->dr, dr_str, sizeof (dr_str)); inet_ntop (AF_INET, &hello->bdr, bdr_str, sizeof (bdr_str)); - zlog_info (" IFID:%d Priority:%d Option:%s", + zlog_info (" IFID:%lu Priority:%d Option:%s", ntohl (hello->interface_id), hello->rtr_pri, "xxx"); zlog_info (" HelloInterval:%hu Deadinterval:%hu", ntohs (hello->hello_interval), @@ -144,7 +144,7 @@ ospf6_options_string (dbdesc->options, buffer, sizeof (buffer)); zlog_info (" Option:%s IFMTU:%hu", buffer, ntohs (dbdesc->ifmtu)); - zlog_info (" Bits:%s%s%s SeqNum:%#x", + zlog_info (" Bits:%s%s%s SeqNum:%#lx", (DD_IS_IBIT_SET (dbdesc->bits) ? "I" : "-"), (DD_IS_MBIT_SET (dbdesc->bits) ? "M" : "-"), (DD_IS_MSBIT_SET (dbdesc->bits) ? "m" : "s"), diff -X .diff-exclude -u -r zebra-cvs-20020112-001.vanilla/ospf6d/ospf6_neighbor.c zebra-cvs-20020112-001/ospf6d/ospf6_neighbor.c --- zebra-cvs-20020112-001.vanilla/ospf6d/ospf6_neighbor.c Thu Nov 15 09:09:26 2001 +++ zebra-cvs-20020112-001/ospf6d/ospf6_neighbor.c Sat Jan 12 13:07:53 2002 @@ -381,7 +381,7 @@ vty_out (vty, " His DRDecision: DR %s, BDR %s%s", hisdr, hisbdr, VTY_NEWLINE); vty_out (vty, " Last received DbDesc: opt:%s" - " ifmtu:%hu bit:%s%s%s seqnum:%d%s", + " ifmtu:%hu bit:%s%s%s seqnum:%lu%s", "xxx", ntohs (o6n->last_dd.ifmtu), (DD_IS_IBIT_SET (o6n->last_dd.bits) ? "I" : "-"), (DD_IS_MBIT_SET (o6n->last_dd.bits) ? "M" : "-"), diff -X .diff-exclude -u -r zebra-cvs-20020112-001.vanilla/ospfd/ospf_dump.c zebra-cvs-20020112-001/ospfd/ospf_dump.c --- zebra-cvs-20020112-001.vanilla/ospfd/ospf_dump.c Mon Aug 27 10:59:37 2001 +++ zebra-cvs-20020112-001/ospfd/ospf_dump.c Sat Jan 12 13:04:32 2002 @@ -221,7 +221,7 @@ zlog_info (" Options %d (%s)", hello->options, ospf_option_dump (hello->options, options, 24)); zlog_info (" RtrPriority %d", hello->priority); - zlog_info (" RtrDeadInterval %d", ntohl (hello->dead_interval)); + zlog_info (" RtrDeadInterval %lu", ntohl (hello->dead_interval)); zlog_info (" DRouter %s", inet_ntoa (hello->d_router)); zlog_info (" BDRouter %s", inet_ntoa (hello->bd_router)); @@ -255,7 +255,7 @@ LOOKUP (ospf_lsa_type_msg, lsah->type)); zlog_info (" Link State ID %s", inet_ntoa (lsah->id)); zlog_info (" Advertising Router %s", inet_ntoa (lsah->adv_router)); - zlog_info (" LS sequence number 0x%x", ntohl (lsah->ls_seqnum)); + zlog_info (" LS sequence number 0x%lx", ntohl (lsah->ls_seqnum)); zlog_info (" LS checksum 0x%x", ntohs (lsah->checksum)); zlog_info (" length %d", ntohs (lsah->length)); } @@ -398,7 +398,7 @@ ospf_option_dump (dd->options, options, 24)); zlog_info (" Flags %d (%s)", dd->flags, ospf_dd_flags_dump (dd->flags, dd_flags, 8)); - zlog_info (" Sequence Number 0x%08x", ntohl (dd->dd_seqnum)); + zlog_info (" Sequence Number 0x%08lx", ntohl (dd->dd_seqnum)); length -= OSPF_HEADER_SIZE + OSPF_DB_DESC_MIN_SIZE; @@ -562,7 +562,7 @@ zlog_info (" Cryptographic Authentication"); zlog_info (" Key ID %d", ospfh->u.crypt.key_id); zlog_info (" Auth Data Len %d", ospfh->u.crypt.auth_data_len); - zlog_info (" Sequence number %d", + zlog_info (" Sequence number %lu", ntohl (ospfh->u.crypt.crypt_seqnum)); break; default: diff -X .diff-exclude -u -r zebra-cvs-20020112-001.vanilla/ospfd/ospf_lsa.c zebra-cvs-20020112-001/ospfd/ospf_lsa.c --- zebra-cvs-20020112-001.vanilla/ospfd/ospf_lsa.c Wed Dec 19 21:24:29 2001 +++ zebra-cvs-20020112-001/ospfd/ospf_lsa.c Sat Jan 12 13:07:00 2002 @@ -3189,7 +3189,7 @@ { /* LSA common part show. */ vty_out (vty, "%-15s ", inet_ntoa (lsa->data->id)); - vty_out (vty, "%-15s %4d 0x%08x 0x%04x", + vty_out (vty, "%-15s %4d 0x%08lx 0x%04x", inet_ntoa (lsa->data->adv_router), LS_AGE (lsa), ntohl (lsa->data->ls_seqnum), ntohs (lsa->data->checksum)); /* LSA specific part show. */ @@ -3217,7 +3217,7 @@ p.prefixlen = ip_masklen (asel->mask); apply_mask_ipv4 (&p); - vty_out (vty, " %s %s/%d [0x%x]", + vty_out (vty, " %s %s/%d [0x%lx]", IS_EXTERNAL_METRIC (asel->e[0].tos) ? "E2" : "E1", inet_ntoa (p.prefix), p.prefixlen, ntohl (asel->e[0].route_tag)); @@ -3292,7 +3292,7 @@ LOOKUP (ospf_link_state_id_type_msg, lsa->data->type), VTY_NEWLINE); vty_out (vty, " Advertising Router: %s%s", inet_ntoa (lsa->data->adv_router), VTY_NEWLINE); - vty_out (vty, " LS Seq Number: %08x%s", ntohl (lsa->data->ls_seqnum), + vty_out (vty, " LS Seq Number: %08lx%s", ntohl (lsa->data->ls_seqnum), VTY_NEWLINE); vty_out (vty, " Checksum: 0x%04x%s", ntohs (lsa->data->checksum), VTY_NEWLINE); @@ -3456,7 +3456,7 @@ vty_out (vty, " Forward Address: %s%s", inet_ntoa (al->e[0].fwd_addr), VTY_NEWLINE); - vty_out (vty, " External Route Tag: %u%s%s", + vty_out (vty, " External Route Tag: %lu%s%s", ntohl (al->e[0].route_tag), VTY_NEWLINE, VTY_NEWLINE); } diff -X .diff-exclude -u -r zebra-cvs-20020112-001.vanilla/ospfd/ospfd.c zebra-cvs-20020112-001/ospfd/ospfd.c --- zebra-cvs-20020112-001.vanilla/ospfd/ospfd.c Sun Oct 28 09:37:21 2001 +++ zebra-cvs-20020112-001/ospfd/ospfd.c Sat Jan 12 13:05:27 2002 @@ -2168,7 +2168,7 @@ #endif /* HAVE_NSSA */ VTY_NEWLINE); else - vty_out (vty, "Area %d is %s%s", + vty_out (vty, "Area %lu is %s%s", ntohl (area_id.s_addr), #ifdef HAVE_NSSA area->external_routing == OSPF_AREA_NSSA?"nssa":"stub",