Remove 'starting' attribute

This commit is contained in:
Kaian 2015-02-28 01:44:33 +01:00
parent cfea36430a
commit 3e25be8f92
5 changed files with 5 additions and 11 deletions

View File

@ -70,7 +70,6 @@
## - time
## - sdp
## - msgcnt
## - starting
## - transport
## - state
## - convdur
@ -109,8 +108,8 @@
## ignore {field} {value}
##
## Examples:
# ignore starting OPTIONS
# ignore starting REGISTER
# ignore starting BYE
# ignore method OPTIONS
# ignore method REGISTER
# ignore method BYE
# ignore srchost 192.168.1.1
# ignore transport TCP

View File

@ -67,7 +67,7 @@ init_options()
set_option_value("cl.column2", "msgcnt");
set_option_value("cl.column3", "src");
set_option_value("cl.column4", "dst");
set_option_value("cl.column5", "starting");
set_option_value("cl.column5", "method");
set_option_value("cl.column6", "state");
// Set Autoscroll in call list

View File

@ -54,7 +54,6 @@ static sip_attr_hdr_t attrs[] = {
{ .id = SIP_ATTR_SDP_ADDRESS, .name = "sdpaddress", .desc = "SDP Address", .dwidth = 22 },
{ .id = SIP_ATTR_SDP_PORT, .name = "sdpport", .desc = "SDP Port", .dwidth = 5 },
{ .id = SIP_ATTR_TRANSPORT, .name = "transport", .title = "Trans", .desc = "Transport", .dwidth = 3 },
{ .id = SIP_ATTR_STARTING, .name = "starting", .desc = "Starting", .dwidth = 10 },
{ .id = SIP_ATTR_MSGCNT, .name = "msgcnt", .title = "Msgs", .desc = "Message Count", .dwidth = 5 },
{ .id = SIP_ATTR_CALLSTATE, .name = "state", .desc = "Call State", .dwidth = 10 },
{ .id = SIP_ATTR_CONVDUR, .name = "convdur", .title = "ConvDur", .desc = "Conversation Duration", .dwidth = 7 },
@ -208,8 +207,6 @@ call_get_attribute(sip_call_t *call, enum sip_attr_id id)
case SIP_ATTR_CONVDUR:
case SIP_ATTR_TOTALDUR:
return sip_attr_get(call->attrs, id);
case SIP_ATTR_STARTING:
return msg_get_attribute(call_get_next_msg(call, NULL), SIP_ATTR_METHOD);
default:
return msg_get_attribute(call_get_next_msg(call, NULL), id);
}

View File

@ -96,8 +96,6 @@ enum sip_attr_id {
SIP_ATTR_SDP_PORT,
//! SIP Message transport
SIP_ATTR_TRANSPORT,
//! SIP Call first message method
SIP_ATTR_STARTING,
//! SIP Call message counter
SIP_ATTR_MSGCNT,
//! SIP Call state

View File

@ -935,7 +935,7 @@ call_list_match_filters(PANEL *panel, sip_call_t *call)
// Check if a filter option exists
memset(filter_option, 0, sizeof(filter_option));
sprintf(filter_option, "filter.%s", call_get_attribute(call, SIP_ATTR_STARTING));
sprintf(filter_option, "filter.%s", call_get_attribute(call, SIP_ATTR_METHOD));
if (!is_option_enabled(filter_option)) {
return 0;
}