diff --git a/config/sngreprc b/config/sngreprc index 898ce59..6c012af 100644 --- a/config/sngreprc +++ b/config/sngreprc @@ -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 diff --git a/src/option.c b/src/option.c index 2bfc02d..d5104b5 100644 --- a/src/option.c +++ b/src/option.c @@ -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 diff --git a/src/sip_attr.c b/src/sip_attr.c index b44228e..17d58df 100644 --- a/src/sip_attr.c +++ b/src/sip_attr.c @@ -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); } diff --git a/src/sip_attr.h b/src/sip_attr.h index f8a9751..c975079 100644 --- a/src/sip_attr.h +++ b/src/sip_attr.h @@ -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 diff --git a/src/ui_call_list.c b/src/ui_call_list.c index 07cd2a2..28fca68 100644 --- a/src/ui_call_list.c +++ b/src/ui_call_list.c @@ -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; }