From 29ea85ca4cb81eccd6d184a2714f76111a2c356b Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Wed, 24 Jan 2024 15:49:53 +0100 Subject: [PATCH] cosmetic: pcrf/pcrf-gx-path.c: Fix trailing whitespace --- src/pcrf/pcrf-gx-path.c | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/pcrf/pcrf-gx-path.c b/src/pcrf/pcrf-gx-path.c index 22360d924..b8dd719e0 100644 --- a/src/pcrf/pcrf-gx-path.c +++ b/src/pcrf/pcrf-gx-path.c @@ -55,8 +55,8 @@ static OGS_POOL(rx_sess_state_pool, struct rx_sess_state); static ogs_thread_mutex_t sess_state_mutex; static struct session_handler *pcrf_gx_reg = NULL; -static struct disp_hdl *hdl_gx_fb = NULL; -static struct disp_hdl *hdl_gx_ccr = NULL; +static struct disp_hdl *hdl_gx_fb = NULL; +static struct disp_hdl *hdl_gx_ccr = NULL; static void pcrf_gx_raa_cb(void *data, struct msg **msg); @@ -169,7 +169,7 @@ static struct rx_sess_state *find_rx_state(struct sess_state *gx, os0_t sid) ogs_assert(gx); ogs_assert(sid); - + ogs_list_for_each(&gx->rx_list, rx_sess_data) { if (!strcmp((char *)rx_sess_data->sid, (char *)sid)) return rx_sess_data; @@ -199,13 +199,13 @@ static void state_cleanup(struct sess_state *sess_data, os0_t sid, void *opaque) ogs_free(sess_data->sid); remove_rx_state_all(sess_data); - + ogs_thread_mutex_lock(&sess_state_mutex); ogs_pool_free(&sess_state_pool, sess_data); ogs_thread_mutex_unlock(&sess_state_mutex); } -static int pcrf_gx_fb_cb(struct msg **msg, struct avp *avp, +static int pcrf_gx_fb_cb(struct msg **msg, struct avp *avp, struct session *sess, void *opaque, enum disp_action *act) { /* This CB should never be called */ @@ -214,7 +214,7 @@ static int pcrf_gx_fb_cb(struct msg **msg, struct avp *avp, return ENOTSUP; } -static int pcrf_gx_ccr_cb( struct msg **msg, struct avp *avp, +static int pcrf_gx_ccr_cb( struct msg **msg, struct avp *avp, struct session *sess, void *opaque, enum disp_action *act) { int rv; @@ -486,7 +486,7 @@ static int pcrf_gx_ccr_cb( struct msg **msg, struct avp *avp, ret = fd_msg_avp_add (avp, MSG_BRW_LAST_CHILD, avpch1); ogs_assert(ret == 0); } - + if (gx_message.session_data.session.ambr.downlink) { ret = fd_msg_avp_new( ogs_diam_gx_apn_aggregate_max_bitrate_dl, 0, &avpch1); @@ -779,7 +779,7 @@ int pcrf_gx_send_rar( rx_message->result_code = OGS_DIAM_INVALID_AVP_VALUE; goto out; } - + for (j = 0; j < gx_message.session_data.num_of_pcc_rule; j++) { if (gx_message.session_data.pcc_rule[j].qos.index == qos_index) { @@ -814,7 +814,7 @@ int pcrf_gx_send_rar( ogs_error("CHECK WEBUI : No PCC Rule in DB [QoS Index:%d]", qos_index); ogs_error("Please add PCC Rule using WEBUI"); - rx_message->result_code = + rx_message->result_code = OGS_DIAM_RX_DIAMETER_REQUESTED_SERVICE_NOT_AUTHORIZED; goto out; } @@ -827,7 +827,7 @@ int pcrf_gx_send_rar( } if (!pcc_rule) { - pcc_rule = + pcc_rule = &rx_sess_data->pcc_rule[rx_sess_data->num_of_pcc_rule]; /* Device PCC Rule Info from DB Profile */ @@ -871,7 +871,7 @@ int pcrf_gx_send_rar( rv = ogs_pcc_rule_install_flow_from_media( pcc_rule, media_component); if (rv != OGS_OK) { - rx_message->result_code = + rx_message->result_code = OGS_DIAM_RX_DIAMETER_FILTER_RESTRICTIONS; ogs_error("install_flow() failed"); goto out; @@ -995,16 +995,16 @@ int pcrf_gx_send_rar( ret = clock_gettime(CLOCK_REALTIME, &sess_data->ts); ogs_assert(ret == 0); - - /* Keep a pointer to the session data for debug purpose, + + /* Keep a pointer to the session data for debug purpose, * in real life we would not need it */ svg = sess_data; - + /* Store this value in the session */ ret = fd_sess_state_store(pcrf_gx_reg, session, &sess_data); ogs_assert(ret == 0); ogs_assert(sess_data == NULL); - + /* Send the request */ ret = fd_msg_send(&req, pcrf_gx_raa_cb, svg); ogs_assert(ret == 0); @@ -1043,7 +1043,7 @@ static void pcrf_gx_raa_cb(void *data, struct msg **msg) unsigned long dur; int error = 0; int new; - + uint32_t result_code; ogs_debug("[PCRF] Re-Auth-Answer"); @@ -1055,7 +1055,7 @@ static void pcrf_gx_raa_cb(void *data, struct msg **msg) ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new); ogs_assert(ret == 0); ogs_assert(new == 0); - + ret = fd_sess_state_retrieve(pcrf_gx_reg, session, &sess_data); ogs_assert(ret == 0); ogs_assert(sess_data); @@ -1116,11 +1116,11 @@ static void pcrf_gx_raa_cb(void *data, struct msg **msg) /* Free the message */ ogs_assert(pthread_mutex_lock(&ogs_diam_logger_self()->stats_lock) == 0); - dur = ((ts.tv_sec - sess_data->ts.tv_sec) * 1000000) + + dur = ((ts.tv_sec - sess_data->ts.tv_sec) * 1000000) + ((ts.tv_nsec - sess_data->ts.tv_nsec) / 1000); if (ogs_diam_logger_self()->stats.nb_recv) { /* Ponderate in the avg */ - ogs_diam_logger_self()->stats.avg = (ogs_diam_logger_self()->stats.avg * + ogs_diam_logger_self()->stats.avg = (ogs_diam_logger_self()->stats.avg * ogs_diam_logger_self()->stats.nb_recv + dur) / (ogs_diam_logger_self()->stats.nb_recv + 1); /* Min, max */ @@ -1135,18 +1135,18 @@ static void pcrf_gx_raa_cb(void *data, struct msg **msg) } if (error) ogs_diam_logger_self()->stats.nb_errs++; - else + else ogs_diam_logger_self()->stats.nb_recv++; ogs_assert(pthread_mutex_unlock(&ogs_diam_logger_self()->stats_lock) == 0); - + /* Display how long it took */ if (ts.tv_nsec > sess_data->ts.tv_nsec) - ogs_trace("in %d.%06ld sec", + ogs_trace("in %d.%06ld sec", (int)(ts.tv_sec - sess_data->ts.tv_sec), (long)(ts.tv_nsec - sess_data->ts.tv_nsec) / 1000); else - ogs_trace("in %d.%06ld sec", + ogs_trace("in %d.%06ld sec", (int)(ts.tv_sec + 1 - sess_data->ts.tv_sec), (long)(1000000000 + ts.tv_nsec - sess_data->ts.tv_nsec) / 1000); @@ -1157,7 +1157,7 @@ static void pcrf_gx_raa_cb(void *data, struct msg **msg) ret = fd_msg_free(*msg); ogs_assert(ret == 0); *msg = NULL; - + return; } @@ -1202,7 +1202,7 @@ void pcrf_gx_final(void) int ret; ret = fd_sess_handler_destroy(&pcrf_gx_reg, NULL); - ogs_assert(ret == 0); + ogs_assert(ret == 0); if (hdl_gx_fb) (void) fd_disp_unregister(&hdl_gx_fb, NULL); @@ -1242,7 +1242,7 @@ static int encode_pcc_rule_definition( ret = fd_msg_avp_new(ogs_diam_gx_flow_information, 0, &avpch2); ogs_assert(ret == 0); - ret = fd_msg_avp_new(ogs_diam_gx_flow_direction, 0, &avpch3); + ret = fd_msg_avp_new(ogs_diam_gx_flow_direction, 0, &avpch3); ogs_assert(ret == 0); val.i32 = flow->direction; ret = fd_msg_avp_setvalue(avpch3, &val); @@ -1250,7 +1250,7 @@ static int encode_pcc_rule_definition( ret = fd_msg_avp_add(avpch2, MSG_BRW_LAST_CHILD, avpch3); ogs_assert(ret == 0); - ret = fd_msg_avp_new(ogs_diam_gx_flow_description, 0, &avpch3); + ret = fd_msg_avp_new(ogs_diam_gx_flow_description, 0, &avpch3); ogs_assert(ret == 0); val.os.data = (uint8_t *)flow->description; val.os.len = strlen(flow->description); @@ -1373,6 +1373,6 @@ static int encode_pcc_rule_definition( ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avpch1); ogs_assert(ret == 0); - + return OGS_OK; }