Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / isisd / iso_checksum.c

diff --git a/isisd/iso_checksum.c b/isisd/iso_checksum.c
index e0a4ba3700530a0cdd7c25c2282aa960bf04daa1..f12c19577bd72f8e3e0190a2e87df90a0319b935 100644 (file)
--- a/isisd/iso_checksum.c
+++ b/isisd/iso_checksum.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * IS-IS Rout(e)ing protocol - iso_checksum.c
  *                             ISO checksum related routines
@@ -5,20 +6,6 @@
  * Copyright (C) 2001,2002   Sampo Saaristo
  *                           Tampere University of Technology
  *                           Institute of Communications Engineering
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public Licenseas published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -45,11 +32,11 @@
  * Based on Annex C.4 of ISO/IEC 8473
  */
 
-int iso_csum_verify(u_char *buffer, int len, uint16_t csum, int offset)
+int iso_csum_verify(uint8_t *buffer, int len, uint16_t csum, int offset)
 {
-       u_int16_t checksum;
-       u_int32_t c0;
-       u_int32_t c1;
+       uint16_t checksum;
+       uint32_t c0;
+       uint32_t c1;
 
        c0 = csum & 0xff00;
        c1 = csum & 0x00ff;
@@ -67,7 +54,7 @@ int iso_csum_verify(u_char *buffer, int len, uint16_t csum, int offset)
                return 1;
 
        checksum = fletcher_checksum(buffer, len, offset);
-       if (checksum == csum)
+       if (checksum == htons(csum))
                return 0;
        return 1;
 }