Fix issue for decoding/encoding SD

src/common/common_defs.h

@@ -63,8 +63,14 @@ typedef enum {
   sIZE += sizeof(uint16_t)
 
 #define DECODE_U24(bUFFER, vALUE, sIZE)                                        \
-  vALUE = ntohl(*(uint32_t*) (bUFFER)) >> 8;                                   \
-  sIZE += sizeof(uint8_t) + sizeof(uint16_t)
+  do {                                                                         \
+    uint32_t value_tmp = 0;                                                    \
+    uint8_t size_tmp   = sizeof(uint8_t) + sizeof(uint16_t);                   \
+    memcpy((unsigned char*) &value_tmp, bUFFER, size_tmp);                     \
+    vALUE = ntohl(value_tmp);                                                  \
+    vALUE = vALUE >> 8;                                                        \
+    sIZE += size_tmp;                                                          \
+  } while (0)
 
 #define DECODE_U32(bUFFER, vALUE, sIZE)                                        \
   vALUE = ntohl(*(uint32_t*) (bUFFER));                                        \
@@ -89,8 +95,12 @@ typedef enum {
   size += sizeof(uint16_t)
 
 #define ENCODE_U24(buffer, value, size)                                        \
-  *(uint32_t*) (buffer) = htonl(value);                                        \
-  size += sizeof(uint8_t) + sizeof(uint16_t)
+  do {                                                                         \
+    uint32_t value_tmp = htonl(value << 8);                                    \
+    uint8_t size_tmp   = sizeof(uint8_t) + sizeof(uint16_t);                   \
+    memcpy(buffer, (unsigned char*) &value_tmp, size_tmp);                     \
+    size += size_tmp;                                                          \
+  } while (0)
 
 #define ENCODE_U32(buffer, value, size)                                        \
   *(uint32_t*) (buffer) = htonl(value);                                        \

src/nas/ies/Rejected_SNSSAI.cpp

@@ -125,12 +125,13 @@ int Rejected_SNSSAI::encode2buffer(uint8_t* buf, int len) {
   ENCODE_U8(buf + encoded_size, sst_, encoded_size);
   Logger::nas_mm().debug("SST %d", sst_);
   if (sd_.has_value()) {
-    // ENCODE_U24(buf + encoded_size, sd_.value(), encoded_size);
-    ENCODE_U8(
+    ENCODE_U24(buf + encoded_size, sd_.value(), encoded_size);
+    /*ENCODE_U8(
         buf + encoded_size, (sd_.value() & 0x00ff0000) >> 16, encoded_size);
     ENCODE_U8(
         buf + encoded_size, (sd_.value() & 0x0000ff00) >> 8, encoded_size);
     ENCODE_U8(buf + encoded_size, (sd_.value() & 0x000000ff), encoded_size);
+    */
     Logger::nas_mm().debug("SD 0x%x", sd_.value());
   }
   Logger::nas_mm().debug("Encoded Rejected_SNSSAI (len %d)", encoded_size);
@@ -152,10 +153,10 @@ int Rejected_SNSSAI::decodefrombuffer(uint8_t* buf, int len) {
         cause_, sst_);
   } else if (length_ == 4) {
     uint32_t sd = 0;
-    DECODE_U8(buf + decoded_size, sd, decoded_size);
+    DECODE_U24(buf + decoded_size, sd, decoded_size);
     sd_ = std::optional<uint32_t>(sd);
     Logger::nas_mm().debug(
-        "Decoded Rejected_SNSSAI length 0x%x,cause 0x%x, SST 0x%x, SD 0x%x",
+        "Decoded Rejected_SNSSAI length 0x%x, cause 0x%x, SST 0x%x, SD 0x%x",
         length_, cause_, sst_, sd);
   } else {
     return -1;  // invalid value