fix

travelping · Feb 19, 2024 · 0c3e1e9 · 0c3e1e9
1 parent c089341
commit 0c3e1e9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/upf/pfcp.h b/upf/pfcp.h
@@ -2790,6 +2790,7 @@ typedef struct
 } pfcp_decoded_msg_t;
 
 /* Quick message accessors for use without decoding */
+
 #define pfcp_node_msg_seq(V)                                                  \
   ((((pfcp_msg_header_t *) (V))->node_hdr.sequence[0] << 16) +                \
    (((pfcp_msg_header_t *) (V))->node_hdr.sequence[1] << 8) +                 \

diff --git a/upf/upf_pfcp_api.c b/upf/upf_pfcp_api.c
@@ -2838,10 +2838,8 @@ handle_session_modification_request (pfcp_msg_t *msg, pfcp_decoded_msg_t *dmsg)
     }
 
   if (has_report)
-    {
-      upf_usage_report_build (sess, NULL, active->urr, now, &report,
-                              &resp->usage_report);
-    }
+    upf_usage_report_build (sess, NULL, active->urr, now, &report,
+                            &resp->usage_report);
 
 out_update_finish:
   pfcp_update_finish (sess);
@@ -2854,9 +2852,7 @@ handle_session_modification_request (pfcp_msg_t *msg, pfcp_decoded_msg_t *dmsg)
 
   upf_pfcp_send_response (msg, &resp_dmsg);
   if (has_report)
-    {
-      upf_usage_report_free (&report);
-    }
+    upf_usage_report_free (&report);
 
   return r;
 }
@@ -2900,7 +2896,6 @@ handle_session_deletion_request (pfcp_msg_t *msg, pfcp_decoded_msg_t *dmsg)
   pfcp_disable_session (sess);
 
   active = pfcp_get_rules (sess, PFCP_ACTIVE);
-  bool has_report = false;
   if (vec_len (active->urr) != 0)
     {
       upf_usage_report_t report;
@@ -2912,7 +2907,6 @@ handle_session_deletion_request (pfcp_msg_t *msg, pfcp_decoded_msg_t *dmsg)
                             PFCP_USAGE_REPORT_TRIGGER_TERMINATION_REPORT, now);
       upf_usage_report_build (sess, NULL, active->urr, now, &report,
                               &resp->usage_report);
-      has_report = true;
       upf_usage_report_free (&report);
     }
 

diff --git a/upf/upf_pfcp_server.c b/upf/upf_pfcp_server.c
@@ -811,7 +811,6 @@ upf_pfcp_session_up_deletion_report (upf_session_t *sx)
   memset (req, 0, sizeof (*req));
   UPF_SET_BIT (req->grp.fields, SESSION_REPORT_REQUEST_REPORT_TYPE);
 
-  bool has_report = false;
   active = pfcp_get_rules (sx, PFCP_ACTIVE);
   if (vec_len (active->urr) != 0)
     {
@@ -827,7 +826,6 @@ upf_pfcp_session_up_deletion_report (upf_session_t *sx)
         now);
       upf_usage_report_build (sx, NULL, active->urr, now, &report,
                               &req->usage_report);
-      has_report = true;
       upf_usage_report_free (&report);
     }
   else