Skip to content

Commit

Permalink
uac_redirect: clang-format for coherent indentation and coding style
Browse files Browse the repository at this point in the history
  • Loading branch information
linuxmaniac committed May 18, 2023
1 parent f2c5879 commit f22200b
Show file tree
Hide file tree
Showing 5 changed files with 243 additions and 244 deletions.
37 changes: 18 additions & 19 deletions src/modules/uac_redirect/rd_filter.c
Expand Up @@ -39,12 +39,12 @@ static int start_filters[NR_FILTER_TYPES];

void init_filters(void)
{
memset( rd_filters , 0, NR_FILTER_TYPES*MAX_FILTERS*sizeof(regex_t*));
memset(rd_filters, 0, NR_FILTER_TYPES * MAX_FILTERS * sizeof(regex_t *));
reset_filters();
}


void set_default_rule( int type )
void set_default_rule(int type)
{
default_rule = type;
}
Expand All @@ -53,33 +53,33 @@ void set_default_rule( int type )
void reset_filters(void)
{
nr_filters[ACCEPT_FILTER] = 1;
nr_filters[DENY_FILTER] = 1;
nr_filters[DENY_FILTER] = 1;
start_filters[ACCEPT_FILTER] = 0;
start_filters[DENY_FILTER] = 0;
start_filters[DENY_FILTER] = 0;
}


void add_default_filter( int type, regex_t *filter)
void add_default_filter(int type, regex_t *filter)
{
rd_filters[type][0] = filter;
}


int add_filter( int type, regex_t *filter, int flags)
int add_filter(int type, regex_t *filter, int flags)
{
if ( nr_filters[type]==MAX_FILTERS ) {
if(nr_filters[type] == MAX_FILTERS) {
LM_ERR("too many filters type %d\n", type);
return -1;
}

/* flags? */
if (flags&RESET_ADDED)
if(flags & RESET_ADDED)
nr_filters[type] = 1;
if (flags&RESET_DEFAULT)
if(flags & RESET_DEFAULT)
start_filters[type] = 1;

/* set filter */
rd_filters[type][ nr_filters[type]++ ] = filter;
rd_filters[type][nr_filters[type]++] = filter;
return 0;
}

Expand All @@ -90,25 +90,24 @@ int run_filters(char *s)
int i;

/* check for accept filters */
for( i=start_filters[ACCEPT_FILTER] ; i<nr_filters[ACCEPT_FILTER] ; i++ ) {
if (rd_filters[ACCEPT_FILTER][i]==0)
for(i = start_filters[ACCEPT_FILTER]; i < nr_filters[ACCEPT_FILTER]; i++) {
if(rd_filters[ACCEPT_FILTER][i] == 0)
continue;
if (regexec(rd_filters[ACCEPT_FILTER][i], s, 1, &pmatch, 0)==0)
if(regexec(rd_filters[ACCEPT_FILTER][i], s, 1, &pmatch, 0) == 0)
return 1;
}

/* if default rule is deny, don' check the deny rules */
if (default_rule!=DENY_RULE) {
if(default_rule != DENY_RULE) {
/* check for deny filters */
for( i=start_filters[DENY_FILTER] ; i<nr_filters[DENY_FILTER] ; i++ ) {
if (rd_filters[DENY_FILTER][i]==0)
for(i = start_filters[DENY_FILTER]; i < nr_filters[DENY_FILTER]; i++) {
if(rd_filters[DENY_FILTER][i] == 0)
continue;
if (regexec(rd_filters[DENY_FILTER][i], s, 1, &pmatch, 0)==0)
if(regexec(rd_filters[DENY_FILTER][i], s, 1, &pmatch, 0) == 0)
return -1;
}
}

/* return default */
return (default_rule==ACCEPT_RULE)?1:-1;
return (default_rule == ACCEPT_RULE) ? 1 : -1;
}

18 changes: 9 additions & 9 deletions src/modules/uac_redirect/rd_filter.h
Expand Up @@ -26,21 +26,21 @@
#include <sys/types.h> /* for regex */
#include <regex.h>

#define ACCEPT_FILTER 0
#define DENY_FILTER 1
#define ACCEPT_FILTER 0
#define DENY_FILTER 1
#define NR_FILTER_TYPES 2

#define ACCEPT_RULE 11
#define DENY_RULE 12
#define ACCEPT_RULE 11
#define DENY_RULE 12

#define RESET_ADDED (1<<0)
#define RESET_DEFAULT (1<<1)
#define RESET_ADDED (1 << 0)
#define RESET_DEFAULT (1 << 1)

void init_filters(void);
void set_default_rule( int type );
void set_default_rule(int type);
void reset_filters(void);
void add_default_filter( int type, regex_t *filter);
int add_filter( int type, regex_t *filter, int flags);
void add_default_filter(int type, regex_t *filter);
int add_filter(int type, regex_t *filter, int flags);
int run_filters(char *s);

#endif

0 comments on commit f22200b

Please sign in to comment.