From Sven Eckelmann:

Just forgot to set inited variable in reg_handoff_bat_*().

svn path=/trunk/; revision=25689

4 files changed, 10 insertions, 5 deletions

diff --git a/epan/dissectors/packet-bat-batman.c b/epan/dissectors/packet-bat-batman.c
index 1004c0f7ec..4a5dc528b2 100644
--- a/epan/dissectors/packet-bat-batman.c
+++ b/epan/dissectors/packet-bat-batman.c
@@ -162,6 +162,8 @@ void reg_handoff_bat_batman(void)
 	if (!inited) {
 		batman_handle = create_dissector_handle(dissect_bat_batman, proto_bat_plugin);
 		data_handle = find_dissector("data");
+
+		inited = TRUE;
 	} else {
 		dissector_delete("udp.port", udp_port, batman_handle);
 	}
diff --git a/epan/dissectors/packet-bat-gw.c b/epan/dissectors/packet-bat-gw.c
index 20081aa8a5..e8ef43c4a0 100644
--- a/epan/dissectors/packet-bat-gw.c
+++ b/epan/dissectors/packet-bat-gw.c
@@ -86,6 +86,8 @@ void reg_handoff_bat_gw(void)
 		gw_handle = create_dissector_handle(dissect_bat_gw, proto_bat_plugin);
 		ip_handle = find_dissector("ip");
 		data_handle = find_dissector("data");
+
+		inited = TRUE;
 	} else {
 		dissector_delete("udp.port", udp_port, gw_handle);
 	}
diff --git a/epan/dissectors/packet-bat-vis.c b/epan/dissectors/packet-bat-vis.c
index f89bb2b399..a927e1f95c 100644
--- a/epan/dissectors/packet-bat-vis.c
+++ b/epan/dissectors/packet-bat-vis.c
@@ -136,6 +136,8 @@ void reg_handoff_bat_vis(void)
 	if (!inited) {
 		vis_handle = create_dissector_handle(dissect_bat_vis, proto_bat_plugin);
 		data_handle = find_dissector("data");
+
+		inited = TRUE;
 	} else {
 		dissector_delete("udp.port", udp_port, vis_handle);
 	}
diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c
index 018e8b07e7..f01ee88e2e 100644
--- a/epan/dissectors/packet-bat.c
+++ b/epan/dissectors/packet-bat.c
@@ -60,11 +60,10 @@ void proto_reg_handoff_bat(void)
 	if (!inited) {
 		bat_tap = register_tap("batman");
 		bat_follow_tap = register_tap("batman_follow");
-
-		reg_handoff_bat_batman();
-		reg_handoff_bat_gw();
-		reg_handoff_bat_vis();
-
 		inited = TRUE;
 	}
+
+	reg_handoff_bat_batman();
+	reg_handoff_bat_gw();
+	reg_handoff_bat_vis();
 }