minor update PC5DiscoveryAnnouncement -> PC5DiscoveryMessage

openair2/RRC/LITE/defs.h

@@ -87,7 +87,7 @@
 #define GROUP_COMMUNICATION_RELEASE_RSP     8
 #define PC5S_ESTABLISH_REQ                  9
 #define PC5S_ESTABLISH_RSP                  10
-#define PC5_DISCOVERY_ANNOUNCEMENT          11
+#define PC5_DISCOVERY_MESSAGE          11
 
 
 typedef enum {
@@ -132,10 +132,10 @@ struct PC5SEstablishRsp{
    uint8_t status;
 };
 
-//example of PC5_DSICOVERY ANNOUNCEMENT (for testing only)
+//example of PC5_DSICOVERY MESSAGE (for testing only)
 typedef struct  {
    unsigned char bytes[29];
-}  __attribute__((__packed__)) PC5DiscoveryAnnouncement ;
+}  __attribute__((__packed__)) PC5DiscoveryMessage ;
 
 
 struct sidelink_ctrl_element {
@@ -149,7 +149,7 @@ struct sidelink_ctrl_element {
       int slrb_id;
       struct PC5SEstablishReq pc5s_establish_req;
       struct PC5SEstablishRsp pc5s_establish_rsp;
-      PC5DiscoveryAnnouncement pc5_discovery_announcement;
+      PC5DiscoveryMessage pc5_discovery_message;
    } sidelinkPrimitive;
 };
 

openair2/RRC/LITE/rrc_UE.c

@@ -5802,19 +5802,19 @@ void *rrc_control_socket_thread_fct(void *arg)
          break;
 
 
-      case PC5_DISCOVERY_ANNOUNCEMENT:
+      case PC5_DISCOVERY_MESSAGE:
 
  #ifdef DEBUG_CTRL_SOCKET
-           LOG_I(RRC,"[PC5DiscoveryAnnouncement] Received on socket from ProSe App (msg type: %d)\n",sl_ctrl_msg_recv->type);
-        //   LOG_I(RRC,"[PC5DiscoveryAnnouncement] type: %d\n",sl_ctrl_msg_recv->sidelinkPrimitive.pc5_discovery_announcement.msg_type);
-        //   LOG_D(RRC,"[PC5DiscoveryAnnouncement] discoveryGroupId: 0x%08x\n",sl_ctrl_msg_recv->sidelinkPrimitive.pc5_discovery_announcement.discoveryGroupId);
-        //   LOG_D(RRC,"[PC5DiscoveryAnnouncement] proSeUEId: 0x%08x\n",sl_ctrl_msg_recv->sidelinkPrimitive.pc5_discovery_announcement.proSeUEId);
+           LOG_I(RRC,"[PC5DiscoveryMessage] Received on socket from ProSe App (msg type: %d)\n",sl_ctrl_msg_recv->type);
+        //   LOG_I(RRC,"[PC5DiscoveryMessage] type: %d\n",sl_ctrl_msg_recv->sidelinkPrimitive.pc5_discovery_message.msg_type);
+        //   LOG_D(RRC,"[PC5DiscoveryMessage] discoveryGroupId: 0x%08x\n",sl_ctrl_msg_recv->sidelinkPrimitive.pc5_discovery_message.discoveryGroupId);
+        //   LOG_D(RRC,"[PC5DiscoveryMessage] proSeUEId: 0x%08x\n",sl_ctrl_msg_recv->sidelinkPrimitive.pc5_discovery_message.proSeUEId);
  #endif
         //prepare SL_Discovery buffer
          if (UE_rrc_inst) {
            memcpy((void*)&UE_rrc_inst[module_id].SL_Discovery[0].Tx_buffer.Payload[0], (void*)receive_buf, n);
            UE_rrc_inst[module_id].SL_Discovery[0].Tx_buffer.payload_size = n;
-           LOG_I(RRC,"[PC5DiscoveryAnnouncement] Copied %d bytes\n",n);
+           LOG_I(RRC,"[PC5DiscoveryMessage] Copied %d bytes\n",n);
          }
          break;
       default: