Cleanup and refactoring

Author: Emil Popov

source/FreeRTOS_IGMP.c

@@ -676,7 +676,7 @@ void vIPNetworkUpCalls( struct xNetworkEndPoint * pxEndPoint )
                 if( NULL != ( pxMRD = ( MCastReportData_t * ) pvPortMalloc( sizeof( MCastReportData_t ) ) ) )
                 {
                     listSET_LIST_ITEM_OWNER( &( pxMRD->xListItem ), ( void * ) pxMRD );
-                    pxMRD->pxEndPoint = pxEndPoint;
+                    pxMRD->pxInterface = pxEndPoint->pxNetworkInterface;
                     pxMRD->xMCastGroupAddress.xIs_IPv6 = pdTRUE_UNSIGNED;
 
                     /* Generate the solicited-node multicast address in the form of
@@ -718,9 +718,9 @@ void vIPNetworkUpCalls( struct xNetworkEndPoint * pxEndPoint )
          * they will soon ask us for reports anyways, so sending these unsolicited reports is not required. It simply enhances the user
          * experience by shortening the time it takes before we begin receiving the multicasts that we care for. */
         /* _EP_: vRescheduleAllMulticastReports() is NOT declared in header files because I don't want to expose it to the user */
-        extern void vRescheduleAllMulticastReports( NetworkEndPoint_t * pxEndPoint,
+        extern void vRescheduleAllMulticastReports( NetworkInterface_t * pxInterface,
                                                     BaseType_t xMaxCountdown );
-        vRescheduleAllMulticastReports( pxEndPoint, 5 );
+        vRescheduleAllMulticastReports( pxEndPoint->pxNetworkInterface, 5 );
     #endif /* ( ipconfigSUPPORT_IP_MULTICAST != 0 ) */
 
     #if ( ipconfigUSE_NETWORK_EVENT_HOOK == 1 )

source/FreeRTOS_IP.c

@@ -6432,7 +6432,7 @@ void * pvSocketGetSocketID( const ConstSocket_t xSocket )
                 if( ( pxSocket->ucProtocol != ( uint8_t ) FREERTOS_IPPROTO_UDP ) ||
                     ( uxOptionLength != sizeof( uint8_t ) ) )
                 {
-                    break;     /* will return -pdFREERTOS_ERRNO_EINVAL */
+                    break; /* will return -pdFREERTOS_ERRNO_EINVAL */
                 }
 
                 /* Set the new TTL/HOPS value. */
@@ -6508,8 +6508,7 @@ void * pvSocketGetSocketID( const ConstSocket_t xSocket )
                     * Store the IP version information in the report so the timer event knows whether to send an IGMP or MLD report. */
                    pxMRD->xMCastGroupAddress.xIs_IPv6 = pxSocket->bits.bIsIPv6;
                    listSET_LIST_ITEM_OWNER( &( pxMRD->xListItem ), ( void * ) pxMRD );
-                   /* Quick and dirty assignment of end-point. This will probably have to be re-designed and re-done. */
-                   pxMRD->pxEndPoint = ( pxSocket->bits.bIsIPv6 ) ? FreeRTOS_FirstEndPoint_IPv6( FreeRTOS_FirstNetworkInterface() ) : FreeRTOS_FirstEndPoint( FreeRTOS_FirstNetworkInterface() );
+                   pxMRD->pxInterface = pMReq->pxMulticastNetIf;
 
                    /* Pass the multicast report data inside the multicast group descriptor,
                     * so we can easily pass it to the IP task in one message. */
@@ -6574,7 +6573,7 @@ void * pvSocketGetSocketID( const ConstSocket_t xSocket )
                    if( pMReq->pxMulticastNetIf != pxSocket->u.xUDP.pxMulticastNetIf )
                    {
                        /* The socket was not subscribed on this interface. */
-                       break;  /* will return -pdFREERTOS_ERRNO_EINVAL */
+                       break; /* will return -pdFREERTOS_ERRNO_EINVAL */
                    }
 
                    /* Allocate some RAM to remember the multicast group that is being dropped */

source/FreeRTOS_Sockets.c

@@ -3308,7 +3308,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-/* 
+/*
  * ipconfigSUPPORT_IP_MULTICAST
  *
  * Type: BaseType_t ( ipconfigENABLE | ipconfigDISABLE )
@@ -3321,7 +3321,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-/* 
+/*
  * ipconfigMULTICAST_DEFAULT_TTL
  *
  * Type: uint8_t
@@ -3331,7 +3331,7 @@
  * Specifies the TTL value that will be used for multicast
  * UDP packets by default. Can be overridden per socket by
  * setting the FREERTOS_SO_IP_MULTICAST_TTL socket option or by
- * setting the FREERTOS_SO_IPV6_MULTICAST_HOPS in case of an IPv6 socket. 
+ * setting the FREERTOS_SO_IPV6_MULTICAST_HOPS in case of an IPv6 socket.
  * Please note that in certain situations, RFCs or standards may require
  * a certain value to be used,like in Neighbor Solicitation where the hop
  * limit field must be set to 255. In those cases, the value is hard-coded
@@ -3342,7 +3342,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-/* 
+/*
  * ipconfigSUPPORT_IP_MULTICAST
  *
  * Type: BaseType_t ( ipconfigENABLE | ipconfigDISABLE )

source/include/FreeRTOSIPConfigDefaults.h

@@ -91,9 +91,6 @@
     BaseType_t xAddIGMPReportToList( MCastReportData_t * pNewEntry );
     eFrameProcessingResult_t eProcessIGMPPacket( NetworkBufferDescriptor_t * const pxNetworkBuffer );
     void vProcessMLDPacket( NetworkBufferDescriptor_t * const pxNetworkBuffer );
-    BaseType_t xSendMulticastListenerReport_v1( const IPv6_Address_t * pxGroupAddress,
-                                                NetworkEndPoint_t * pxEndPoint,
-                                                TickType_t uxBlockTimeTicks );
     void prvDropMulticastMembership( FreeRTOS_Socket_t * pxSocket ); /* move to Sockets.c as static */
 
 

source/include/FreeRTOS_IGMP.h

@@ -71,7 +71,7 @@
     {
         IPv46_Address_t xMCastGroupAddress; /**< Holds the IPv4/IPv6 multicast group address. xMCastGroupAddress.xIs_IPv6 denotes whether this represents and IGMP or MLD report. */
         ListItem_t xListItem;               /**< List item for adding to the global list of reports. */
-        NetworkEndPoint_t * pxEndPoint;     /**< The end-point whose source address will be send for sending this report. NULL to send on the first end-point of every interface. */
+        NetworkInterface_t * pxInterface;   /**< The network interface used for sending this report. NULL to send on all interfaces. */
         BaseType_t xNumSockets;             /**< The number of sockets that are subscribed to this multicast group. */
         BaseType_t xCountDown;
     } MCastReportData_t;