Master sample: fix the failure in detecting the slave duplication

Signed-off-by: Hongmei Gou <a0271529@ti.com>

diff --git a/CCIEF-BASIC_Master/sample/include/CCIEF_BASIC_MASTER.h b/CCIEF-BASIC_Master/sample/include/CCIEF_BASIC_MASTER.h
index e4fe54b35473c795c3528c2c04dfa2f48ecdbd22..c892115c5df1725e7a42519bd54b0e1a97aae51a 100644 (file)
--- a/CCIEF-BASIC_Master/sample/include/CCIEF_BASIC_MASTER.h
+++ b/CCIEF-BASIC_Master/sample/include/CCIEF_BASIC_MASTER.h
@@ -87,6 +87,7 @@
 #define        CCIEF_BASIC_SLAVE_DUPLICATION_DETECT                            1                       /* Slave dupsication detect. */
 #define        CCIEF_BASIC_SLAVE_RESPONSE_NOT_RECEIVED                         0                       /* Response not receive. */
 #define        CCIEF_BASIC_SLAVE_RESPONSE_RECEIVED                                     1                       /* Response receive. */
 #define        CCIEF_BASIC_SLAVE_DUPLICATION_DETECT                            1                       /* Slave dupsication detect. */
 #define        CCIEF_BASIC_SLAVE_RESPONSE_NOT_RECEIVED                         0                       /* Response not receive. */
 #define        CCIEF_BASIC_SLAVE_RESPONSE_RECEIVED                                     1                       /* Response receive. */

+#define CCIEF_BASIC_PACKET_COUNT_MAX                                                    64                      /* Number of packets to processed per main loop */

 
 /*[ Definition for CCIEF-BASIC state ]*/
 /* Master */
 
 /*[ Definition for CCIEF-BASIC state ]*/
 /* Master */

diff --git a/CCIEF-BASIC_Master/sample/src/CCIEF_BASIC_MASTER.c b/CCIEF-BASIC_Master/sample/src/CCIEF_BASIC_MASTER.c
index a0ef65db3760e237b772bbecd88bc7e179972338..23eb77436d2a73b66abe22e9bd3a319c91bfb054 100644 (file)
--- a/CCIEF-BASIC_Master/sample/src/CCIEF_BASIC_MASTER.c
+++ b/CCIEF-BASIC_Master/sample/src/CCIEF_BASIC_MASTER.c
@@ -675,8 +675,8 @@ int ccief_basic_master_recv( void )
        uint32_t                ulRecvAddr;
        uint16_t                usRecvPortNumber;
        struct in_addr  addr;
        uint32_t                ulRecvAddr;
        uint16_t                usRecvPortNumber;
        struct in_addr  addr;

-       SLMP_INFO               source = { 0 }; /* SLMP Infomation for received packet */
-       int                             iErrCode = 0;
+       SLMP_INFO               source; /* SLMP Infomation for received packet */
+       int                             iErrCode;

        int                             i;
        char                    Ipaddr[16];
 #ifdef _WIN32
        int                             i;
        char                    Ipaddr[16];
 #ifdef _WIN32


@@ -684,6 +684,7 @@ int ccief_basic_master_recv( void )
        uint32_t                ulMyNetAddress;
        uint32_t                ulOtherNetAddress;
 #endif
        uint32_t                ulMyNetAddress;
        uint32_t                ulOtherNetAddress;
 #endif

+        uint16_t                usPacketCount = 0;      /* Number of processed packets */

 
        /* Check the socket */
        if ( sock == INVALID_SOCKET ) {
 
        /* Check the socket */
        if ( sock == INVALID_SOCKET ) {


@@ -691,9 +692,14 @@ int ccief_basic_master_recv( void )
        }
 
        /* Packet receiving */
        }
 
        /* Packet receiving */

