Просмотр исходного кода

Suggested in #216, rename g_interface_information

As suggested in #216 the variable g_interface_information is renamed to
g_service_information, as the bad name was probably the reason for the bug
described in #216

Signed-off-by: Martin Melik-Merkumians <melik-merkumians@acin.tuwien.ac.at>
Martin Melik-Merkumians 6 лет назад
Родитель
Сommit
b9220b68ec
2 измененных файлов с 19 добавлено и 19 удалено
  1. 17 17
      source/src/enet_encap/encap.c
  2. 2 2
      source/src/enet_encap/encap.h

+ 17 - 17
source/src/enet_encap/encap.c

@@ -81,7 +81,7 @@ typedef struct {
   ENIPMessage outgoing_message;
 } DelayedEncapsulationMessage;
 
-EncapsulationInterfaceInformation g_interface_information;
+EncapsulationServiceInformation g_service_information;
 
 int g_registered_sessions[OPENER_NUMBER_OF_SUPPORTED_SESSIONS];
 
@@ -138,15 +138,15 @@ void EncapsulationInit(void) {
     g_delayed_encapsulation_messages[i].socket = kEipInvalidSocket;
   }
 
-  /*TODO make the interface information configurable*/
-  /* initialize interface information */
-  g_interface_information.type_code = kCipItemIdListServiceResponse;
-  g_interface_information.length = sizeof(g_interface_information);
-  g_interface_information.encapsulation_protocol_version = 1;
-  g_interface_information.capability_flags = kCapabilityFlagsCipTcp
+  /*TODO make the service information configurable*/
+  /* initialize service information */
+  g_service_information.type_code = kCipItemIdListServiceResponse;
+  g_service_information.length = sizeof(g_service_information);
+  g_service_information.encapsulation_protocol_version = 1;
+  g_service_information.capability_flags = kCapabilityFlagsCipTcp
                                              | kCapabilityFlagsCipUdpClass0or1;
-  snprintf( (char *) g_interface_information.name_of_service,
-            sizeof(g_interface_information.name_of_service),
+  snprintf( (char *) g_service_information.name_of_service,
+            sizeof(g_service_information.name_of_service),
             "Communications" );
 }
 
@@ -349,7 +349,7 @@ void HandleReceivedListServicesCommand(
   /* Create encapsulation header */
   const size_t kListServicesCommandSpecificDataLength = sizeof(CipUint)
                                                         + sizeof(
-    g_interface_information);
+    g_service_information);
   GenerateEncapsulationHeader(receive_data,
                               kListServicesCommandSpecificDataLength,
                               0, /* Session handle will be ignored */
@@ -360,22 +360,22 @@ void HandleReceivedListServicesCommand(
   outgoing_message->used_message_length += AddIntToMessage(1,
                                                            &outgoing_message->current_message_position); // Item count
   outgoing_message->used_message_length += AddIntToMessage(
-    g_interface_information.type_code,
+    g_service_information.type_code,
     &outgoing_message->current_message_position);
   outgoing_message->used_message_length += AddIntToMessage(
-    (EipUint16) (g_interface_information.length - 4),
+    (EipUint16) (g_service_information.length - 4),
     &outgoing_message->current_message_position);
   outgoing_message->used_message_length += AddIntToMessage(
-    g_interface_information.encapsulation_protocol_version,
+    g_service_information.encapsulation_protocol_version,
     &outgoing_message->current_message_position);
   outgoing_message->used_message_length += AddIntToMessage(
-    g_interface_information.capability_flags,
+    g_service_information.capability_flags,
     &outgoing_message->current_message_position);
   memcpy(outgoing_message->current_message_position,
-         g_interface_information.name_of_service,
-         sizeof(g_interface_information.name_of_service) );
+         g_service_information.name_of_service,
+         sizeof(g_service_information.name_of_service) );
   outgoing_message->used_message_length +=
-    sizeof(g_interface_information.name_of_service);
+    sizeof(g_service_information.name_of_service);
 }
 
 void HandleReceivedListInterfacesCommand(

+ 2 - 2
source/src/enet_encap/encap.h

@@ -49,13 +49,13 @@ typedef struct encapsulation_data {
   const EipUint8 *current_communication_buffer_position; /**< The current position in the communication buffer during the decoding process */
 } EncapsulationData;
 
-typedef struct encapsulation_interface_information {
+typedef struct encapsulation_service_information {
   EipUint16 type_code;
   EipUint16 length;
   EipUint16 encapsulation_protocol_version;
   EipUint16 capability_flags;
   EipInt8 name_of_service[16];
-} EncapsulationInterfaceInformation;
+} EncapsulationServiceInformation;
 
 /*** global variables (public) ***/