diff options
| author | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-09 20:02:27 +0000 |
|---|---|---|
| committer | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-09 20:02:27 +0000 |
| commit | 120e91359392aa18f257cd88e77d762c32eb8a4f (patch) | |
| tree | e367f821165554a8dced5e8bcba8a9eedfc69778 /ospf6d/ospf6_lsa.c | |
| parent | aa04a120d60b4001bb6224a7efd6d49fec7ec622 (diff) | |
| parent | cc2dd9280c4456586080d1cf4537d26c02fa9a36 (diff) | |
| download | quagga-120e91359392aa18f257cd88e77d762c32eb8a4f.tar.bz2 quagga-120e91359392aa18f257cd88e77d762c32eb8a4f.tar.xz | |
Merge remote branch 'quagga/master' of /git/quagga.euro-ix
Diffstat (limited to 'ospf6d/ospf6_lsa.c')
| -rw-r--r-- | ospf6d/ospf6_lsa.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index 07d9f91e..c1db3741 100644 --- a/ospf6d/ospf6_lsa.c +++ b/ospf6d/ospf6_lsa.c @@ -256,7 +256,7 @@ ospf6_lsa_premature_aging (struct ospf6_lsa *lsa) int ospf6_lsa_compare (struct ospf6_lsa *a, struct ospf6_lsa *b) { - signed long seqnuma, seqnumb; + int seqnuma, seqnumb; u_int16_t cksuma, cksumb; u_int16_t agea, ageb; @@ -264,16 +264,13 @@ ospf6_lsa_compare (struct ospf6_lsa *a, struct ospf6_lsa *b) assert (b && b->header); assert (OSPF6_LSA_IS_SAME (a, b)); - seqnuma = ((signed long) ntohl (a->header->seqnum)) - - (signed long) INITIAL_SEQUENCE_NUMBER; - seqnumb = ((signed long) ntohl (b->header->seqnum)) - - (signed long) INITIAL_SEQUENCE_NUMBER; + seqnuma = (int) ntohl (a->header->seqnum); + seqnumb = (int) ntohl (b->header->seqnum); /* compare by sequence number */ - /* XXX, LS sequence number wrapping */ if (seqnuma > seqnumb) return -1; - else if (seqnuma < seqnumb) + if (seqnuma < seqnumb) return 1; /* Checksum */ |