Cleanup

Signed-off-by: Martin Melik Merkumians <melik-merkumians@acin.tuwien.ac.at>

source/src/cip/cipmessagerouter.c

@@ -213,7 +213,7 @@ EipStatus NotifyMessageRouter(EipUint8 *data,
       /* call notify function from Object with ClassID (gMRRequest.RequestPath.ClassID)
          object will or will not make an reply into gMRResponse*/
       message_router_response->reserved = 0;
-      OPENER_ASSERT(NULL != registered_object->cip_class)
+      OPENER_ASSERT(NULL != registered_object->cip_class);
       OPENER_TRACE_INFO(
         "NotifyMessageRouter: calling notify function of class '%s'\n",
         registered_object->cip_class->class_name);

source/src/opener_api.h

@@ -819,8 +819,8 @@ int CreateUdpSocket(UdpCommuncationDirection communication_direction,
  * @return kEipStatusOk on success
  */
 EipStatus
-SendUdpData(struct sockaddr_in *socket_data,
-            int socket_handle,
+SendUdpData(const struct sockaddr_in *const socket_data,
+            const int socket_handle,
             const ENIPMessage *const outgoing_message);
 
 /** @ingroup CIP_CALLBACK_API

source/src/ports/generic_networkhandler.c

@@ -615,8 +615,8 @@ void CheckAndHandleUdpUnicastSocket(void) {
   }
 }
 
-EipStatus SendUdpData(struct sockaddr_in *address,
-                      int socket_handle,
+EipStatus SendUdpData(const struct sockaddr_in *const address,
+                      const int socket_handle,
                       const ENIPMessage *const outgoing_message) {
 
 
@@ -634,15 +634,11 @@ EipStatus SendUdpData(struct sockaddr_in *address,
          outgoing_message->message_buffer,
          outgoing_message->used_message_length);
   UDPHeaderGenerate(&header, (char *)complete_message);
-  UDPHeaderSetChecksum(&header,
-                       htons(UDPHeaderCalculateChecksum(complete_message,
-                                                        8 +
-                                                        outgoing_message->
-                                                        used_message_length,
-                                                        g_tcpip.
-                                                        interface_configuration
-                                                        .ip_address,
-                                                        address->sin_addr.s_addr) ) );
+  const uint16_t udp_checksum = UDPHeaderCalculateChecksum(complete_message,
+                                                           8 + outgoing_message->used_message_length,
+                                                           g_tcpip.interface_configuration.ip_address,
+                                                           address->sin_addr.s_addr);
+  UDPHeaderSetChecksum(&header, htons(udp_checksum) );
   UDPHeaderGenerate(&header, (char *)complete_message);
 
   int sent_length = sendto( socket_handle,
@@ -926,7 +922,8 @@ int CreateUdpSocket(UdpCommuncationDirection communication_direction,
 
   OPENER_TRACE_INFO("networkhandler: UDP socket %d\n", new_socket);
 
-  {
+  /* check if it is sending or receiving */
+  if (communication_direction == kUdpCommuncationDirectionConsuming) {
     int option_value = 1;
     if (setsockopt( new_socket, SOL_SOCKET, SO_REUSEADDR,
                     (char *) &option_value,
@@ -938,10 +935,6 @@ int CreateUdpSocket(UdpCommuncationDirection communication_direction,
       CloseUdpSocket(new_socket);
       return kEipInvalidSocket;
     }
-  }
-
-  /* check if it is sending or receiving */
-  if (communication_direction == kUdpCommuncationDirectionConsuming) {
 
     /* bind is only for consuming necessary */
     if ( ( bind( new_socket, (struct sockaddr *) socket_data,

source/src/ports/udp_protocol.c

@@ -5,6 +5,7 @@
  ******************************************************************************/
 
 #include "udp_protocol.h"
+#include "trace.h"
 
 #ifdef WIN32
 #include <winsock2.h>
@@ -62,39 +63,34 @@ uint16_t UDPHeaderCalculateChecksum(const void *udp_packet,
                                     const size_t udp_packet_length,
                                     const in_addr_t source_addr,
                                     const in_addr_t destination_addr) {
+  /* Checksum is calculated for 16-bit words */
   const uint16_t *udp_packet_words = udp_packet;
-  uint32_t checksum = 0;
-  size_t length = udp_packet_length;
-
-  // Process UDP packet
-  while(length > 1) {
-    checksum += *udp_packet_words++;
-    if(checksum & 0x8000000) {
-      checksum = (checksum & 0xFFFF) + (checksum >> 16);
-    }
-    length -= 2;
+  uint_fast32_t checksum = 0; /**< Carry bit access is needed (17th bit) */
+
+  for( uint16_t i = udp_packet_length; i > 1; i = i - 2 ) {
+    checksum +=  *udp_packet_words;
+    udp_packet_words++;
   }
 
-  if(0 != length % 2) {
-    // Add padding if packet length is odd
-    checksum += *( (uint8_t *)udp_packet_words );
+  if (udp_packet_length % 2) {
+    checksum += (*( ( (uint8_t *)udp_packet_words ) + 1 ) << 8);
   }
 
-  //Process IP pseudo header
-  uint16_t *source_addr_as_words = (void *)&source_addr;
+  const uint16_t *const source_addr_as_words =
+    (const uint16_t *const )&source_addr;
   checksum += *source_addr_as_words + *(source_addr_as_words + 1);
 
-  uint16_t *destination_addr_as_words = (void *)&destination_addr;
+  const uint16_t *const destination_addr_as_words =
+    (const uint16_t *const )&destination_addr;
   checksum += *destination_addr_as_words + *(destination_addr_as_words + 1);
-
   checksum += htons(IPPROTO_UDP);
   checksum += htons(udp_packet_length);
 
-  //Add the carries
-  while(0 != checksum >> 16) {
+  while(0xFFFF0000 & checksum) {
     checksum = (checksum & 0xFFFF) + (checksum >> 16);
   }
 
   // Return one's complement
   return (uint16_t)(~checksum);
 }
+