mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-05 15:24:14 +00:00
[PFCP] Support associating multiple URRs to a PDR (#1456)
* [PFCP] Fix trailing whitespace in message generation files * [PFCP] message gen: Support multiple URR ID IEs in Create PDR group * [PFCP] Support associating multiple URRs to a PDR According to 3GPP TS 29.244: """ A PDR shall contain: - zero, one or more URRs, which contains instructions related to traffic measurement and reporting. """
This commit is contained in:
Pau Espin Pedrol
GitHub
parent
825b06b6e0
commit
4b8d3a845a
8 changed files with 59 additions and 38 deletions
|
|
@ -103,7 +103,7 @@ def get_cells(cells):
|
|||
comment = re.sub('\n|\"|\'|\\\\', '', comment);
|
||||
#print comment
|
||||
ie_type = re.sub('\s*$', '', re.sub('\'\s*\n*\s*\(NOTE.*\)*', '', cells[-1].text))
|
||||
|
||||
|
||||
#if ie_type.find('Usage Report') != -1:
|
||||
if ie_type == 'Usage Report':
|
||||
if comment.find('Report Type') != -1:
|
||||
|
|
@ -114,7 +114,7 @@ def get_cells(cells):
|
|||
ie_type = "Usage Report Session Deletion Response"
|
||||
else:
|
||||
assert False, "Unknown IE type : [Usage Report]"
|
||||
|
||||
|
||||
if ie_type == 'Update BAR':
|
||||
if comment.find('7.5.4.11-1') != -1:
|
||||
ie_type = "Update BAR Session Modification Request"
|
||||
|
|
@ -122,7 +122,7 @@ def get_cells(cells):
|
|||
ie_type = "Update BAR PFCP Session Report Response"
|
||||
else:
|
||||
assert False, "Unknown IE type : [Update BAR]"
|
||||
|
||||
|
||||
if ie_type.find('PFD Contents') != -1:
|
||||
ie_type = 'PFD contents'
|
||||
elif ie_type.find('UE IP address') != -1:
|
||||
|
|
@ -154,6 +154,8 @@ def get_cells(cells):
|
|||
tlv_more = "3"
|
||||
if ie_type == 'SDF Filter':
|
||||
tlv_more = "7"
|
||||
if ie_type == 'URR ID' and comment.find('Several IEs within the same IE type may be present') != -1:
|
||||
tlv_more = "7"
|
||||
|
||||
if int(tlv_more) > int(type_list[ie_type]["max_tlv_more"]):
|
||||
type_list[ie_type]["max_tlv_more"] = tlv_more
|
||||
|
|
@ -193,7 +195,7 @@ for o, a in opts:
|
|||
sys.exit(2)
|
||||
|
||||
if os.path.isfile(filename) and os.access(filename, os.R_OK):
|
||||
file = open(filename, 'r')
|
||||
file = open(filename, 'r')
|
||||
else:
|
||||
d_error("Cannot find file : " + filename)
|
||||
|
||||
|
|
@ -204,7 +206,7 @@ if os.path.isfile(cachefile) and os.access(cachefile, os.R_OK):
|
|||
print("Read from " + cachefile)
|
||||
else:
|
||||
document = Document(filename)
|
||||
f = open(cachefile, 'w')
|
||||
f = open(cachefile, 'w')
|
||||
|
||||
msg_table = ""
|
||||
for i, table in enumerate(document.tables):
|
||||
|
|
@ -236,7 +238,7 @@ if os.path.isfile(cachefile) and os.access(cachefile, os.R_OK):
|
|||
print("Read from " + cachefile)
|
||||
else:
|
||||
document = Document(filename)
|
||||
f = open(cachefile, 'w')
|
||||
f = open(cachefile, 'w')
|
||||
|
||||
ie_table = ""
|
||||
for i, table in enumerate(document.tables):
|
||||
|
|
@ -270,7 +272,7 @@ if os.path.isfile(cachefile) and os.access(cachefile, os.R_OK):
|
|||
print("Read from " + cachefile)
|
||||
else:
|
||||
document = Document(filename)
|
||||
f = open(cachefile, 'w')
|
||||
f = open(cachefile, 'w')
|
||||
|
||||
for i, table in enumerate(document.tables):
|
||||
try:
|
||||
|
|
@ -309,18 +311,18 @@ else:
|
|||
elif (int(ie_type) == 79):
|
||||
ie_name = "Usage Report Session Deletion Response"
|
||||
elif (int(ie_type) == 80):
|
||||
ie_name = "Usage Report Session Report Request"
|
||||
ie_name = "Usage Report Session Report Request"
|
||||
elif (int(ie_type) == 86):
|
||||
ie_name = "Update BAR Session Modification Request"
|
||||
ie_name = "Update BAR Session Modification Request"
|
||||
elif (int(ie_type) == 12):
|
||||
ie_name = "Update BAR PFCP Session Report Response"
|
||||
ie_name = "Update BAR PFCP Session Report Response"
|
||||
|
||||
if ie_name.find('Access Forwarding Action Information 2') != -1:
|
||||
ie_idx = str(int(ie_type)+100)
|
||||
group_list[ie_name] = { "index" : ie_idx, "type" : ie_type, "ies" : ies }
|
||||
write_file(f, "group_list[\"" + ie_name + "\"] = { \"index\" : \"" + ie_idx + "\", \"type\" : \"" + ie_type + "\", \"ies\" : ies }\n")
|
||||
continue
|
||||
|
||||
|
||||
if ie_name not in group_list.keys():
|
||||
ies = []
|
||||
write_file(f, "ies = []\n")
|
||||
|
|
@ -338,7 +340,7 @@ else:
|
|||
f.close()
|
||||
|
||||
msg_list["PFCP Heartbeat Request"]["table"] = 7
|
||||
msg_list["PFCP Heartbeat Response"]["table"] = 8
|
||||
msg_list["PFCP Heartbeat Response"]["table"] = 8
|
||||
msg_list["PFCP PFD Management Request"]["table"] = 9
|
||||
msg_list["PFCP PFD Management Response"]["table"] = 12
|
||||
msg_list["PFCP Association Setup Request"]["table"] = 13
|
||||
|
|
@ -370,7 +372,7 @@ for key in msg_list.keys():
|
|||
print("Read from " + cachefile)
|
||||
else:
|
||||
document = Document(filename)
|
||||
f = open(cachefile, 'w')
|
||||
f = open(cachefile, 'w')
|
||||
|
||||
table = document.tables[msg_list[key]["table"]]
|
||||
if key.find('Association') != -1:
|
||||
|
|
@ -379,7 +381,7 @@ for key in msg_list.keys():
|
|||
start_i = 1
|
||||
else:
|
||||
start_i = 2
|
||||
|
||||
|
||||
ies = []
|
||||
write_file(f, "ies = []\n")
|
||||
if key != "PFCP Session Deletion Request" and key != "PFCP Version Not Supported Response":
|
||||
|
|
@ -579,7 +581,7 @@ for (k, v) in sorted_group_list:
|
|||
f.write("typedef struct ogs_pfcp_tlv_" + v_lower(k) + "_s {\n")
|
||||
f.write(" ogs_tlv_presence_t presence;\n")
|
||||
for ies in group_list[k]["ies"]:
|
||||
if type_list[ies["ie_type"]]["max_tlv_more"] != "0":
|
||||
if type_list[ies["ie_type"]]["max_tlv_more"] != "0" and ies["tlv_more"] != "0":
|
||||
f.write(" ogs_pfcp_tlv_" + v_lower(ies["ie_type"]) + "_t " + v_lower(ies["ie_value"]) + "[" + str(int(ies["tlv_more"])+1) + "];\n")
|
||||
else:
|
||||
f.write(" ogs_pfcp_tlv_" + v_lower(ies["ie_type"]) + "_t " + \
|
||||
|
|
@ -592,7 +594,7 @@ for (k, v) in sorted_msg_list:
|
|||
if "ies" in msg_list[k]:
|
||||
f.write("typedef struct ogs_" + v_lower(k) + "_s {\n")
|
||||
for ies in msg_list[k]["ies"]:
|
||||
if type_list[ies["ie_type"]]["max_tlv_more"] != "0":
|
||||
if type_list[ies["ie_type"]]["max_tlv_more"] != "0" and ies["tlv_more"] != "0":
|
||||
f.write(" ogs_pfcp_tlv_" + v_lower(ies["ie_type"]) + "_t " + v_lower(ies["ie_value"]) + "[" + str(int(ies["tlv_more"])+1) + "];\n")
|
||||
else:
|
||||
f.write(" ogs_pfcp_tlv_" + v_lower(ies["ie_type"]) + "_t " + v_lower(ies["ie_value"]) + ";\n")
|
||||
|
|
@ -667,7 +669,7 @@ for (k, v) in sorted_group_list:
|
|||
f.write(" {\n")
|
||||
for ies in group_list[k]["ies"]:
|
||||
f.write(" &ogs_pfcp_tlv_desc_%s,\n" % v_lower(ies["ie_type"]))
|
||||
if type_list[ies["ie_type"]]["max_tlv_more"] != "0":
|
||||
if type_list[ies["ie_type"]]["max_tlv_more"] != "0" and ies["tlv_more"] != "0":
|
||||
f.write(" &ogs_tlv_desc_more" + str(int(ies["tlv_more"])+1) + ",\n")
|
||||
f.write(" NULL,\n")
|
||||
f.write(" }\n")
|
||||
|
|
@ -682,7 +684,7 @@ for (k, v) in sorted_msg_list:
|
|||
f.write(" 0, 0, 0, 0, {\n")
|
||||
for ies in msg_list[k]["ies"]:
|
||||
f.write(" &ogs_pfcp_tlv_desc_%s,\n" % v_lower(ies["ie_type"]))
|
||||
if type_list[ies["ie_type"]]["max_tlv_more"] != "0":
|
||||
if type_list[ies["ie_type"]]["max_tlv_more"] != "0" and ies["tlv_more"] != "0":
|
||||
f.write(" &ogs_tlv_desc_more" + str(int(ies["tlv_more"])+1) + ",\n")
|
||||
f.write(" NULL,\n")
|
||||
f.write("}};\n\n")
|
||||
|
|
@ -700,7 +702,7 @@ f.write("""int ogs_pfcp_parse_msg(ogs_pfcp_message_t *pfcp_message, ogs_pkbuf_t
|
|||
|
||||
h = (ogs_pfcp_header_t *)pkbuf->data;
|
||||
ogs_assert(h);
|
||||
|
||||
|
||||
memset(pfcp_message, 0, sizeof(ogs_pfcp_message_t));
|
||||
|
||||
if (h->seid_presence)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue