diff options
author | Luis Ontanon <luis.ontanon@gmail.com> | 2007-07-17 22:00:40 +0000 |
---|---|---|
committer | Luis Ontanon <luis.ontanon@gmail.com> | 2007-07-17 22:00:40 +0000 |
commit | fc98b36914a5f593c254fcaa971d97102635cd84 (patch) | |
tree | 9603bff9af0dd531574f381feb4bbfd3fa85ab42 /epan/dissectors/packet-k12.c | |
parent | d1357063aec21318790320d8128c5cb7b2a71c2d (diff) |
Have the encapsulation selection match on the port name as well as stk filename.
svn path=/trunk/; revision=22340
Diffstat (limited to 'epan/dissectors/packet-k12.c')
-rw-r--r-- | epan/dissectors/packet-k12.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index 7da9093c54..963e47ca04 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -229,7 +229,8 @@ static void dissect_k12(tvbuff_t* tvb,packet_info* pinfo,proto_tree* tree) { if (! handles ) { for (i=0 ; i < nk12_handles; i++) { - if ( epan_strcasestr(pinfo->pseudo_header->k12.stack_file, k12_handles[i].match) ) { + if ( epan_strcasestr(pinfo->pseudo_header->k12.stack_file, k12_handles[i].match) + || epan_strcasestr(pinfo->pseudo_header->k12.input_name, k12_handles[i].match) ) { handles = k12_handles[i].handles; break; } @@ -412,7 +413,7 @@ proto_register_k12(void) static uat_field_t uat_k12_flds[] = { UAT_FLD_CSTRING_ISPRINT(k12,match, - "A string that will be matched (a=A) against an .stk filename.\n" + "A string that will be matched (a=A) against an .stk filename or the name of a port.\n" "The first match wins, the order of entries in the table is important!."), UAT_FLD_CSTRING_OTHER(k12,protos,protos_chk_cb, "The lowest layer protocol described by this .stk file (eg: mtp2).\n" |