summaryrefslogtreecommitdiff
path: root/epan/tap.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-08-21 06:28:16 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-08-21 06:28:16 +0000
commitf4047c4b938752a3802aed0bb0e932fb046c9dce (patch)
treeaa8d703d60f7cb45b2ce6355e22be8a9b59ae438 /epan/tap.c
parent3acd12510ba84afed67c31153913b8ae7ae1e31d (diff)
downloadwireshark-f4047c4b938752a3802aed0bb0e932fb046c9dce.tar.gz
From Neil Piercy:
Patch to tap.c which simply returns the same tap_id if the register_tap is called twice with the same name - I can't see any downside to this. ( Needed for the gsm_a split -Anders). svn path=/trunk/; revision=26051
Diffstat (limited to 'epan/tap.c')
-rw-r--r--epan/tap.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/tap.c b/epan/tap.c
index fb47372aec..d53bdd0432 100644
--- a/epan/tap.c
+++ b/epan/tap.c
@@ -117,7 +117,13 @@ int
register_tap(const char *name)
{
tap_dissector_t *td, *tdl;
- int i;
+ int i, tap_id;
+
+ if(tap_dissector_list){
+ tap_id=find_tap_id(name);
+ if (tap_id)
+ return tap_id;
+ }
td=g_malloc(sizeof(tap_dissector_t));
td->next=NULL;