From Neil Piercy:

RR has been split from DTAP, with common stuff going to the common files (plus a few minor knock-on consequences).
Fix the broken tap:
I had not realised that the register_tap call in the dissector registration actually _created_ the tap entry (not the register_tap_listener), and not just associated the tap_id returned with the tap registered by the listener. The use of separate statics by the split lead to 3 taps called "gsm_a", but only the first of which was ever found in the tap_queue_packet. Added (yet another) global for now to cope.

Also attached is a 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, can you? Anyway it seemed to work with deliberately keeping multiple calls.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26039 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 1 insertions, 7 deletions

diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c
index 1946a91b24..cdcfb9b248 100644
--- a/epan/dissectors/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
@@ -54,9 +54,9 @@
 #include <epan/emem.h>
 
 #include "packet-bssap.h"
+#include "packet-sccp.h"
 #include "packet-gsm_a_common.h"
 #include "packet-e212.h"
-#include "packet-sccp.h"
 
 static void init_bssap(void);
 
@@ -602,12 +602,6 @@ dissect_bssap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
  * BSSAP+ Routines
  */
 
-typedef struct dgt_set_t
-{
-    unsigned char out[15];
-}
-dgt_set_t;
-
 #ifdef REMOVED
 static dgt_set_t Dgt_tbcd = {
     {