update it

This commit is contained in:
Sukchan Lee 2017-03-21 12:04:15 +09:00
parent 6922416a54
commit 016caf197c
11 changed files with 86 additions and 12 deletions

3
lib/nas/support/cache/nas_msg_67.py vendored Normal file
View File

@ -0,0 +1,3 @@
ies = []
ies.append({ "iei" : "", "value" : "ESM message container", "type" : "ESM message container", "reference" : "9.9.3.15", "presence" : "M", "format" : "LV-E", "length" : "5-n"})
msg_list[key]["ies"] = ies

7
lib/nas/support/cache/nas_msg_68.py vendored Normal file
View File

@ -0,0 +1,7 @@
ies = []
ies.append({ "iei" : "", "value" : "EMM cause", "type" : "EMM cause", "reference" : "9.9.3.9", "presence" : "M", "format" : "V", "length" : "1"})
ies.append({ "iei" : "78", "value" : "ESM message container", "type" : "ESM message container", "reference" : "9.9.3.15", "presence" : "O", "format" : "TLV-E", "length" : "6-n"})
ies.append({ "iei" : "5F", "value" : "T3346 value", "type" : "GPRS timer 2", "reference" : "9.9.3.16A", "presence" : "O", "format" : "TLV", "length" : "3"})
ies.append({ "iei" : "16", "value" : "T3402 value", "type" : "GPRS timer 2", "reference" : "9.9.3.16A", "presence" : "O", "format" : "TLV", "length" : "3"})
ies.append({ "iei" : "A-", "value" : "Extended EMM cause", "type" : "Extended EMM cause", "reference" : "9.9.3.26A", "presence" : "O", "format" : "TV", "length" : "1"})
msg_list[key]["ies"] = ies

5
lib/nas/support/cache/nas_msg_82.py vendored Normal file
View File

@ -0,0 +1,5 @@
ies = []
ies.append({ "iei" : "", "value" : "NAS key set identifierASME ", "type" : "NAS key set identifier", "reference" : "9.9.3.21", "presence" : "M", "format" : "V", "length" : "1/2"})
ies.append({ "iei" : "", "value" : "Authentication parameter RAND (EPS challenge)", "type" : "Authentication parameter RAND", "reference" : "9.9.3.3", "presence" : "M", "format" : "V", "length" : "16"})
ies.append({ "iei" : "", "value" : "Authentication parameter AUTN (EPS challenge)", "type" : "Authentication parameter AUTN", "reference" : "9.9.3.2", "presence" : "M", "format" : "LV", "length" : "17"})
msg_list[key]["ies"] = ies

3
lib/nas/support/cache/nas_msg_83.py vendored Normal file
View File

@ -0,0 +1,3 @@
ies = []
ies.append({ "iei" : "", "value" : "Authentication response parameter", "type" : "Authentication response parameter", "reference" : "9.9.3.4", "presence" : "M", "format" : "LV", "length" : "5-17"})
msg_list[key]["ies"] = ies

2
lib/nas/support/cache/nas_msg_84.py vendored Normal file
View File

@ -0,0 +1,2 @@
ies = []
msg_list[key]["ies"] = ies

4
lib/nas/support/cache/nas_msg_92.py vendored Normal file
View File

@ -0,0 +1,4 @@
ies = []
ies.append({ "iei" : "", "value" : "EMM cause", "type" : "EMM cause", "reference" : "9.9.3.9", "presence" : "M", "format" : "V", "length" : "1"})
ies.append({ "iei" : "30", "value" : "Authentication failure parameter", "type" : "Authentication failure parameter", "reference" : "9.9.3.1", "presence" : "O", "format" : "TLV", "length" : "16"})
msg_list[key]["ies"] = ies

8
lib/nas/support/cache/nas_msg_93.py vendored Normal file
View File

