You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/03/12 17:24:31 UTC
[incubator-nuttx] 05/07: net/igmp: Remove igmp_initialize
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4d0fcc2526cae74555719fba354da1b3a21acbd3
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Mar 12 13:23:37 2022 +0800
net/igmp: Remove igmp_initialize
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
net/igmp/igmp.h | 11 ++++++-----
net/igmp/igmp_initialize.c | 20 ++------------------
net/igmp/igmp_mcastmac.c | 7 ++++---
net/igmp/igmp_poll.c | 2 +-
net/igmp/igmp_send.c | 2 +-
net/net_initialize.c | 7 -------
6 files changed, 14 insertions(+), 35 deletions(-)
diff --git a/net/igmp/igmp.h b/net/igmp/igmp.h
index 11b0760..1f10717 100644
--- a/net/igmp/igmp.h
+++ b/net/igmp/igmp.h
@@ -131,8 +131,8 @@ extern "C"
# define EXTERN extern
#endif
-EXTERN in_addr_t g_ipv4_allsystems;
-EXTERN in_addr_t g_ipv4_allrouters;
+EXTERN const in_addr_t g_ipv4_allsystems;
+EXTERN const in_addr_t g_ipv4_allrouters;
/****************************************************************************
* Public Function Prototypes
@@ -272,7 +272,7 @@ void igmp_poll(FAR struct net_driver_s *dev);
****************************************************************************/
void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
- FAR in_addr_t *destipaddr, uint8_t msgid);
+ FAR const in_addr_t *destipaddr, uint8_t msgid);
/****************************************************************************
* Name: igmp_joingroup
@@ -359,7 +359,7 @@ bool igmp_cmptimer(FAR struct igmp_group_s *group, int maxticks);
*
****************************************************************************/
-void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip);
+void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR const in_addr_t *ip);
/****************************************************************************
* Name: igmp_removemcastmac
@@ -369,7 +369,8 @@ void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip);
*
****************************************************************************/
-void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip);
+void igmp_removemcastmac(FAR struct net_driver_s *dev,
+ FAR const in_addr_t *ip);
#undef EXTERN
#ifdef __cplusplus
diff --git a/net/igmp/igmp_initialize.c b/net/igmp/igmp_initialize.c
index 8281ee6..e53ab20 100644
--- a/net/igmp/igmp_initialize.c
+++ b/net/igmp/igmp_initialize.c
@@ -59,30 +59,14 @@
* Public Data
****************************************************************************/
-in_addr_t g_ipv4_allsystems;
-in_addr_t g_ipv4_allrouters;
+const in_addr_t g_ipv4_allsystems = HTONL(0xe0000001);
+const in_addr_t g_ipv4_allrouters = HTONL(0xe0000002);
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
- * Name: igmp_initialize
- *
- * Description:
- * Perform one-time IGMP initialization.
- *
- ****************************************************************************/
-
-void igmp_initialize(void)
-{
- ninfo("IGMP initializing\n");
-
- net_ipaddr(g_ipv4_allrouters, 224, 0, 0, 2);
- net_ipaddr(g_ipv4_allsystems, 224, 0, 0, 1);
-}
-
-/****************************************************************************
* Name: igmp_devinit
*
* Description:
diff --git a/net/igmp/igmp_mcastmac.c b/net/igmp/igmp_mcastmac.c
index 4a357fc..aa70a80 100644
--- a/net/igmp/igmp_mcastmac.c
+++ b/net/igmp/igmp_mcastmac.c
@@ -70,7 +70,7 @@
*
****************************************************************************/
-static void igmp_mcastmac(in_addr_t *ip, FAR uint8_t *mac)
+static void igmp_mcastmac(FAR const in_addr_t *ip, FAR uint8_t *mac)
{
/* This mapping is from the IETF IN RFC 1700 */
@@ -97,7 +97,7 @@ static void igmp_mcastmac(in_addr_t *ip, FAR uint8_t *mac)
*
****************************************************************************/
-void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip)
+void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR const in_addr_t *ip)
{
uint8_t mcastmac[6];
@@ -117,7 +117,8 @@ void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip)
*
****************************************************************************/
-void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip)
+void igmp_removemcastmac(FAR struct net_driver_s *dev,
+ FAR const in_addr_t *ip)
{
uint8_t mcastmac[6];
diff --git a/net/igmp/igmp_poll.c b/net/igmp/igmp_poll.c
index 22fe26d..a2824ca 100644
--- a/net/igmp/igmp_poll.c
+++ b/net/igmp/igmp_poll.c
@@ -90,7 +90,7 @@
static inline void igmp_sched_send(FAR struct net_driver_s *dev,
FAR struct igmp_group_s *group)
{
- in_addr_t *dest;
+ FAR const in_addr_t *dest;
/* REVISIT: This should be deferred to a work queue */
diff --git a/net/igmp/igmp_send.c b/net/igmp/igmp_send.c
index eab7b4f..4b52d3a 100644
--- a/net/igmp/igmp_send.c
+++ b/net/igmp/igmp_send.c
@@ -102,7 +102,7 @@ static uint16_t igmp_chksum(FAR uint8_t *buffer, int buflen)
****************************************************************************/
void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
- FAR in_addr_t *destipaddr, uint8_t msgid)
+ FAR const in_addr_t *destipaddr, uint8_t msgid)
{
FAR struct igmp_iphdr_s *ipv4 = IPv4BUF;
FAR struct igmp_hdr_s *igmp;
diff --git a/net/net_initialize.c b/net/net_initialize.c
index 00c87c4..23c6912 100644
--- a/net/net_initialize.c
+++ b/net/net_initialize.c
@@ -43,7 +43,6 @@
#include "ieee802154/ieee802154.h"
#include "can/can.h"
#include "netlink/netlink.h"
-#include "igmp/igmp.h"
#include "route/route.h"
#include "usrsock/usrsock.h"
@@ -158,12 +157,6 @@ void net_initialize(void)
#endif
#endif
-#ifdef CONFIG_NET_IGMP
- /* Initialize IGMP support */
-
- igmp_initialize();
-#endif
-
#ifdef CONFIG_NET_ROUTE
/* Initialize the routing table */