Skip to content

Commit

Permalink
acc: clang-format for coherent indentation and coding style
Browse files Browse the repository at this point in the history
  • Loading branch information
@linuxmaniac
linuxmaniac committed May 18, 2023
1 parent afdf665 commit b41657f
Show file tree
Hide file tree
Showing 10 changed files with 1,020 additions and 1,067 deletions.
332 changes: 177 additions & 155 deletions src/modules/acc/acc.c
View file

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions src/modules/acc/acc.h
View file
Expand Up @@ -33,34 +33,34 @@

/* leading text for a request accounted from a script */
#define ACC "ACC: "
#define ACC_REQUEST ACC"request accounted: "
#define ACC_REQUEST_LEN (sizeof(ACC_REQUEST)-1)
#define ACC_MISSED ACC"call missed: "
#define ACC_MISSED_LEN (sizeof(ACC_MISSED)-1)
#define ACC_ANSWERED ACC"transaction answered: "
#define ACC_ANSWERED_LEN (sizeof(ACC_ANSWERED)-1)
#define ACC_ACKED ACC"request acknowledged: "
#define ACC_ACKED_LEN (sizeof(ACC_ACKED)-1)
#define ACC_REQUEST ACC "request accounted: "
#define ACC_REQUEST_LEN (sizeof(ACC_REQUEST) - 1)
#define ACC_MISSED ACC "call missed: "
#define ACC_MISSED_LEN (sizeof(ACC_MISSED) - 1)
#define ACC_ANSWERED ACC "transaction answered: "
#define ACC_ANSWERED_LEN (sizeof(ACC_ANSWERED) - 1)
#define ACC_ACKED ACC "request acknowledged: "
#define ACC_ACKED_LEN (sizeof(ACC_ACKED) - 1)

/* syslog attribute names */
#define A_METHOD "method"
#define A_METHOD_LEN (sizeof(A_METHOD)-1)
#define A_METHOD_LEN (sizeof(A_METHOD) - 1)
#define A_FROMTAG "from_tag"
#define A_FROMTAG_LEN (sizeof(A_FROMTAG)-1)
#define A_FROMTAG_LEN (sizeof(A_FROMTAG) - 1)
#define A_TOTAG "to_tag"
#define A_TOTAG_LEN (sizeof(A_TOTAG)-1)
#define A_TOTAG_LEN (sizeof(A_TOTAG) - 1)
#define A_CALLID "call_id"
#define A_CALLID_LEN (sizeof(A_CALLID)-1)
#define A_CALLID_LEN (sizeof(A_CALLID) - 1)
#define A_CODE "code"
#define A_CODE_LEN (sizeof(A_CODE)-1)
#define A_CODE_LEN (sizeof(A_CODE) - 1)
#define A_STATUS "reason"
#define A_STATUS_LEN (sizeof(A_STATUS)-1)
#define A_STATUS_LEN (sizeof(A_STATUS) - 1)

#define A_SEPARATOR_CHR ';'
#define A_SEPARATOR_CHR_2 ' '
#define A_EQ_CHR '='

#define MAX_SYSLOG_SIZE 65536
#define MAX_SYSLOG_SIZE 65536

#define MAX_FAILED_FILTER_COUNT 15

Expand All @@ -70,25 +70,25 @@
* projects. The value of the flag must be kept synchronized with other flags
* defined in parser/msg_parser.h!
*/
#define FL_REQ_UPSTREAM (1<<29)
#define FL_REQ_UPSTREAM (1 << 29)

extern int acc_extra_size;

void acc_log_init(void);
int acc_log_request( struct sip_msg *req);
int acc_log_request(struct sip_msg *req);

int core2strar(struct sip_msg *req, str *c_vals, int *i_vals, char *t_vals);

int acc_is_db_ready(void);

int acc_db_init(const str* db_url);
int acc_db_init_child(const str* db_url);
int acc_db_init(const str *db_url);
int acc_db_init_child(const str *db_url);
void acc_db_close(void);
int acc_db_request( struct sip_msg *req);
int acc_get_db_handlers(void **vf, void **vh);
int acc_db_request(struct sip_msg *req);
int acc_get_db_handlers(void **vf, void **vh);