@ -0,0 +1,8 @@
ies = []
ies.append({ "iei" : "", "value" : "Selected NAS security algorithms", "type" : "NAS security algorithms", "reference" : "9.9.3.23", "presence" : "M", "format" : "V", "length" : "1"})
ies.append({ "iei" : "", "value" : "NAS key set identifier", "type" : "NAS key set identifier", "reference" : "9.9.3.21", "presence" : "M", "format" : "V", "length" : "1/2"})
ies.append({ "iei" : "", "value" : "Replayed UE security capabilities", "type" : "UE security capability", "reference" : "9.9.3.36", "presence" : "M", "format" : "LV", "length" : "3-6"})
ies.append({ "iei" : "C-", "value" : "IMEISV request", "type" : "IMEISV request", "reference" : "9.9.3.18", "presence" : "O", "format" : "TV", "length" : "1"})
ies.append({ "iei" : "55", "value" : "Replayed nonceUE", "type" : "Nonce", "reference" : "9.9.3.25", "presence" : "O", "format" : "TV", "length" : "5"})
ies.append({ "iei" : "56", "value" : "NonceMME", "type" : "Nonce", "reference" : "9.9.3.25", "presence" : "O", "format" : "TV", "length" : "5"})
msg_list[key]["ies"] = ies

3
lib/nas/support/cache/nas_msg_94.py vendored Normal file
View File

@ -0,0 +1,3 @@
ies = []
ies.append({ "iei" : "23", "value" : "IMEISV", "type" : "Mobile identity", "reference" : "9.9.2.3", "presence" : "O", "format" : "TLV", "length" : "11"})
msg_list[key]["ies"] = ies

3
lib/nas/support/cache/nas_msg_95.py vendored Normal file
View File

@ -0,0 +1,3 @@
ies = []
ies.append({ "iei" : "", "value" : "EMM cause", "type" : "EMM cause", "reference" : "9.9.3.9", "presence" : "M", "format" : "V", "length" : "1"})
msg_list[key]["ies"] = ies

View File

@ -43,3 +43,7 @@ type_list["EPS mobile identity"]["encode"] = \
" target.guti.m_tmsi = htonl(eps_mobile_identity->guti.m_tmsi);\n" \
" }\n\n"
type_list["Nonce"]["decode"] = \
" *nonce = ntohl(*nonce);\n\n"
type_list["Nonce"]["encode"] = \
" target = htonl(*nonce);\n\n"

View File

