cnxcc: clang format the code

kamailio · Nov 24, 2017 · db004a7 · db004a7
1 parent a8b4bd9
commit db004a7
Show file tree

Hide file tree

Showing 14 changed files with 1,316 additions and 1,042 deletions.
diff --git a/src/modules/cnxcc/cnxcc.c b/src/modules/cnxcc/cnxcc.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Carlos Ruiz Díaz (caruizdiaz.com),
  *                    ConexionGroup (www.conexiongroup.com)
  *
@@ -32,7 +30,7 @@ double str2double(str *string)
 {
 	char buffer[string->len + 1];
 
-	buffer[string->len]	= '\0';
+	buffer[string->len] = '\0';
 	memcpy(buffer, string->s, string->len);
 
 	return atof(buffer);

diff --git a/src/modules/cnxcc/cnxcc.h b/src/modules/cnxcc/cnxcc.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Carlos Ruiz Díaz (caruizdiaz.com),
  *                    ConexionGroup (www.conexiongroup.com)
  *
@@ -27,8 +25,8 @@
 
 #include "../../core/str.h"
 
-#define DATETIME_SIZE		sizeof("0001-01-01 00:00:00")
-#define DATETIME_LENGTH		DATETIME_SIZE - 1
+#define DATETIME_SIZE sizeof("0001-01-01 00:00:00")
+#define DATETIME_LENGTH DATETIME_SIZE - 1
 
 
 static inline unsigned int get_current_timestamp()
@@ -38,14 +36,14 @@ static inline unsigned int get_current_timestamp()
 
 static inline int timestamp2isodt(str *dest, unsigned int timestamp)
 {
-	time_t  		tim;
-	struct tm 		*tmPtr;
+	time_t tim;
+	struct tm *tmPtr;
 
-	tim 		= timestamp;
-	tmPtr 		= localtime(&tim);
+	tim = timestamp;
+	tmPtr = localtime(&tim);
 
-	strftime( dest->s, DATETIME_SIZE, "%Y-%m-%d %H:%M:%S", tmPtr);
-	dest->len	= DATETIME_LENGTH;
+	strftime(dest->s, DATETIME_SIZE, "%Y-%m-%d %H:%M:%S", tmPtr);
+	dest->len = DATETIME_LENGTH;
 
 	return 0;
 }

diff --git a/src/modules/cnxcc/cnxcc_check.c b/src/modules/cnxcc/cnxcc_check.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Carlos Ruiz Díaz (caruizdiaz.com),
  *                    ConexionGroup (www.conexiongroup.com)
  *
@@ -32,85 +30,106 @@
 
 extern data_t _data;
 
-void check_calls_by_money(unsigned int ticks, void *param) {
-	struct str_hash_entry *h_entry = NULL,
-	                      *tmp = NULL;
+void check_calls_by_money(unsigned int ticks, void *param)
+{
+	struct str_hash_entry *h_entry = NULL, *tmp = NULL;
 	call_t *tmp_call = NULL;
 	int i;
 
 	cnxcc_lock(_data.money.lock);
 
-	if (_data.money.credit_data_by_client->table)
+	if(_data.money.credit_data_by_client->table)
 		for(i = 0; i < _data.money.credit_data_by_client->size; i++)
-			clist_foreach_safe(&_data.money.credit_data_by_client->table[i], h_entry, tmp, next) {
-				credit_data_t *credit_data = (credit_data_t *) h_entry->u.p;
+			clist_foreach_safe(&_data.money.credit_data_by_client->table[i],
+					h_entry, tmp, next)
+			{
+				credit_data_t *credit_data = (credit_data_t *)h_entry->u.p;
 				call_t *call = NULL;
-				double total_consumed_money = 0, consumption_diff = 0/*, distributed_consumption = 0*/;
+				double total_consumed_money = 0,
+					   consumption_diff = 0 /*, distributed_consumption = 0*/;
 
-/*				if (i > SAFE_ITERATION_THRESHOLD) {
+				/*				if (i > SAFE_ITERATION_THRESHOLD) {
 					LM_ERR("Too many iterations for this loop: %d\n", i);
 					break;
 				}*/
 
 				cnxcc_lock(credit_data->lock);
 
-				clist_foreach_safe(credit_data->call_list, call, tmp_call, next) {
+				clist_foreach_safe(credit_data->call_list, call, tmp_call, next)
+				{
 					int consumed_time = 0;
 
-					if (!call->confirmed)
+					if(!call->confirmed)
 						continue;
 
-					consumed_time = get_current_timestamp() - call->start_timestamp;
-
-					if (consumed_time > call->money_based.initial_pulse) {
-						call->consumed_amount = (call->money_based.cost_per_second * call->money_based.initial_pulse)
-												+
-												call->money_based.cost_per_second *
-												( (consumed_time - call->money_based.initial_pulse) / call->money_based.final_pulse + 1 ) *
-												call->money_based.final_pulse;
+					consumed_time =
+							get_current_timestamp() - call->start_timestamp;
+
+					if(consumed_time > call->money_based.initial_pulse) {
+						call->consumed_amount =
+								(call->money_based.cost_per_second
+										* call->money_based.initial_pulse)
+								+ call->money_based.cost_per_second
+										  * ((consumed_time
+													 - call->money_based
+															   .initial_pulse)
+															/ call->money_based
+																	  .final_pulse
+													+ 1)
+										  * call->money_based.final_pulse;
 					}
 
 					total_consumed_money += call->consumed_amount;
 
-					if (call->consumed_amount > call->max_amount) {
-						LM_ALERT("[%.*s] call has exhausted its credit. Breaking the loop\n", call->sip_data.callid.len, call->sip_data.callid.s);
+					if(call->consumed_amount > call->max_amount) {
+						LM_ALERT("[%.*s] call has exhausted its credit. "
+								 "Breaking the loop\n",
+								call->sip_data.callid.len,
+								call->sip_data.callid.s);
 						break;
 					}
 
-					LM_DBG("CID [%.*s], start_timestamp [%d], seconds alive [%d], consumed credit [%f]\n",
-																			call->sip_data.callid.len, call->sip_data.callid.s,
-																			call->start_timestamp,
-																			consumed_time,
-																			call->consumed_amount
-																			);
+					LM_DBG("CID [%.*s], start_timestamp [%d], seconds alive "
+						   "[%d], consumed credit [%f]\n",
+							call->sip_data.callid.len, call->sip_data.callid.s,
+							call->start_timestamp, consumed_time,
+							call->consumed_amount);
 				}
 
-				if (credit_data->concurrent_calls == 0) {
+				if(credit_data->concurrent_calls == 0) {
 					cnxcc_unlock(credit_data->lock);
 					continue;
 				}
 
-				if (_data.redis) {
-					LM_DBG("ec=%f, ca=%f, ca2=%f", credit_data->ended_calls_consumed_amount, total_consumed_money, credit_data->consumed_amount);
-
-					consumption_diff = credit_data->ended_calls_consumed_amount + total_consumed_money - credit_data->consumed_amount;
-					if (consumption_diff > 0)
-						redis_incr_by_double(credit_data, "consumed_amount", consumption_diff);
+				if(_data.redis) {
+					LM_DBG("ec=%f, ca=%f, ca2=%f",
+							credit_data->ended_calls_consumed_amount,
+							total_consumed_money, credit_data->consumed_amount);
+
+					consumption_diff = credit_data->ended_calls_consumed_amount
+									   + total_consumed_money
+									   - credit_data->consumed_amount;
+					if(consumption_diff > 0)
+						redis_incr_by_double(credit_data, "consumed_amount",
+								consumption_diff);
 				}
 
-				credit_data->consumed_amount = credit_data->ended_calls_consumed_amount + total_consumed_money /* + distributed_consumption */;
+				credit_data->consumed_amount =
+						credit_data->ended_calls_consumed_amount
+						+ total_consumed_money /* + distributed_consumption */;
 
-				LM_DBG("Client [%.*s] | Ended-Calls-Credit-Spent: %f  TotalCredit/MaxCredit: %f/%f\n",
-							credit_data->call_list->client_id.len, credit_data->call_list->client_id.s,
-							credit_data->ended_calls_consumed_amount,
-							credit_data->consumed_amount,
-							credit_data->max_amount);
+				LM_DBG("Client [%.*s] | Ended-Calls-Credit-Spent: %f  "
+					   "TotalCredit/MaxCredit: %f/%f\n",
+						credit_data->call_list->client_id.len,
+						credit_data->call_list->client_id.s,
+						credit_data->ended_calls_consumed_amount,
+						credit_data->consumed_amount, credit_data->max_amount);
 
-				if (credit_data->consumed_amount >= credit_data->max_amount) {
+				if(credit_data->consumed_amount >= credit_data->max_amount) {
 					terminate_all_calls(credit_data);
 
 					// make sure the rest of the servers kill the calls belonging to this customer
-					if (_data.redis)
+					if(_data.redis)
 						redis_publish_to_kill_list(credit_data);
 					cnxcc_unlock(credit_data->lock);
 					break;
@@ -122,21 +141,24 @@ void check_calls_by_money(unsigned int ticks, void *param) {
 	cnxcc_unlock(_data.money.lock);
 }
 
-void check_calls_by_time(unsigned int ticks, void *param) {
+void check_calls_by_time(unsigned int ticks, void *param)
+{
 	struct str_hash_entry *h_entry = NULL;
 	struct str_hash_entry *tmp = NULL;
 	call_t *tmp_call = NULL;
 	int i;
 
 	cnxcc_lock(_data.time.lock);
 
-	if (_data.time.credit_data_by_client->table)
+	if(_data.time.credit_data_by_client->table)
 		for(i = 0; i < _data.time.credit_data_by_client->size; i++)
-			clist_foreach_safe(&_data.time.credit_data_by_client->table[i], h_entry, tmp, next) {
-				credit_data_t *credit_data = (credit_data_t *) h_entry->u.p;
+			clist_foreach_safe(&_data.time.credit_data_by_client->table[i],
+					h_entry, tmp, next)
+			{
+				credit_data_t *credit_data = (credit_data_t *)h_entry->u.p;
 				call_t *call = NULL;
 				int total_consumed_secs = 0;
-				double consumption_diff = 0/*, distributed_consumption = 0*/;
+				double consumption_diff = 0 /*, distributed_consumption = 0*/;
 
 				cnxcc_lock(credit_data->lock);
 
@@ -146,50 +168,64 @@ void check_calls_by_time(unsigned int ticks, void *param) {
 					break;
 				} */
 
-				LM_DBG("Iterating through calls of client [%.*s]\n", credit_data->call_list->client_id.len, credit_data->call_list->client_id.s);
+				LM_DBG("Iterating through calls of client [%.*s]\n",
+						credit_data->call_list->client_id.len,
+						credit_data->call_list->client_id.s);
 
-				clist_foreach_safe(credit_data->call_list, call, tmp_call, next) {
-					if (!call->confirmed)
+				clist_foreach_safe(credit_data->call_list, call, tmp_call, next)
+				{
+					if(!call->confirmed)
 						continue;
 
-					call->consumed_amount = get_current_timestamp() - call->start_timestamp;
-					total_consumed_secs	+= call->consumed_amount;
+					call->consumed_amount =
+							get_current_timestamp() - call->start_timestamp;
+					total_consumed_secs += call->consumed_amount;
 
-					if (call->consumed_amount > call->max_amount) {
-						LM_ALERT("[%.*s] call has exhausted its time. Breaking the loop\n", call->sip_data.callid.len, call->sip_data.callid.s);
+					if(call->consumed_amount > call->max_amount) {
+						LM_ALERT("[%.*s] call has exhausted its time. Breaking "
+								 "the loop\n",
+								call->sip_data.callid.len,
+								call->sip_data.callid.s);
 						break;
 					}
 
-					LM_DBG("CID [%.*s], start_timestamp [%d], seconds alive [%d]\n",
-																			call->sip_data.callid.len, call->sip_data.callid.s,
-																			call->start_timestamp,
-																			(int) call->consumed_amount
-																			);
+					LM_DBG("CID [%.*s], start_timestamp [%d], seconds alive "
+						   "[%d]\n",
+							call->sip_data.callid.len, call->sip_data.callid.s,
+							call->start_timestamp, (int)call->consumed_amount);
 				}
 
-				if (credit_data->concurrent_calls == 0) {
+				if(credit_data->concurrent_calls == 0) {
 					cnxcc_unlock(credit_data->lock);
 					continue;
 				}
 
-				if (_data.redis) {
-					consumption_diff = credit_data->ended_calls_consumed_amount + total_consumed_secs - credit_data->consumed_amount;
-					if (consumption_diff > 0)
-						redis_incr_by_double(credit_data, "consumed_amount", consumption_diff);
+				if(_data.redis) {
+					consumption_diff = credit_data->ended_calls_consumed_amount
+									   + total_consumed_secs
+									   - credit_data->consumed_amount;
+					if(consumption_diff > 0)
+						redis_incr_by_double(credit_data, "consumed_amount",
+								consumption_diff);
 				}
 
-				credit_data->consumed_amount = credit_data->ended_calls_consumed_amount + total_consumed_secs /*+ distributed_consumption*/;
+				credit_data->consumed_amount =
+						credit_data->ended_calls_consumed_amount
+						+ total_consumed_secs /*+ distributed_consumption*/;
 
-				LM_DBG("Client [%.*s] | Ended-Calls-Time: %d  TotalTime/MaxTime: %d/%d\n", credit_data->call_list->client_id.len, credit_data->call_list->client_id.s,
-																									(int) credit_data->ended_calls_consumed_amount,
-																									(int) credit_data->consumed_amount,
-																									(int) credit_data->max_amount);
+				LM_DBG("Client [%.*s] | Ended-Calls-Time: %d  "
+					   "TotalTime/MaxTime: %d/%d\n",
+						credit_data->call_list->client_id.len,
+						credit_data->call_list->client_id.s,
+						(int)credit_data->ended_calls_consumed_amount,
+						(int)credit_data->consumed_amount,
+						(int)credit_data->max_amount);
 
-				if (credit_data->consumed_amount >= credit_data->max_amount) {
+				if(credit_data->consumed_amount >= credit_data->max_amount) {
 					terminate_all_calls(credit_data);
 
 					// make sure the rest of the servers kill the calls belonging to this customer
-					if (_data.redis)
+					if(_data.redis)
 						redis_publish_to_kill_list(credit_data);
 					cnxcc_unlock(credit_data->lock);
 					break;

diff --git a/src/modules/cnxcc/cnxcc_check.h b/src/modules/cnxcc/cnxcc_check.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Carlos Ruiz Díaz (caruizdiaz.com),
  *                    ConexionGroup (www.conexiongroup.com)
  *