net: ip: utils: changed input arguments of igmp_checksum to net_pkt

Added igmpv3 checksum function to make it possible to calculate the
checksum of a complete igmpv3 pkt at once.

Signed-off-by: Ibe Van de Veire <[email protected]>

Author: IVandeVeire

subsys/net/ip/Kconfig.ipv4

@@ -50,7 +50,7 @@ config NET_IPV4_ACCEPT_ZERO_BROADCAST
 	  0.0.0.0 broadcast address as described in RFC 1122 ch. 3.3.6
 
 config NET_IPV4_IGMP
-	bool "Internet Group Management Protocol (IGMP) support"
+	bool "Internet Group Management Protocol (IGMPv2) support"
 	select NET_IPV4_HDR_OPTIONS
 	help
 	  The value depends on your network needs. IGMP should normally be
@@ -59,6 +59,12 @@ config NET_IPV4_IGMP
 	  because IP Router Alert option must be sent.
 	  See RFC 2236 for details.
 
+config NET_IPV4_IGMPV3
+	bool "Internet Group Management Protocol version 3 (IGMPv3) support"
+	depends on NET_IPV4_IGMP
+	help
+	  Use IGMPv3 for managing the multicast groups.
+
 config NET_DHCPV4
 	bool "DHCPv4 client"
 	select NET_MGMT

subsys/net/ip/igmp.c

@@ -56,7 +56,7 @@ static int igmp_v2_create(struct net_pkt *pkt, const struct in_addr *addr,
 	igmp->max_rsp = 0U;
 	net_ipaddr_copy(&igmp->address, addr);
 	igmp->chksum = 0;
-	igmp->chksum = net_calc_chksum_igmp((uint8_t *)igmp, sizeof(*igmp));
+	igmp->chksum = net_calc_chksum_igmp(pkt);
 
 	if (net_pkt_set_data(pkt, &igmp_access)) {
 		return -ENOBUFS;
@@ -217,8 +217,7 @@ enum net_verdict net_ipv4_igmp_input(struct net_pkt *pkt,
 		return NET_DROP;
 	}
 
-	if (net_calc_chksum_igmp((uint8_t *)igmp_hdr,
-				 sizeof(*igmp_hdr)) != 0U) {
+	if (net_calc_chksum_igmp(pkt)) {
 		NET_DBG("DROP: Invalid checksum");
 		goto drop;
 	}

subsys/net/ip/net_private.h

@@ -230,12 +230,12 @@ void net_ipv4_igmp_init(struct net_if *iface);
 #endif /* CONFIG_NET_IPV4_IGMP */
 
 #if defined(CONFIG_NET_IPV4_IGMP)
-uint16_t net_calc_chksum_igmp(uint8_t *data, size_t len);
+uint16_t net_calc_chksum_igmp(struct net_pkt *pkt);
 enum net_verdict net_ipv4_igmp_input(struct net_pkt *pkt,
 				     struct net_ipv4_hdr *ip_hdr);
 #else
 #define net_ipv4_igmp_input(...)
-#define net_calc_chksum_igmp(data, len) 0U
+#define net_calc_chksum_igmp(struct net_pkt *pkt) 0U
 #endif /* CONFIG_NET_IPV4_IGMP */
 
 static inline uint16_t net_calc_chksum_icmpv6(struct net_pkt *pkt)

subsys/net/ip/utils.c

@@ -644,7 +644,7 @@ uint16_t net_calc_chksum(struct net_pkt *pkt, uint8_t proto)
 
 	if (IS_ENABLED(CONFIG_NET_IPV4) &&
 	    net_pkt_family(pkt) == AF_INET) {
-		if (proto != IPPROTO_ICMP) {
+		if (proto != IPPROTO_ICMP && proto != IPPROTO_IGMP) {
 			len = 2 * sizeof(struct in_addr);
 			sum = net_pkt_get_len(pkt) -
 				net_pkt_ip_hdr_len(pkt) -
@@ -700,14 +700,9 @@ uint16_t net_calc_chksum_ipv4(struct net_pkt *pkt)
 #endif /* CONFIG_NET_IPV4 */
 
 #if defined(CONFIG_NET_IPV4_IGMP)
-uint16_t net_calc_chksum_igmp(uint8_t *data, size_t len)
+uint16_t net_calc_chksum_igmp(struct net_pkt *pkt)
 {
-	uint16_t sum;
-
-	sum = calc_chksum(0, data, len);
-	sum = (sum == 0U) ? 0xffff : htons(sum);
-
-	return ~sum;
+	return net_calc_chksum(pkt, IPPROTO_IGMP);
 }
 #endif /* CONFIG_NET_IPV4_IGMP */