summaryrefslogtreecommitdiffstats
path: root/ospf6d/ospf6_lsa.c
diff options
context:
space:
mode:
authorhasso <hasso>2004-09-29 00:26:19 +0000
committerhasso <hasso>2004-09-29 00:26:19 +0000
commit03d52f8d6ccb4bcb17ab8d098468a8e112c910a4 (patch)
tree7bc2e2b3738923597bbab593029152b5bceff8e1 /ospf6d/ospf6_lsa.c
parentaa0b9f912dc1057261fa02fbf5d458f222900af6 (diff)
downloadquagga-03d52f8d6ccb4bcb17ab8d098468a8e112c910a4.tar.bz2
quagga-03d52f8d6ccb4bcb17ab8d098468a8e112c910a4.tar.xz
Merge svn revision 1048 from Zebra cvs. Also add missing sokopt.h include
to ospf6_network.h.
Diffstat (limited to 'ospf6d/ospf6_lsa.c')
-rw-r--r--ospf6d/ospf6_lsa.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index 6cc6f4de..da732798 100644
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -51,8 +51,8 @@ ospf6_unknown_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
u_char *start, *end, *current;
char byte[4];
- start = (char *) lsa->header + sizeof (struct ospf6_lsa_header);
- end = (char *) lsa->header + ntohs (lsa->header->length);
+ start = (u_char *) lsa->header + sizeof (struct ospf6_lsa_header);
+ end = (u_char *) lsa->header + ntohs (lsa->header->length);
vty_out (vty, " Unknown contents:%s", VNL);
for (current = start; current < end; current ++)
@@ -366,8 +366,8 @@ ospf6_lsa_show_dump (struct vty *vty, struct ospf6_lsa *lsa)
u_char *start, *end, *current;
char byte[4];
- start = (char *) lsa->header;
- end = (char *) lsa->header + ntohs (lsa->header->length);
+ start = (u_char *) lsa->header;
+ end = (u_char *) lsa->header + ntohs (lsa->header->length);
vty_out (vty, "%s", VNL);
vty_out (vty, "%s:%s", lsa->name, VNL);
@@ -670,7 +670,7 @@ ospf6_lsa_checksum (struct ospf6_lsa_header *lsa_header)
lsa_header->checksum = 0;
length = ntohs (lsa_header->length) - 2;
- sp = (char *) &lsa_header->type;
+ sp = (u_char *) &lsa_header->type;
for (ep = sp + length; sp < ep; sp = q)
{