@ -208,7 +208,15 @@ msg_list["ESM STATUS"] = { "type" : "232" }
# Table number for Message List
msg_list["ATTACH ACCEPT"]["table"] = 8
msg_list["ATTACH COMPLETE"]["table"] = 9
msg_list["ATTACH REJECT"]["table"] = 10
msg_list["ATTACH REQUEST"]["table"] = 11
msg_list["AUTHENTICATION FAILURE"]["table"] = 12
msg_list["AUTHENTICATION REQUEST"]["table"] = 14
msg_list["AUTHENTICATION RESPONSE"]["table"] = 15
msg_list["SECURITY MODE COMMAND"]["table"] = 29
msg_list["SECURITY MODE COMPLETE"]["table"] = 30
msg_list["SECURITY MODE REJECT"]["table"] = 31
for key in msg_list.keys():
if "table" not in msg_list[key].keys():
@ -446,23 +454,28 @@ f.write("\n")
for (k, v) in sorted_msg_list:
if "ies" not in msg_list[k]:
continue;
if len(msg_list[k]["ies"]) == 0:
continue;
f.write("/*******************************************************\n")
f.write("\n/*******************************************************\n")
f.write(" * %s\n" % k)
f.write(" ******************************************************/\n")
f.write(" ******************************************************/")
for i, ie in enumerate([ies for ies in msg_list[k]["ies"] if ies["presence"] == "O"]):
f.write("#define NAS_%s_%s_PRESENT (1<<%d)\n" % (v_upper(k), v_upper(ie["value"]), i))
f.write("\n")
f.write("\n#define NAS_%s_%s_PRESENT (1<<%d)" % (v_upper(k), v_upper(ie["value"]), i))
for i, ie in enumerate([ies for ies in msg_list[k]["ies"] if ies["presence"] == "O"]):
f.write("#define NAS_%s_%s_TYPE 0x%s\n" % (v_upper(k), v_upper(ie["value"]), re.sub('-', '0', ie["iei"])))
f.write("\n")
f.write("\n#define NAS_%s_%s_TYPE 0x%s" % (v_upper(k), v_upper(ie["value"]), re.sub('-', '0', ie["iei"])))
f.write("typedef struct _nas_%s_t {\n" % v_lower(k))
f.write(" /* Mandatory fields */\n")
f.write("\n\ntypedef struct _nas_%s_t {\n" % v_lower(k))
mandatory_fields = False;
optional_fields = False;
for ie in msg_list[k]["ies"]:
if ie["presence"] == "M" and mandatory_fields is False:
f.write(" /* Mandatory fields */\n")
mandatory_fields = True;
if ie["presence"] == "O" and optional_fields is False:
f.write("\n /* Optional fields */\n")
f.write(" c_uint32_t presencemask;\n");
@ -471,7 +484,7 @@ for (k, v) in sorted_msg_list:
f.write(" nas_" + v_lower(ie["type"]) + "_t " + \
v_lower(ie["value"]) + ";\n")
f.write("} nas_%s_t;\n" % v_lower(k))
f.write("} nas_%s_t;\n\n" % v_lower(k))
f.write("\n")
@ -483,6 +496,9 @@ f.write("""typedef struct _nas_message_t {
for (k, v) in sorted_msg_list:
if "ies" not in msg_list[k]:
continue;
if len(msg_list[k]["ies"]) == 0:
continue;
f.write(" nas_%s_t %s;\n" % (v_lower(k), v_lower(k)))
f.write(""" };
@ -510,7 +526,10 @@ f.write("""#define TRACE_MODULE _nasdec
for (k, v) in sorted_msg_list:
if "ies" not in msg_list[k]:
continue;
continue
if len(msg_list[k]["ies"]) == 0:
continue
f.write("c_int32_t nas_decode_%s(nas_message_t *message, pkbuf_t *pkbuf)\n{\n" % v_lower(k))
f.write(" nas_%s_t *%s = &message->%s;\n" % (v_lower(k), v_lower(k), v_lower(k)))
f.write(" c_int32_t decoded = 0;\n")
@ -546,14 +565,17 @@ for (k, v) in sorted_msg_list:
f.write(" decoded += size;\n")
f.write(" break;\n")
f.write(""" default:
if [ies for ies in msg_list[k]["ies"] if ies["presence"] == "O"]:
f.write(""" default:
d_error("Unknown type(0x%x) or not implemented\\n", type);
return -1;
}
}
return decoded;
""")
f.write(""" return decoded;
}
""")
f.write("""status_t nas_plain_decode(nas_message_t *message, pkbuf_t *pkbuf)
@ -579,6 +601,9 @@ f.write("""status_t nas_plain_decode(nas_message_t *message, pkbuf_t *pkbuf)
for (k, v) in sorted_msg_list:
if "ies" not in msg_list[k]:
continue;
if len(msg_list[k]["ies"]) == 0:
continue
f.write(" case NAS_%s:\n" % v_upper(k))
f.write(" size = nas_decode_%s(message, pkbuf);\n" % v_lower(k))
f.write(" d_assert(size >= CORE_OK, return CORE_ERROR, \"decode error\");\n")
@ -612,6 +637,9 @@ f.write("""#define TRACE_MODULE _nasenc
for (k, v) in sorted_msg_list:
if "ies" not in msg_list[k]:
continue;
if len(msg_list[k]["ies"]) == 0:
continue
f.write("c_int32_t nas_encode_%s(pkbuf_t *pkbuf, nas_message_t *message)\n{\n" % v_lower(k))
f.write(" nas_%s_t *%s = &message->%s;\n" % (v_lower(k), v_lower(k), v_lower(k)))
f.write(" c_int32_t encoded = 0;\n")
@ -638,6 +666,7 @@ for (k, v) in sorted_msg_list:
f.write(""" return encoded;
}
""")
@ -669,6 +698,9 @@ f.write("""status_t nas_plain_encode(pkbuf_t **pkbuf, nas_message_t *message)
for (k, v) in sorted_msg_list:
if "ies" not in msg_list[k]:
continue;
if len(msg_list[k]["ies"]) == 0:
continue
f.write(" case NAS_%s:\n" % v_upper(k))
f.write(" size = nas_encode_%s(*pkbuf, message);\n" % v_lower(k))
f.write(" d_assert(size >= 0, return CORE_ERROR, \"decode error\");\n")