diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-11-21 18:38:44 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2017-11-21 20:21:50 +0000 |
commit | 7540ac69381518661065b33096bd448d1b4100e5 (patch) | |
tree | 9e6c883e2d360ad6d84fcf928a4561b0c9de4106 /tools | |
parent | 4e63ec305bd7e8196561be58d12ee99f54eca371 (diff) |
Move the protocol registration routines back into libwireshark
Follow-up to b695b3e2f72998d66ca4b7a6826d4ce1688060c8.
Change-Id: I7e36519f2c3806c1205d05437671325080974257
Reviewed-on: https://code.wireshark.org/review/24524
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/make-tap-reg.py | 2 | ||||
-rwxr-xr-x | tools/oss-fuzzshark/build.sh | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tools/make-tap-reg.py b/tools/make-tap-reg.py index f4435df4e0..1d780979c5 100755 --- a/tools/make-tap-reg.py +++ b/tools/make-tap-reg.py @@ -154,7 +154,7 @@ reg_code.write("/* Generated automatically from %s */\n" % (sys.argv[0])) # Make the routine to register all taps reg_code.write(""" -#include "register.h" +#include "epan/register.h" void register_all_tap_listeners(void) { """); diff --git a/tools/oss-fuzzshark/build.sh b/tools/oss-fuzzshark/build.sh index 394fd79470..6164cd3141 100755 --- a/tools/oss-fuzzshark/build.sh +++ b/tools/oss-fuzzshark/build.sh @@ -43,7 +43,7 @@ generate_fuzzer() -c -o $WORK/${fuzzer_name}.o \ $fuzzer_cflags - $CXX $CXXFLAGS $WORK/register.o $WORK/${fuzzer_name}.o \ + $CXX $CXXFLAGS $WORK/${fuzzer_name}.o \ -o $OUT/${fuzzer_name} \ ${WIRESHARK_FUZZERS_COMMON_FLAGS} @@ -57,10 +57,6 @@ WIRESHARK_FUZZERS_COMMON_FLAGS="-lFuzzingEngine \ -L"$WIRESHARK_INSTALL_PATH/lib" -lwireshark -lwiretap -lwsutil \ -Wl,-Bstatic `pkg-config --libs glib-2.0` -pthread -lpcre -lgcrypt -lgpg-error -lz -Wl,-Bdynamic" -$CC $CFLAGS -I $SRC/wireshark/ `pkg-config --cflags glib-2.0` \ - $SRC/wireshark/register.c \ - -c -o $WORK/register.o - for dissector in $FUZZ_DISSECTORS; do generate_fuzzer "${dissector}" -DFUZZ_DISSECTOR_TARGET=\"$dissector\" done |