int is_eng_acc_on(sip_msg_t *msg);
int is_eng_mc_on(sip_msg_t *msg);
int is_eng_acc_on(sip_msg_t *msg);
int is_eng_mc_on(sip_msg_t *msg);

int acc_arrays_alloc(void);
void acc_arrays_free(void);
Expand Down
116 changes: 67 additions & 49 deletions src/modules/acc/acc_api.h
View file
Expand Up @@ -41,15 +41,17 @@
#include "../dialog/dlg_load.h"

/* param trasnporter */
typedef struct acc_param {
typedef struct acc_param
{
int code;
str code_s;
str reason;
pv_elem_p elem;
pv_elem_p elem;
} acc_param_t;

/* various acc variables */
typedef struct acc_environment {
typedef struct acc_environment
{
unsigned int code;
str code_s;
str reason;
Expand All @@ -61,32 +63,35 @@ typedef struct acc_environment {
} acc_environment_t;

/* acc extra parameter */
typedef struct acc_extra {
str name; /*!< name (log comment/ column name) */
pv_spec_t spec; /*!< value's spec */
typedef struct acc_extra
{
str name; /*!< name (log comment/ column name) */
pv_spec_t spec; /*!< value's spec */
struct acc_extra *next;
} acc_extra_t;

typedef acc_param_t cdr_param_t;
typedef acc_environment_t cdr_environment_t;
typedef acc_extra_t cdr_extra_t;
typedef acc_extra_t cdr_extra_t;

typedef int (*core2strar_f)( struct sip_msg *req, str *c_vals,
int *i_vals, char *t_vals);
typedef int (*extra2strar_f)(struct acc_extra *extra, struct sip_msg *rq, str *val_arr,
int *int_arr, char *type_arr);
typedef int (*legs2strar_f)( struct acc_extra *legs, struct sip_msg *rq, str *val_arr,
int *int_arr, char *type_arr, int start);
typedef acc_extra_t* (*leg_info_f)(void);
typedef int (*core2strar_f)(
struct sip_msg *req, str *c_vals, int *i_vals, char *t_vals);
typedef int (*extra2strar_f)(struct acc_extra *extra, struct sip_msg *rq,
str *val_arr, int *int_arr, char *type_arr);
typedef int (*legs2strar_f)(struct acc_extra *legs, struct sip_msg *rq,
str *val_arr, int *int_arr, char *type_arr, int start);
typedef acc_extra_t *(*leg_info_f)(void);

/* cdr related functions */
typedef int (*cdr_core2strar_f)( struct dlg_cell* dlg,
str* values, int* unused, char* types);
typedef int (*extra2strar_dlg_only_f)(struct acc_extra *extra, struct dlg_cell* dlg, str *val_arr,
int *int_arr, char *type_arr, const struct dlg_binds* p_dlgb);
typedef int (*cdr_core2strar_f)(
struct dlg_cell *dlg, str *values, int *unused, char *types);
typedef int (*extra2strar_dlg_only_f)(struct acc_extra *extra,
struct dlg_cell *dlg, str *val_arr, int *int_arr, char *type_arr,
const struct dlg_binds *p_dlgb);

/* acc event data structures */
typedef struct acc_info {
typedef struct acc_info
{
acc_environment_t *env;
str *varr;
int *iarr;
Expand All @@ -95,81 +100,95 @@ typedef struct acc_info {
} acc_info_t;

/* cdr event data structures */
typedef struct cdr_info {
typedef struct cdr_info
{
str *varr;
int *iarr;
char *tarr;
} cdr_info_t;

/* acc engine initialization data structures */
typedef struct acc_init_info {
acc_extra_t *leg_info;
typedef struct acc_init_info
{
acc_extra_t *leg_info;
} acc_init_info_t;

typedef int (*acc_init_f)(acc_init_info_t *inf);
typedef int (*acc_req_f)(struct sip_msg *req, acc_info_t *data);

typedef int (*cdr_init_f)(void);
typedef int (*cdr_write_f)(struct dlg_cell *dlg, struct sip_msg *req, cdr_info_t *data);
typedef int (*cdr_write_f)(
struct dlg_cell *dlg, struct sip_msg *req, cdr_info_t *data);
/* acc engine structure */
typedef struct acc_engine {
typedef struct acc_engine
{
char name[16];
int flags;
int acc_flag;
int missed_flag;
acc_init_f acc_init;
acc_req_f acc_req;
acc_req_f acc_req;
struct acc_engine *next;
} acc_engine_t;

/* cdr engine structure */
typedef struct cdr_engine {
typedef struct cdr_engine
{
char name[16];
cdr_init_f cdr_init;
cdr_write_f cdr_write;
cdr_init_f cdr_init;
cdr_write_f cdr_write;
struct cdr_engine *next;
} cdr_engine_t;

#define MAX_ACC_EXTRA 64
#define MAX_ACC_LEG 16
#define ACC_CORE_LEN 6
#define MAX_ACC_LEG 16
#define ACC_CORE_LEN 6


enum {TYPE_NULL = 0, TYPE_INT, TYPE_STR, TYPE_DOUBLE, TYPE_DATE};
enum
{
TYPE_NULL = 0,
TYPE_INT,
TYPE_STR,
TYPE_DOUBLE,
TYPE_DATE
};


typedef int (*register_engine_f)(acc_engine_t *eng);
typedef int (*acc_api_exec_f)(struct sip_msg *rq, acc_engine_t *eng,
acc_param_t* comment);
typedef acc_extra_t* (*parse_extra_f)(char *extra_str);
typedef int (*acc_api_exec_f)(
struct sip_msg *rq, acc_engine_t *eng, acc_param_t *comment);
typedef acc_extra_t *(*parse_extra_f)(char *extra_str);

typedef int (*register_cdr_engine_f)(cdr_engine_t *eng);
typedef int (*cdr_api_exec_f)(struct dlg_cell *dlg, struct sip_msg *rq, cdr_engine_t *eng, acc_param_t* comment);
typedef int (*cdr_api_exec_f)(struct dlg_cell *dlg, struct sip_msg *rq,
cdr_engine_t *eng, acc_param_t *comment);

typedef int (*acc_log_request_f)(sip_msg_t *msg, str *comment);
typedef int (*acc_db_request_f)(sip_msg_t *msg, str *comment, str *dbtable);
typedef int (*acc_request_f)(sip_msg_t *msg, str *comment, str *dbtable);


/* the acc API */
typedef struct acc_api {
typedef struct acc_api
{
acc_log_request_f acc_log_request;
acc_db_request_f acc_db_request;
acc_request_f acc_request;
leg_info_f get_leg_info;
core2strar_f get_core_attrs;
acc_db_request_f acc_db_request;
acc_request_f acc_request;
leg_info_f get_leg_info;
core2strar_f get_core_attrs;
extra2strar_f get_extra_attrs;
legs2strar_f get_leg_attrs;
legs2strar_f get_leg_attrs;
parse_extra_f parse_extra;
register_engine_f register_engine;
acc_api_exec_f exec;
cdr_core2strar_f get_core_cdr_attrs;
acc_api_exec_f exec;
cdr_core2strar_f get_core_cdr_attrs;
extra2strar_dlg_only_f get_extra_dlg_attrs;
register_cdr_engine_f register_cdr_engine;
cdr_api_exec_f exec_cdr;
register_cdr_engine_f register_cdr_engine;
cdr_api_exec_f exec_cdr;
} acc_api_t;

typedef int (*bind_acc_f)(acc_api_t* api);
typedef int (*bind_acc_f)(acc_api_t *api);

int acc_run_engines(struct sip_msg *msg, int type, int *reset);
acc_engine_t *acc_api_get_engines(void);
Expand All @@ -187,12 +206,11 @@ static inline int acc_load_api(acc_api_t *accb)
bind_acc_f bindacc;

bindacc = (bind_acc_f)find_export("bind_acc", 0, 0);
if (bindacc == 0) {
if(bindacc == 0) {
LM_ERR("cannot find bind_acc\n");
return -1;
}
if (bindacc(accb)==-1)
{
if(bindacc(accb) == -1) {
LM_ERR("cannot bind acc api\n");
return -1;
}
Expand Down

0 comments on commit b41657f

Please sign in to comment.