fix: 1. pesudo --> pseudo (typo)

	2. added outer parenthesis
(net.h/net.c: fix 'pesudo' typo in function name; add missing outer parens to IP_VHL macro 283)

diff --git a/src/lib/util/net.c b/src/lib/util/net.c
index b5b0fba1aa6ea8abf79fe3b17863610a281c6f4f..b1e18916224637527c9bc1b13cee5c6d36fc08ed 100644 (file)
--- a/src/lib/util/net.c
+++ b/src/lib/util/net.c
@@ -166,7 +166,7 @@ uint16_t fr_ip_header_checksum(uint8_t const *data, uint8_t ihl)
        return ((uint16_t) ~sum);
 }
 
-uint16_t fr_ip6_pesudo_header_checksum(struct in6_addr const *src, struct in6_addr const *dst, uint16_t ip_len, uint8_t ip_next)
+uint16_t fr_ip6_pseudo_header_checksum(struct in6_addr const *src, struct in6_addr const *dst, uint16_t ip_len, uint8_t ip_next)
 {
        uint64_t sum = 0;
        ip_pseudo_header6_t ip6; /* Keep correct alignment for the pointer */

diff --git a/src/lib/util/net.h b/src/lib/util/net.h
index 899696e4002696895ff825487cfd97a2d5fd7d67..76ee6ab659fff7a02be99a8d7195b65d95283e16 100644 (file)
--- a/src/lib/util/net.h
+++ b/src/lib/util/net.h
@@ -92,7 +92,7 @@ typedef enum {
 #define IP_V(ip)       (((ip)->ip_vhl & 0xf0) >> 4)
 #define IP_HL(ip)       (((ip)->ip_vhl & 0x0f) << 2)
 
-#define IP_VHL(v, hl) ((v & 0x0f) << 4) | (hl & 0x0f)
+#define IP_VHL(v, hl) (((v & 0x0f) << 4) | (hl & 0x0f))
 
 #define        I_DF            0x4000          //!< Dont fragment flag.
 #define IP_MF          0x2000          //!< More fragments flag.
@@ -153,7 +153,7 @@ uint16_t    fr_udp_checksum(uint8_t const *data, uint16_t len, uint16_t checksum,
                                struct in_addr const src_addr, struct in_addr const dst_addr);
 int            fr_udp_header_check(uint8_t const *data, uint16_t remaining, ip_header_t const *ip);
 uint16_t       fr_ip_header_checksum(uint8_t const *data, uint8_t ihl);
-uint16_t       fr_ip6_pesudo_header_checksum(struct in6_addr const *src, struct in6_addr const *dst, uint16_t ip_len, uint8_t ip_next);
+uint16_t       fr_ip6_pseudo_header_checksum(struct in6_addr const *src, struct in6_addr const *dst, uint16_t ip_len, uint8_t ip_next);
 
 #ifdef __cplusplus
 }

diff --git a/src/modules/rlm_icmp/rlm_icmp.c b/src/modules/rlm_icmp/rlm_icmp.c
index 246c943047f43ad0c8b6ce1fc8e838e6f51ea534..a3e34730b352adc147d5af973cf2860dbee91066 100644 (file)
--- a/src/modules/rlm_icmp/rlm_icmp.c
+++ b/src/modules/rlm_icmp/rlm_icmp.c
@@ -234,7 +234,7 @@ static xlat_action_t xlat_icmp(TALLOC_CTX *ctx, UNUSED fr_dcursor_t *out,
         *      Start off with the IPv6 pseudo-header checksum
         */
        if (t->ipaddr_type == FR_TYPE_IPV6_ADDR) {
-               checksum = fr_ip6_pesudo_header_checksum(&inst->src_ipaddr.addr.v6, &echo->ip->vb_ip.addr.v6,
+               checksum = fr_ip6_pseudo_header_checksum(&inst->src_ipaddr.addr.v6, &echo->ip->vb_ip.addr.v6,
                                                         sizeof(ip_header6_t) + sizeof(icmp), IPPROTO_ICMPV6);
        }