acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

merge FROM_UE and TO_UE to ONE macro

This commit is contained in:
Sukchan Lee 2017-04-26 09:19:13 +09:00
parent 19b164b575
commit 0bdc7de4d0
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nas/nas_decoder.c
View File

@ -26,7 +26,7 @@
/*******************************************************************************
* This file had been created by gtpv2c_tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2017-04-25 20:02:55.614205 by acetcom
* Created on: 2017-04-26 09:18:26.252078 by acetcom
* from 24301-d80.docx
******************************************************************************/
@ -420,10 +420,10 @@ c_int32_t nas_decode_detach_request_to_ue(nas_message_t *message, pkbuf_t *pkbuf
switch(type)
{
case NAS_DETACH_REQUEST_TO_UE_EMM_CAUSE_TYPE:
case NAS_DETACH_REQUEST_EMM_CAUSE_TYPE:
size = nas_decode_emm_cause(&detach_request_to_ue->emm_cause, pkbuf);
d_assert(size >= 0, return -1, "decode failed");
detach_request_to_ue->presencemask |= NAS_DETACH_REQUEST_TO_UE_EMM_CAUSE_PRESENT;
detach_request_to_ue->presencemask |= NAS_DETACH_REQUEST_EMM_CAUSE_PRESENT;
decoded += size;
break;
default:
@ -1671,7 +1671,7 @@ status_t nas_emm_decode(nas_message_t *message, pkbuf_t *pkbuf)
d_assert(size >= CORE_OK, return CORE_ERROR, "decode error");
decoded += size;
break;
case NAS_DETACH_REQUEST_FROM_UE:
case NAS_DETACH_REQUEST:
size = nas_decode_detach_request_from_ue(message, pkbuf);
d_assert(size >= CORE_OK, return CORE_ERROR, "decode error");
decoded += size;

8
lib/nas/nas_encoder.c
View File

@ -26,7 +26,7 @@
/*******************************************************************************
* This file had been created by gtpv2c_tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2017-04-25 20:02:55.628053 by acetcom
* Created on: 2017-04-26 09:18:26.270191 by acetcom
* from 24301-d80.docx
******************************************************************************/
@ -520,9 +520,9 @@ c_int32_t nas_encode_detach_request_to_ue(pkbuf_t *pkbuf, nas_message_t *message
d_assert(size >= 0, return -1, "encode failed");
encoded += size;
if (detach_request_to_ue->presencemask & NAS_DETACH_REQUEST_TO_UE_EMM_CAUSE_PRESENT)
if (detach_request_to_ue->presencemask & NAS_DETACH_REQUEST_EMM_CAUSE_PRESENT)
{
size = nas_encode_optional_type(pkbuf, NAS_DETACH_REQUEST_TO_UE_EMM_CAUSE_TYPE);
size = nas_encode_optional_type(pkbuf, NAS_DETACH_REQUEST_EMM_CAUSE_TYPE);
d_assert(size >= 0, return encoded, "decode failed");
encoded += size;
@ -1909,7 +1909,7 @@ status_t nas_emm_encode(pkbuf_t **pkbuf, nas_message_t *message)
d_assert(size >= 0, return CORE_ERROR, "decode error");
encoded += size;
break;
case NAS_DETACH_REQUEST_TO_UE:
case NAS_DETACH_REQUEST:
size = nas_encode_detach_request_to_ue(*pkbuf, message);
d_assert(size >= 0, return CORE_ERROR, "decode error");
encoded += size;

2
lib/nas/nas_ies.c
View File

@ -26,7 +26,7 @@
/*******************************************************************************
* This file had been created by gtpv2c_tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2017-04-25 20:02:55.587587 by acetcom
* Created on: 2017-04-26 09:18:26.217661 by acetcom
* from 24301-d80.docx
******************************************************************************/

2
lib/nas/nas_ies.h
View File

@ -26,7 +26,7 @@
/*******************************************************************************
* This file had been created by gtpv2c_tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2017-04-25 20:02:55.583189 by acetcom
* Created on: 2017-04-26 09:18:26.211334 by acetcom
* from 24301-d80.docx
******************************************************************************/

9
lib/nas/nas_message.h
View File

@ -26,7 +26,7 @@
/*******************************************************************************
* This file had been created by gtpv2c_tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2017-04-25 20:02:55.600467 by acetcom
* Created on: 2017-04-26 09:18:26.233286 by acetcom
* from 24301-d80.docx
******************************************************************************/
@ -81,8 +81,7 @@ ED2(c_uint8_t security_header_type:4;,
#define NAS_ATTACH_ACCEPT 66
#define NAS_ATTACH_COMPLETE 67
#define NAS_ATTACH_REJECT 68
#define NAS_DETACH_REQUEST_FROM_UE 69
#define NAS_DETACH_REQUEST_TO_UE 69
#define NAS_DETACH_REQUEST 69
#define NAS_DETACH_ACCEPT 70
#define NAS_TRACKING_AREA_UPDATE_REQUEST 72
#define NAS_TRACKING_AREA_UPDATE_ACCEPT 73
@ -310,8 +309,8 @@ typedef struct _nas_detach_request_from_ue_t {
/*******************************************************
* DETACH REQUEST TO UE
******************************************************/
#define NAS_DETACH_REQUEST_TO_UE_EMM_CAUSE_PRESENT (1<<0)
#define NAS_DETACH_REQUEST_TO_UE_EMM_CAUSE_TYPE 0x53
#define NAS_DETACH_REQUEST_EMM_CAUSE_PRESENT (1<<0)
#define NAS_DETACH_REQUEST_EMM_CAUSE_TYPE 0x53
typedef struct _nas_detach_request_to_ue_t {
/* Mandatory fields */

5
lib/nas/support/nas_message.py
View File

@ -103,7 +103,7 @@ def usage():
print "-h Print this help and return"
def v_upper(v):
return re.sub('3GPP', '', re.sub('\'', '_', re.sub('/', '_', re.sub('-', '_', re.sub(' ', '_', v)))).upper())
return re.sub('_TO_UE', '', re.sub('_FROM_UE', '', re.sub('3GPP', '', re.sub('\'', '_', re.sub('/', '_', re.sub('-', '_', re.sub(' ', '_', v)))).upper())))
def v_lower(v):
return re.sub('3gpp', '', re.sub('\'', '_', re.sub('/', '_', re.sub('-', '_', re.sub(' ', '_', v)))).lower())
@ -520,7 +520,8 @@ ED2(c_uint8_t security_header_type:4;,
""")
for (k, v) in sorted_msg_list:
f.write("#define NAS_" + v_upper(k) + " " + v.split('.')[0] + "\n")
if k.find("TO UE") == -1:
f.write("#define NAS_" + v_upper(k) + " " + v.split('.')[0] + "\n")
f.write("\n")
for (k, v) in sorted_msg_list: