decoder buffer uses pkbuf_t

lib/asn/src/s1ap_codecs.h

@@ -1,7 +1,7 @@
 #ifndef _S1AP_CODECS_H__
 #define _S1AP_CODECS_H__
 
-#include "core.h"
+#include "core_pkbuf.h"
 
 #include "s1ap_ies_defs.h"
 
@@ -9,8 +9,9 @@
 extern "C" {
 #endif /* __cplusplus */
 
-CORE_DECLARE(int) s1ap_decode_pdu(s1ap_message *message, 
-        uint8_t *buffer, uint32_t len);
+#define S1AP_SDU_SIZE 2048
+
+CORE_DECLARE(int) s1ap_decode_pdu(s1ap_message *message, pkbuf_t *pkbuf);
 
 CORE_DECLARE(int) s1ap_encode_pdu(s1ap_message *message, 
         uint8_t **buffer, uint32_t *len);

lib/asn/src/s1ap_decoder.c

@@ -174,16 +174,17 @@ static int s1ap_decode_unsuccessfull_outcome(s1ap_message *message,
     return ret;
 }
 
-int s1ap_decode_pdu(s1ap_message *message, uint8_t *buffer, uint32_t len) 
+int s1ap_decode_pdu(s1ap_message *message, pkbuf_t *pkb)
 {
     S1AP_PDU_t pdu = {0};
     S1AP_PDU_t *pdu_p = &pdu;
     asn_dec_rval_t dec_ret = {0};
 
-    d_assert(buffer, return -1, "Null param");
+    d_assert(pkb, return -1, "Null param");
+    d_assert(pkb->payload, return -1, "Null param");
     memset((void *)pdu_p, 0, sizeof(S1AP_PDU_t));
     dec_ret = aper_decode(NULL, &asn_DEF_S1AP_PDU, (void **)&pdu_p, 
-            buffer, len, 0, 0);
+            pkb->payload, pkb->len, 0, 0);
 
     if (dec_ret.code != RC_OK) 
     {
@@ -194,33 +195,24 @@ int s1ap_decode_pdu(s1ap_message *message, uint8_t *buffer, uint32_t len)
     memset(message, 0, sizeof(s1ap_message));
 
     message->direction = pdu_p->present;
-
     switch (pdu_p->present) 
     {
         case S1AP_PDU_PR_initiatingMessage:
-        {
             return s1ap_decode_initiating(message, 
                     &pdu_p->choice.initiatingMessage);
-        }
 
         case S1AP_PDU_PR_successfulOutcome:
-        {
             return s1ap_decode_successfull_outcome(message, 
                     &pdu_p->choice.successfulOutcome);
-        }
 
         case S1AP_PDU_PR_unsuccessfulOutcome:
-        {
             return s1ap_decode_unsuccessfull_outcome(message, 
                     &pdu_p->choice.unsuccessfulOutcome);
-        }
 
         default:
-        {
             d_error("Unknown message outcome (%d) or not implemented", 
                     (int)pdu_p->present);
             break;
-        }
     }
 
     return -1;

lib/asn/test/s1ap_test.c

@@ -11,39 +11,60 @@
 static void s1ap_test1(abts_case *tc, void *data)
 {
     /* S1SetupRequest */
-    char *buffer[] = {
+    char *payload[] = {
         "\x00\x11\x00\x2d\x00\x00\x04\x00\x3b\x00\x09\x00\x00\xf1\x10\x40\x54\xf6\x40\x10\x00\x3c\x40\x09\x03\x00\x4a\x4c\x54\x2d\x36\x32\x31\x00\x40\x00\x07\x00\x0c\x0e\x40\x00\xf1\x10\x00\x89\x40\x01\x00",
     };
+
     s1ap_message message;
+    pkbuf_t *pkb;
     int result;
 
-    result = s1ap_decode_pdu(&message, (unsigned char*)buffer[0], 49);
+    pkb = pkbuf_alloc(0, S1AP_SDU_SIZE);
+    ABTS_PTR_NOTNULL(tc, pkb);
+    pkb->len = 49;
+    memcpy(pkb->payload, payload[0], pkb->len);
+
+    result = s1ap_decode_pdu(&message, pkb);
     ABTS_INT_EQUAL(tc, 0, result);
 }
 
 static void s1ap_test2(abts_case *tc, void *data)
 {
     /* InitialUE(Attach Request) */
-    char *buffer[] = {
+    char *payload[] = {
         "\x00\x0c\x40\x6f\x00\x00\x06\x00\x08\x00\x02\x00\x01\x00\x1a\x00\x3c\x3b\x17\xdf\x67\x5a\xa8\x05\x07\x41\x02\x0b\xf6\x00\xf1\x10\x00\x02\x01\x03\x00\x03\xe6\x05\xf0\x70\x00\x00\x10\x00\x05\x02\x15\xd0\x11\xd1\x52\x00\xf1\x10\x30\x39\x5c\x0a\x00\x31\x03\xe5\xe0\x34\x90\x11\x03\x57\x58\xa6\x5d\x01\x00\xe0\xc1\x00\x43\x00\x06\x00\x00\xf1\x10\x30\x39\x00\x64\x40\x08\x00\x00\xf1\x10\x8c\x33\x78\x20\x00\x86\x40\x01\x30\x00\x4b\x00\x07\x00\x00\xf1\x10\x00\x02\x01"
     };
+
     s1ap_message message;
+    pkbuf_t *pkb;
     int result;
 
-    result = s1ap_decode_pdu(&message, (unsigned char*)buffer[0], 115);
+    pkb = pkbuf_alloc(0, S1AP_SDU_SIZE);
+    ABTS_PTR_NOTNULL(tc, pkb);
+    pkb->len = 115;
+    memcpy(pkb->payload, payload[0], pkb->len);
+
+    result = s1ap_decode_pdu(&message, pkb);
     ABTS_INT_EQUAL(tc, 0, result);
 }
 
 static void s1ap_test3(abts_case *tc, void *data)
 {
     /* initial context setup response */
-    char *buffer[] = {
+    char *payload[] = {
         "\x20\x09\x00\x25\x00\x00\x03\x00\x00\x40\x05\xc0\x02\x00\x00\xbf\x00\x08\x40\x02\x00\x01\x00\x33\x40\x0f\x00\x00\x32\x40\x0a\x0a\x1f\x0a\x01\x23\xc6\x01\x00\x09\x08"
     };
+
     s1ap_message message;
+    pkbuf_t *pkb;
     int result;
 
-    result = s1ap_decode_pdu(&message, (unsigned char*)buffer[0], 41);
+    pkb = pkbuf_alloc(0, S1AP_SDU_SIZE);
+    ABTS_PTR_NOTNULL(tc, pkb);
+    pkb->len = 41;
+    memcpy(pkb->payload, payload[0], pkb->len);
+
+    result = s1ap_decode_pdu(&message, pkb);
     ABTS_INT_EQUAL(tc, 0, result);
 }