Try this - it might be clearer.

[gd/wireshark/.git] / sharkd_session.c

diff --git a/sharkd_session.c b/sharkd_session.c
index b611df297afd0f4b94dd9d2aa712034e4cbc3d5d..ffb7bcdc45252f98a67c4de1e764f36e45d37237 100644 (file)
--- a/sharkd_session.c
+++ b/sharkd_session.c
@@ -61,7 +61,7 @@
 #ifdef HAVE_SPEEXDSP
 # include <speex/speex_resampler.h>
 #else
-# include <codecs/speex/speex_resampler.h>
+# include "speexdsp/speex_resampler.h"
 #endif /* HAVE_SPEEXDSP */
 
 #include <epan/maxmind_db.h>
@@ -2740,13 +2740,14 @@ sharkd_follower_visit_layers_cb(const void *key _U_, void *value, void *user_dat
        const int proto_id = get_follow_proto_id(follower);
 
        guint32 ignore_stream;
+       guint32 ignore_sub_stream;
 
        if (proto_is_frame_protocol(pi->layers, proto_get_protocol_filter_name(proto_id)))
        {
                const char *layer_proto = proto_get_protocol_short_name(find_protocol_by_id(proto_id));
                char *follow_filter;
 
-               follow_filter = get_follow_conv_func(follower)(pi, &ignore_stream);
+               follow_filter = get_follow_conv_func(follower)(pi, &ignore_stream, &ignore_sub_stream);
 
                json_dumper_begin_array(&dumper);
                json_dumper_value_string(&dumper, layer_proto);
@@ -4297,9 +4298,7 @@ sharkd_session_main(void)
                        return 2;
                }
 
-#if defined(HAVE_C_ARES) || defined(HAVE_MAXMINDDB)
                host_name_lookup_process();
-#endif
 
                sharkd_session_process(buf, tokens, ret);
        }
@@ -4311,7 +4310,7 @@ sharkd_session_main(void)
 }
 
 /*
- * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
  * c-basic-offset: 8