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

[PFCP] Use proper IE to signal triggers in Usage Report (#1472) 

The "Report Triggers" is sent SMF->UPF to tell in which situations a
report should be sent.
The "Usage Report Trigger" is sent UPF->SMF to indicate which situation
triggered the report.
This commit is contained in:
Pau Espin 2022-04-08 14:12:42 +02:00 committed by GitHub
parent 8286b1c417
commit 77f7bb7af7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pfcp/build.c
View File

@ -785,9 +785,9 @@ ogs_pkbuf_t *ogs_pfcp_build_session_report_request(
req->usage_report[i].ur_seqn.u32 = report->usage_report[i].seqn;
req->usage_report[i].usage_report_trigger.presence = 1;
req->usage_report[i].usage_report_trigger.u24 =
(report->usage_report[i].rep_triggers.reptri_5 << 16)
| (report->usage_report[i].rep_triggers.reptri_6 << 8)
| (report->usage_report[i].rep_triggers.reptri_7);
(report->usage_report[i].rep_trigger.reptri_5 << 16)
| (report->usage_report[i].rep_trigger.reptri_6 << 8)
| (report->usage_report[i].rep_trigger.reptri_7);
if (report->usage_report[i].start_time) {
req->usage_report[i].start_time.presence = 1;

62
lib/pfcp/types.h
View File

@ -845,6 +845,44 @@ ED3(uint8_t spare:4;,
};
} __attribute__ ((packed)) ogs_pfcp_gate_status_t;
/* 8.2.19 Reporting Triggers
*/
typedef struct ogs_pfcp_reporting_triggers_s {
union {
struct {
ED8(uint8_t linked_usage_reporting:1;,
uint8_t dropped_dl_traffic_threshold:1;,
uint8_t stop_of_traffic:1;,
uint8_t start_of_traffic:1;,
uint8_t quota_holding_time:1;,
uint8_t time_threshold:1;,
uint8_t volume_threshold:1;,
uint8_t periodic_reporting:1;)
};
uint8_t reptri_5;
};
union {
struct {
ED8(uint8_t quota_validity_time:1;,
uint8_t ip_multicast_join_leave:1;,
uint8_t event_quota:1;,
uint8_t event_threshold:1;,
uint8_t mac_addresses_reporting:1;,
uint8_t envelope_closure:1;,
uint8_t time_quota:1;,
uint8_t volume_quota:1;)
};
uint8_t reptri_6;
};
union {
struct {
ED2(uint8_t spare:7;,
uint8_t report_the_end_marker_reception:1;)
};
uint8_t reptri_7;
};
} __attribute__ ((packed)) ogs_pfcp_reporting_triggers_t;
/*
* 8.2.21 Report Type
*
@ -945,10 +983,10 @@ typedef uint8_t ogs_pfcp_measurement_method_t;
* The Usage Report Trigger IE shall be encoded as shown in Figure 8.2.41-1.
* It indicates the trigger of the usage report.
*/
typedef struct ogs_pfcp_reporting_triggers_s {
typedef struct ogs_pfcp_usage_report_trigger_s {
union {
struct {
ED8(uint8_t linked_usage_reporting:1;,
ED8(uint8_t immediate_report:1;;,
uint8_t dropped_dl_traffic_threshold:1;,
uint8_t stop_of_traffic:1;,
uint8_t start_of_traffic:1;,
@ -961,12 +999,12 @@ ED8(uint8_t linked_usage_reporting:1;,
};
union {
struct {
ED8(uint8_t quota_validity_time:1;,
uint8_t ip_multicast_join_leave:1;,
uint8_t event_quota:1;,
uint8_t event_threshold:1;,
ED8(uint8_t event_threshold:1;,
uint8_t mac_addresses_reporting:1;,
uint8_t envelope_closure:1;,
uint8_t monitoring_time:1;,
uint8_t termination_report:1;,
uint8_t linked_usage_reporting:1;,
uint8_t time_quota:1;,
uint8_t volume_quota:1;)
};
@ -974,12 +1012,16 @@ ED8(uint8_t quota_validity_time:1;,
};
union {
struct {
ED2(uint8_t spare:7;,
uint8_t report_the_end_marker_reception:1;)
ED6(uint8_t spare:3;,
uint8_t report_the_end_marker_reception:1;,
uint8_t quota_validity_time:1;,
uint8_t ip_multicast_join_leave:1;,
uint8_t termination_by_up_function_report:1;,
uint8_t event_quota:1;)
};
uint8_t reptri_7;
};
} __attribute__ ((packed)) ogs_pfcp_reporting_triggers_t;
} __attribute__ ((packed)) ogs_pfcp_usage_report_trigger_t;
/*
* 8.2.42 Measurement Period
@ -1282,7 +1324,7 @@ typedef struct ogs_pfcp_user_plane_report_s {
struct {
ogs_pfcp_urr_id_t id;
ogs_pfcp_urr_ur_seqn_t seqn;
ogs_pfcp_reporting_triggers_t rep_triggers;
ogs_pfcp_usage_report_trigger_t rep_trigger;
ogs_pfcp_start_time_t start_time;
ogs_pfcp_end_time_t end_time;
ogs_pfcp_volume_measurement_t vol_measurement;