-       iErrCode = socket_recv( sock, aucRecvPacket, sizeof( aucRecvPacket ), &ulRecvAddr, &usRecvPortNumber );
-       if ( iErrCode != SOCKET_ERR_OK )
-       {
+        while ( usPacketCount <= CCIEF_BASIC_PACKET_COUNT_MAX )
+        {
+            memset( &source, 0, sizeof(SLMP_INFO) );
+            iErrCode = 0;
+
+           iErrCode = socket_recv( sock, aucRecvPacket, sizeof( aucRecvPacket ), &ulRecvAddr, &usRecvPortNumber );
+           if ( iErrCode != SOCKET_ERR_OK )
+           {

                if ( iErrCode == SOCKET_ERR_NO_RECEIVABLE )
                {
                        return CCIEF_BASIC_MASTER_ERR_OK;
                if ( iErrCode == SOCKET_ERR_NO_RECEIVABLE )
                {
                        return CCIEF_BASIC_MASTER_ERR_OK;


@@ -702,36 +708,36 @@ int ccief_basic_master_recv( void )
                {
                        return iErrCode;
                }
                {
                        return iErrCode;
                }

-       }
+           }

 
 #ifdef _WIN32
 #elif __linux__
 
 #ifdef _WIN32
 #elif __linux__

-       ulMyNetAddress = ( Master.ulIpAddress & Master.ulSubnetMask );
-       ulOtherNetAddress = ( ulRecvAddr & Master.ulSubnetMask );
+           ulMyNetAddress = ( Master.ulIpAddress & Master.ulSubnetMask );
+           ulOtherNetAddress = ( ulRecvAddr & Master.ulSubnetMask );

 
 

-       /* Other network broadcast break*/
-       if( ulMyNetAddress != ulOtherNetAddress )
-       {
+           /* Other network broadcast break*/
+           if( ulMyNetAddress != ulOtherNetAddress )
+           {

                return CCIEF_BASIC_MASTER_ERR_OK;
                return CCIEF_BASIC_MASTER_ERR_OK;

-       }
+           }

 #endif
 
 
 #endif
 
 

-       /* Sets the SLMP Information for receiving. */
-       source.pucData = aucRecvData;
+           /* Sets the SLMP Information for receiving. */
+           source.pucData = aucRecvData;

 
 

-       /* Get the SLMP Information from the request packet using the SLMP library. */
-       iErrCode = SLMP_GetSlmpInfo( &source, aucRecvPacket );
-       if ( iErrCode != SLMP_ERR_OK )
-       {
+           /* Get the SLMP Information from the request packet using the SLMP library. */
+           iErrCode = SLMP_GetSlmpInfo( &source, aucRecvPacket );
+           if ( iErrCode != SLMP_ERR_OK )
+           {

                /* Invalid SLMP Frame. */
                printf( "ERR : Invalid SLMP frame received!\n" );
                return CCIEF_BASIC_MASTER_ERR_OK;
                /* Invalid SLMP Frame. */
                printf( "ERR : Invalid SLMP frame received!\n" );
                return CCIEF_BASIC_MASTER_ERR_OK;

-       }
+           }

 
 

-       /* Check the SLMP frame. */
-       if ( source.ulFrameType == SLMP_FTYPE_BIN_RES_ST )
-       {
+           /* Check the SLMP frame. */
+           if ( source.ulFrameType == SLMP_FTYPE_BIN_RES_ST )
+           {

                /* Response of the SLMP frame */
                if ( source.usEndCode == SLMP_ERR_OK )
                {
                /* Response of the SLMP frame */
                if ( source.usEndCode == SLMP_ERR_OK )
                {


@@ -748,9 +754,9 @@ int ccief_basic_master_recv( void )
                        inet_ntop(AF_INET, &addr, Ipaddr, sizeof(Ipaddr) );
                        printf( "ERR : EndCode %04X from %s!\n", source.usEndCode, Ipaddr );
                }
                        inet_ntop(AF_INET, &addr, Ipaddr, sizeof(Ipaddr) );
                        printf( "ERR : EndCode %04X from %s!\n", source.usEndCode, Ipaddr );
                }

-       }
-       else
-       {
+           }
+           else
+           {

                /* Request of the SLMP frame */
                if ( source.usCommand == SLMP_COMMAND_CYCLIC_DATA )
                {
                /* Request of the SLMP frame */
                if ( source.usCommand == SLMP_COMMAND_CYCLIC_DATA )
                {


@@ -761,19 +767,23 @@ int ccief_basic_master_recv( void )
                                ccief_basic_master_execute_state( Master.pGroup[i], CCIEF_BASIC_EVENT_MASTER_CYCLIC_DATA_RECV );
                        }
                }
                                ccief_basic_master_execute_state( Master.pGroup[i], CCIEF_BASIC_EVENT_MASTER_CYCLIC_DATA_RECV );
                        }
                }

-       }
+           }

 
 

-       /* Check the error code of the master duplication */
-       if ( Master.iErrCode == CCIEF_BASIC_MASTER_ERR_MASTER_DUPLICATION )
-       {
+           /* Check the error code of the master duplication */
+           if ( Master.iErrCode == CCIEF_BASIC_MASTER_ERR_MASTER_DUPLICATION )
+           {

                return CCIEF_BASIC_MASTER_ERR_MASTER_DUPLICATION;
                return CCIEF_BASIC_MASTER_ERR_MASTER_DUPLICATION;

-       }
+           }

        
        

-       /* Check the error code of the slave duplication */
-       if ( Master.iErrCode == CCIEF_BASIC_MASTER_ERR_SLAVE_DUPLICATION )
-       {
+           /* Check the error code of the slave duplication */
+           if ( Master.iErrCode == CCIEF_BASIC_MASTER_ERR_SLAVE_DUPLICATION )
+           {

                return CCIEF_BASIC_MASTER_ERR_SLAVE_DUPLICATION;
                return CCIEF_BASIC_MASTER_ERR_SLAVE_DUPLICATION;

-       }
+           }
+
+            /* Increment the number of processed packets */
+            usPacketCount++;
+        }

 
        return CCIEF_BASIC_MASTER_ERR_OK;
 }
 
        return CCIEF_BASIC_MASTER_ERR_OK;
 }