Skip to content

Commit

Permalink
Renamed local log_level variables/parameters.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bogdan-iancu
bogdan-iancu committed Feb 8, 2016
1 parent b9b0083 commit 8803a87
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions modules/acc/acc.c
View file
Expand Up @@ -364,7 +364,7 @@ int acc_log_cdrs(struct dlg_cell *dlg, struct sip_msg *msg)
*(p++) = '\n';
*(p++) = 0;

LM_GEN2(acc_log_facility, log_level,
LM_GEN2(acc_log_facility, acc_log_level,
"%.*screated=%lu;call_start_time=%lu;duration=%lu;ms_duration=%lu;setuptime=%lu%s",
acc_env.text.len, acc_env.text.s,(unsigned long)created,
(unsigned long)start_time.tv_sec,
Expand Down Expand Up @@ -446,15 +446,15 @@ int acc_log_request( struct sip_msg *rq, struct sip_msg *rpl, int cdr_flag)


if (cdr_flag) {
LM_GEN2(acc_log_facility, log_level, "%.*stimestamp=%lu;created=%lu;setuptime=%lu%s",
LM_GEN2(acc_log_facility, acc_log_level, "%.*stimestamp=%lu;created=%lu;setuptime=%lu%s",
acc_env.text.len, acc_env.text.s,
(unsigned long) acc_env.ts.tv_sec,
(unsigned long) _created,
(unsigned long) _setup_time, log_msg);
return 1;
}

LM_GEN2(acc_log_facility, log_level, "%.*stimestamp=%lu%s",
LM_GEN2(acc_log_facility, acc_log_level, "%.*stimestamp=%lu%s",
acc_env.text.len, acc_env.text.s,(unsigned long) acc_env.ts.tv_sec, log_msg);

return 1;
Expand Down
8 changes: 4 additions & 4 deletions modules/acc/acc_logic.c
View file
Expand Up @@ -65,8 +65,8 @@ static query_list_t *mc_ins_list = NULL;

#define is_failed_acc_on(_rq) is_acc_flag_set(_rq,failed_transaction_flag)

#define is_log_acc_on(_rq) is_acc_flag_set(_rq,log_flag)
#define is_log_mc_on(_rq) is_acc_flag_set(_rq,log_missed_flag)
#define is_log_acc_on(_rq) is_acc_flag_set(_rq,acc_log_flag)
#define is_log_mc_on(_rq) is_acc_flag_set(_rq,acc_log_missed_flag)

#define is_aaa_acc_on(_rq) is_acc_flag_set(_rq,aaa_flag)
#define is_aaa_mc_on(_rq) is_acc_flag_set(_rq,aaa_missed_flag)
Expand Down Expand Up @@ -456,7 +456,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req,
if (is_log_mc_on(req)) {
env_set_text( ACC_MISSED, ACC_MISSED_LEN);
acc_log_request( req, reply, is_cdr_acc_on(req) );
flags_to_reset |= log_missed_flag;
flags_to_reset |= acc_log_missed_flag;
}

if (is_aaa_mc_on(req)) {
Expand Down Expand Up @@ -667,7 +667,7 @@ static void acc_dlg_callback(struct dlg_cell *dlg, int type,
}
}

if (flags & log_flag) {
if (flags & acc_log_flag) {
env_set_text( ACC_ENDED, ACC_ENDED_LEN);
if (acc_log_cdrs(dlg, _params->msg) < 0) {
LM_ERR("Cannot log values\n");
Expand Down
22 changes: 11 additions & 11 deletions modules/acc/acc_mod.c
View file
Expand Up @@ -97,11 +97,11 @@ int cdr_flag = -1;
/* ----- SYSLOG acc variables ----------- */

static char *log_string = 0;
int log_flag = -1;
int acc_log_flag = -1;
static char *log_missed_string = 0;
int log_missed_flag = -1;
int acc_log_missed_flag = -1;
/* noisiness level logging facilities are used */
int log_level = L_NOTICE;
int acc_log_level = L_NOTICE;
/* log facility that is used */
int acc_log_facility = LOG_DAEMON;
static char * log_facility_str = 0;
Expand Down Expand Up @@ -237,9 +237,9 @@ static param_export_t params[] = {
{"cdr_flag", INT_PARAM, &cdr_flag },
/* syslog specific */
{"log_flag", STR_PARAM, &log_string },
{"log_flag", INT_PARAM, &log_flag },
{"log_flag", INT_PARAM, &acc_log_flag },
{"log_missed_flag", STR_PARAM, &log_missed_string },
{"log_missed_flag", INT_PARAM, &log_missed_flag },
{"log_missed_flag", INT_PARAM, &acc_log_missed_flag },
{"log_level", INT_PARAM, &log_level },
{"log_facility", STR_PARAM, &log_facility_str },
{"log_extra", STR_PARAM, &log_extra_str },
Expand Down Expand Up @@ -517,18 +517,18 @@ static int mod_init( void )
return -1;
}

fix_flag_name(log_string, log_flag);
fix_flag_name(log_string, acc_log_flag);

log_flag = get_flag_id_by_name(FLAG_TYPE_MSG, log_string);
acc_log_flag = get_flag_id_by_name(FLAG_TYPE_MSG, log_string);

if (flag_idx2mask(&log_flag)<0)
if (flag_idx2mask(&acc_log_flag)<0)
return -1;

fix_flag_name(log_missed_string, log_missed_flag);
fix_flag_name(log_missed_string, acc_log_missed_flag);

log_missed_flag = get_flag_id_by_name(FLAG_TYPE_MSG, log_missed_string);
acc_log_missed_flag = get_flag_id_by_name(FLAG_TYPE_MSG,log_missed_string);

if (flag_idx2mask(&log_missed_flag)<0)
if (flag_idx2mask(&acc_log_missed_flag)<0)
return -1;

acc_log_init();
Expand Down
6 changes: 3 additions & 3 deletions modules/acc/acc_mod.h
View file
Expand Up @@ -39,9 +39,9 @@ extern int early_media;
extern int failed_transaction_flag;
extern int detect_direction;

extern int log_level;
extern int log_flag;
extern int log_missed_flag;
extern int acc_log_level;
extern int acc_log_flag;
extern int acc_log_missed_flag;

extern int aaa_flag;
extern int aaa_missed_flag;
Expand Down
18 changes: 9 additions & 9 deletions parser/sdp/sdp.c
View file
Expand Up @@ -787,11 +787,11 @@ void __free_sdp(sdp_info_t* sdp)
}
}

void print_sdp_stream(sdp_stream_cell_t *stream, int log_level)
void print_sdp_stream(sdp_stream_cell_t *stream, int level)
{
sdp_payload_attr_t *payload;

LM_GEN1(log_level, "....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' [%d] '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n",
LM_GEN1(level, "....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s:%.*s' '%.*s' [%d] '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n",
stream->stream_num, stream, stream->next,
stream->p_payload_attr,
stream->media.len, stream->media.s,
Expand All @@ -809,7 +809,7 @@ void print_sdp_stream(sdp_stream_cell_t *stream, int log_level)
stream->accept_wrapped_types.len, stream->accept_wrapped_types.s);
payload = stream->payload_attr;
while (payload) {
LM_GEN1(log_level, "......payload[%d]:%p=>%p p_payload_attr[%d]:%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n",
LM_GEN1(level, "......payload[%d]:%p=>%p p_payload_attr[%d]:%p '%.*s' '%.*s' '%.*s' '%.*s' '%.*s'\n",
payload->payload_num, payload, payload->next,
payload->payload_num, stream->p_payload_attr[payload->payload_num],
payload->rtp_payload.len, payload->rtp_payload.s,
Expand All @@ -821,7 +821,7 @@ void print_sdp_stream(sdp_stream_cell_t *stream, int log_level)
}
}

void print_sdp_session(sdp_session_cell_t *session, int log_level)
void print_sdp_session(sdp_session_cell_t *session, int level)
{
sdp_stream_cell_t *stream = session==NULL ? NULL : session->streams;

Expand All @@ -830,28 +830,28 @@ void print_sdp_session(sdp_session_cell_t *session, int log_level)
return;
}

LM_GEN1(log_level, "..session[%d]:%p=>%p '%.*s' '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p\n",
LM_GEN1(level, "..session[%d]:%p=>%p '%.*s' '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p\n",
session->session_num, session, session->next,
session->cnt_disp.len, session->cnt_disp.s,
session->ip_addr.len, session->ip_addr.s,
session->o_ip_addr.len, session->o_ip_addr.s,
session->bw_type.len, session->bw_type.s, session->bw_width.len, session->bw_width.s,
session->streams_num, session->streams);
while (stream) {
print_sdp_stream(stream, log_level);
print_sdp_stream(stream, level);
stream=stream->next;
}
}


void print_sdp(sdp_info_t* sdp, int log_level)
void print_sdp(sdp_info_t* sdp, int level)
{
sdp_session_cell_t *session;

LM_GEN1(log_level, "sdp:%p=>%p (%d:%d)\n", sdp, sdp->sessions, sdp->sessions_num, sdp->streams_num);
LM_GEN1(level, "sdp:%p=>%p (%d:%d)\n", sdp, sdp->sessions, sdp->sessions_num, sdp->streams_num);
session = sdp->sessions;
while (session) {
print_sdp_session(session, log_level);
print_sdp_session(session, level);
session = session->next;
}
}
Expand Down

0 comments on commit 8803a87

Please sign in to comment.