diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/acp133/Makefile.common wireshark-1.12.1+g01b65bf/asn1/acp133/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/acp133/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/acp133/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -28,7 +28,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/acse/Makefile.common wireshark-1.12.1+g01b65bf/asn1/acse/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/acse/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/acse/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ansi_map/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ansi_map/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ansi_map/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ansi_map/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ansi_tcap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ansi_tcap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ansi_tcap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ansi_tcap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -28,7 +28,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/atn-cm/Makefile.common wireshark-1.12.1+g01b65bf/asn1/atn-cm/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/atn-cm/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/atn-cm/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -24,7 +24,7 @@ ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/atn-cpdlc/Makefile.common wireshark-1.12.1+g01b65bf/asn1/atn-cpdlc/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/atn-cpdlc/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/atn-cpdlc/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -24,7 +24,7 @@ ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/atn-ulcs/Makefile.common wireshark-1.12.1+g01b65bf/asn1/atn-ulcs/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/atn-ulcs/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/atn-ulcs/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -24,7 +24,7 @@ ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/c1222/Makefile.common wireshark-1.12.1+g01b65bf/asn1/c1222/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/c1222/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/c1222/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/camel/Makefile.common wireshark-1.12.1+g01b65bf/asn1/camel/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/camel/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/camel/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -41,16 +41,17 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).asn \ - $(PROTOCOL_NAME).cnf + $(PROTOCOL_NAME).cnf \ + TCAPMessages.asn SRC_FILES = \ - $(EXT_ASN_FILE_LIST) \ - $(EXTRA_DIST) + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) A2W_FLAGS= -b -L diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/cdt/Makefile.common wireshark-1.12.1+g01b65bf/asn1/cdt/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/cdt/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/cdt/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/charging_ase/Makefile.common wireshark-1.12.1+g01b65bf/asn1/charging_ase/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/charging_ase/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/charging_ase/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -25,15 +25,15 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf SRC_FILES = \ - $(EXT_ASN_FILE_LIST) \ - $(EXTRA_DIST) + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) A2W_FLAGS= -b diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/cmip/Makefile.common wireshark-1.12.1+g01b65bf/asn1/cmip/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/cmip/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/cmip/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -35,7 +35,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/cmp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/cmp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/cmp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/cmp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/cms/Makefile.common wireshark-1.12.1+g01b65bf/asn1/cms/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/cms/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/cms/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -31,7 +31,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/credssp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/credssp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/credssp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/credssp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -29,7 +29,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/crmf/Makefile.common wireshark-1.12.1+g01b65bf/asn1/crmf/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/crmf/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/crmf/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -29,7 +29,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/dap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/dap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/dap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/dap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -31,7 +31,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/disp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/disp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/disp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/disp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/dop/Makefile.common wireshark-1.12.1+g01b65bf/asn1/dop/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/dop/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/dop/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/dsp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/dsp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/dsp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/dsp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ess/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ess/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ess/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ess/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ftam/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ftam/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ftam/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ftam/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/gnm/Makefile.common wireshark-1.12.1+g01b65bf/asn1/gnm/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/gnm/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/gnm/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/goose/Makefile.common wireshark-1.12.1+g01b65bf/asn1/goose/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/goose/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/goose/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/gprscdr/Makefile.common wireshark-1.12.1+g01b65bf/asn1/gprscdr/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/gprscdr/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/gprscdr/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,15 +30,15 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf SRC_FILES = \ - $(EXT_ASN_FILE_LIST) \ - $(EXTRA_DIST) + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) A2W_FLAGS= -b diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/gsm_map/Makefile.common wireshark-1.12.1+g01b65bf/asn1/gsm_map/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/gsm_map/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/gsm_map/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -74,7 +74,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h225/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h225/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h225/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h225/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h235/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h235/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h235/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h235/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h245/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h245/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h245/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h245/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -28,7 +28,7 @@ MULTIMEDIA-SYSTEM-CONTROL.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h248/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h248/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h248/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h248/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -28,7 +28,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h282/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h282/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h282/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h282/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -25,7 +25,7 @@ RDC-PROTOCOL.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h283/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h283/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h283/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h283/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -25,7 +25,7 @@ LCT-PROTOCOL.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h323/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h323/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h323/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h323/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -26,7 +26,7 @@ ROBUSTNESS-DATA.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h450/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h450/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h450/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h450/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -51,7 +51,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h450-ros/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h450-ros/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h450-ros/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h450-ros/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -32,7 +32,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h460/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h460/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h460/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h460/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -36,7 +36,7 @@ MESSAGE-BROADCAST.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/h501/Makefile.common wireshark-1.12.1+g01b65bf/asn1/h501/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/h501/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/h501/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -25,7 +25,7 @@ H501-MESSAGES.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/HI2Operations/Makefile.common wireshark-1.12.1+g01b65bf/asn1/HI2Operations/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/HI2Operations/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/HI2Operations/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -29,7 +29,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/hnbap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/hnbap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/hnbap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/hnbap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ HNBAP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/idmp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/idmp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/idmp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/idmp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -31,7 +31,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ilp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ilp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ilp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ilp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -26,7 +26,7 @@ ILP-Components.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/inap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/inap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/inap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/inap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -54,7 +54,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/isdn-sup/Makefile.common wireshark-1.12.1+g01b65bf/asn1/isdn-sup/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/isdn-sup/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/isdn-sup/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -39,7 +39,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/lcsap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/lcsap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/lcsap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/lcsap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -36,7 +36,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ldap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ldap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ldap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ldap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -29,7 +29,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/logotypecertextn/Makefile.common wireshark-1.12.1+g01b65bf/asn1/logotypecertextn/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/logotypecertextn/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/logotypecertextn/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist # for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/lpp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/lpp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/lpp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/lpp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -28,7 +28,7 @@ LPP.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/lppa/Makefile.common wireshark-1.12.1+g01b65bf/asn1/lppa/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/lppa/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/lppa/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ LPPA-PDU.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/lppe/Makefile.common wireshark-1.12.1+g01b65bf/asn1/lppe/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/lppe/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/lppe/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -25,7 +25,7 @@ LPPe.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/lte-rrc/Makefile.common wireshark-1.12.1+g01b65bf/asn1/lte-rrc/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/lte-rrc/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/lte-rrc/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -29,7 +29,7 @@ EUTRA-InterNodeDefinitions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/m3ap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/m3ap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/m3ap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/m3ap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ M3AP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/Makefile.am wireshark-1.12.1+g01b65bf/asn1/Makefile.am --- wireshark-1.12.0+git+4fab41a1/asn1/Makefile.am 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/Makefile.am 2014-09-16 12:09:03.000000000 -0400 @@ -36,18 +36,19 @@ charging_ase \ cmip \ cmp \ + cms \ credssp \ crmf \ - cms \ dap \ - dop \ disp \ + dop \ dsp \ ess \ ftam \ + gnm \ goose \ - gsm_map \ gprscdr \ + gsm_map \ h225 \ h235 \ h245 \ @@ -89,9 +90,9 @@ pkcs1 \ pkcs12 \ pkinit \ - pkixac \ pkix1explicit \ pkix1implicit \ + pkixac \ pkixproxy \ pkixqualified \ pkixtsp \ @@ -133,10 +134,12 @@ DIST_SUBDIRS = $(SUBDIRS) $(DONT_BUILD_SUBDIRS) EXTRA_DIST = \ + CMakeLists.txt \ + Makefile.inc \ Makefile.nmake \ Makefile.inc.nmake \ - Makefile.preinc.nmake \ - Custom.make + Makefile.preinc \ + Makefile.preinc.nmake MAINTAINERCLEANFILES = \ Makefile.in diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/Makefile.preinc wireshark-1.12.1+g01b65bf/asn1/Makefile.preinc --- wireshark-1.12.0+git+4fab41a1/asn1/Makefile.preinc 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/Makefile.preinc 2014-09-16 12:09:03.000000000 -0400 @@ -20,3 +20,6 @@ MAKE_CNF_EXPORT = $(MAKE) generate_export +EXTRA_DIST_COMMON = \ + CMakeLists.txt \ + Makefile.nmake diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/mms/Makefile.common wireshark-1.12.1+g01b65bf/asn1/mms/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/mms/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/mms/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/mpeg-audio/Makefile.common wireshark-1.12.1+g01b65bf/asn1/mpeg-audio/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/mpeg-audio/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/mpeg-audio/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/mpeg-pes/Makefile.common wireshark-1.12.1+g01b65bf/asn1/mpeg-pes/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/mpeg-pes/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/mpeg-pes/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/nbap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/nbap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/nbap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/nbap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ NBAP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/novell_pkis/Makefile.common wireshark-1.12.1+g01b65bf/asn1/novell_pkis/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/novell_pkis/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/novell_pkis/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -22,14 +22,13 @@ ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf SRC_FILES = \ $(EXTRA_DIST) \ - $(EXT_ASN_FILE_LIST) \ - $(ASN_FILE_LIST) + $(EXT_ASN_FILE_LIST) A2W_FLAGS = -b -u diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ns_cert_exts/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ns_cert_exts/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ns_cert_exts/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ns_cert_exts/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -25,7 +25,7 @@ NETSCAPE-CERT-EXTS.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ocsp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ocsp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ocsp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ocsp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/p1/Makefile.common wireshark-1.12.1+g01b65bf/asn1/p1/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/p1/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/p1/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -33,7 +33,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/p22/Makefile.common wireshark-1.12.1+g01b65bf/asn1/p22/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/p22/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/p22/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -38,7 +38,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/p7/Makefile.common wireshark-1.12.1+g01b65bf/asn1/p7/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/p7/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/p7/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -33,7 +33,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/p772/Makefile.common wireshark-1.12.1+g01b65bf/asn1/p772/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/p772/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/p772/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -35,7 +35,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pcap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pcap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pcap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pcap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ PCAP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pkcs1/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pkcs1/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pkcs1/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pkcs1/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pkcs12/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pkcs12/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pkcs12/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pkcs12/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pkinit/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pkinit/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pkinit/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pkinit/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pkix1explicit/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pkix1explicit/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pkix1explicit/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pkix1explicit/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -28,10 +28,11 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ + pkix1explicit_exp.cnf \ $(PROTOCOL_NAME).cnf SRC_FILES = \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pkix1implicit/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pkix1implicit/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pkix1implicit/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pkix1implicit/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pkixac/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pkixac/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pkixac/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pkixac/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pkixproxy/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pkixproxy/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pkixproxy/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pkixproxy/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pkixqualified/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pkixqualified/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pkixqualified/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pkixqualified/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pkixtsp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pkixtsp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pkixtsp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pkixtsp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/pres/Makefile.common wireshark-1.12.1+g01b65bf/asn1/pres/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/pres/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/pres/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -28,7 +28,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/q932/Makefile.common wireshark-1.12.1+g01b65bf/asn1/q932/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/q932/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/q932/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -32,7 +32,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/q932-ros/Makefile.common wireshark-1.12.1+g01b65bf/asn1/q932-ros/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/q932-ros/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/q932-ros/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/qsig/Makefile.common wireshark-1.12.1+g01b65bf/asn1/qsig/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/qsig/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/qsig/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -56,7 +56,7 @@ QSIG-MID.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ranap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ranap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ranap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ranap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ RANAP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/rnsap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/rnsap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/rnsap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/rnsap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ RNSAP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ros/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ros/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ros/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ros/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist # for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/rrc/Makefile.common wireshark-1.12.1+g01b65bf/asn1/rrc/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/rrc/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/rrc/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -29,7 +29,7 @@ Internode-definitions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/rrlp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/rrlp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/rrlp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/rrlp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -28,7 +28,7 @@ RRLP-Components.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/rtse/Makefile.common wireshark-1.12.1+g01b65bf/asn1/rtse/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/rtse/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/rtse/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -29,7 +29,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/rua/Makefile.common wireshark-1.12.1+g01b65bf/asn1/rua/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/rua/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/rua/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ RUA-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/s1ap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/s1ap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/s1ap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/s1ap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -33,7 +33,7 @@ S1AP-SonTransfer-IEs.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/sabp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/sabp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/sabp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/sabp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ SABP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/sbc-ap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/sbc-ap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/sbc-ap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/sbc-ap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -32,7 +32,7 @@ SBC-AP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/smrse/Makefile.common wireshark-1.12.1+g01b65bf/asn1/smrse/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/smrse/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/smrse/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/snmp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/snmp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/snmp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/snmp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/spnego/Makefile.common wireshark-1.12.1+g01b65bf/asn1/spnego/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/spnego/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/spnego/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/sv/Makefile.common wireshark-1.12.1+g01b65bf/asn1/sv/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/sv/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/sv/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/t124/Makefile.common wireshark-1.12.1+g01b65bf/asn1/t124/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/t124/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/t124/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -28,7 +28,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/t125/Makefile.common wireshark-1.12.1+g01b65bf/asn1/t125/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/t125/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/t125/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/t38/Makefile.common wireshark-1.12.1+g01b65bf/asn1/t38/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/t38/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/t38/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -25,7 +25,7 @@ T38_2002.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/tcap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/tcap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/tcap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/tcap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -29,17 +29,17 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ - $(PROTOCOL_NAME).cnf + $(PROTOCOL_NAME).cnf \ + TCAPMessages.asn \ + TC-Notation-Extensions.asn SRC_FILES = \ $(EXTRA_DIST) \ - $(EXT_ASN_FILE_LIST) \ - TCAPMessages.asn \ - TC-Notation-Extensions.asn + $(EXT_ASN_FILE_LIST) A2W_FLAGS= -b diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/tetra/Makefile.common wireshark-1.12.1+g01b65bf/asn1/tetra/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/tetra/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/tetra/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/ulp/Makefile.common wireshark-1.12.1+g01b65bf/asn1/ulp/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/ulp/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/ulp/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ ULP-Components.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/wlancertextn/Makefile.common wireshark-1.12.1+g01b65bf/asn1/wlancertextn/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/wlancertextn/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/wlancertextn/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/x2ap/Makefile.common wireshark-1.12.1+g01b65bf/asn1/x2ap/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/x2ap/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/x2ap/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ X2AP-PDU-Descriptions.asn EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ $(PROTOCOL_NAME).cnf diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/x509af/Makefile.common wireshark-1.12.1+g01b65bf/asn1/x509af/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/x509af/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/x509af/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -29,7 +29,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/x509ce/Makefile.common wireshark-1.12.1+g01b65bf/asn1/x509ce/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/x509ce/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/x509ce/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/x509if/Makefile.common wireshark-1.12.1+g01b65bf/asn1/x509if/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/x509if/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/x509if/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -31,7 +31,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/asn1/x509sat/Makefile.common wireshark-1.12.1+g01b65bf/asn1/x509sat/Makefile.common --- wireshark-1.12.0+git+4fab41a1/asn1/x509sat/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/asn1/x509sat/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -30,7 +30,7 @@ # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. EXTRA_DIST = \ - Makefile.nmake \ + $(EXTRA_DIST_COMMON) \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ packet-$(PROTOCOL_NAME)-template.h \ diff -Nru wireshark-1.12.0+git+4fab41a1/capture-pcap-util.c wireshark-1.12.1+g01b65bf/capture-pcap-util.c --- wireshark-1.12.0+git+4fab41a1/capture-pcap-util.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/capture-pcap-util.c 2014-09-16 12:09:03.000000000 -0400 @@ -424,9 +424,13 @@ GList *il = NULL; pcap_if_t *alldevs, *dev; if_info_t *if_info; - char errbuf[PCAP_ERRBUF_SIZE]; + /* + * WinPcap can overflow PCAP_ERRBUF_SIZE if the host is unreachable. + * Fudge a larger size. + */ + char errbuf[PCAP_ERRBUF_SIZE*4]; - if (pcap_findalldevs_ex((char *)source, auth, &alldevs, errbuf) == -1) { + if (pcap_findalldevs_ex((char *)source, auth, &alldevs, errbuf) == -1) { *err = CANT_GET_INTERFACE_LIST; if (err_str != NULL) *err_str = cant_get_if_list_error_message(errbuf); diff -Nru wireshark-1.12.0+git+4fab41a1/ChangeLog wireshark-1.12.1+g01b65bf/ChangeLog --- wireshark-1.12.0+git+4fab41a1/ChangeLog 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/ChangeLog 2014-09-16 12:09:03.000000000 -0400 @@ -1,58074 +1,1406 @@ -commit 95a72ee +commit 09da4d6 Author: Gerald Combs -Date: Thu Jul 31 11:05:35 2014 -0700 +Date: Mon Sep 15 16:00:04 2014 -0700 - Prep for 1.12.0. + Updates for 1.12.1. - Change-Id: If48ad272eccd363eafc6f796c147810763ef2eb6 - -commit d698a6b -Author: Gerald Combs -Date: Thu Jul 31 11:11:39 2014 -0700 - - Use the "release" splash image. - - Change-Id: Ie7da2fb6012ea0ae0bbda79c69571655c2673af2 - Reviewed-on: https://code.wireshark.org/review/3291 + Change-Id: If2d28ca118b73ac96915ebada9cfc7cbb7a1518b + Reviewed-on: https://code.wireshark.org/review/4121 Reviewed-by: Gerald Combs -commit ed24269 -Author: Bill Meier -Date: Thu Jul 31 00:35:06 2014 -0400 - - addr_resolution_dlg.c: "OK" button should *do* something: treat as cxl. - - Also: remove vestigial line of commented-out code. - - Change-Id: Ieb41a0e39a4e0ec14031b1dbd38fc0d7ad47a635 - Reviewed-on: https://code.wireshark.org/review/3278 - Reviewed-by: Bill Meier - (cherry picked from commit 278b76250f2601f1c44e9126e426affbbc350fa4) - Reviewed-on: https://code.wireshark.org/review/3280 - -commit 0fd61b1 -Author: Bill Meier -Date: Thu Jul 31 00:06:37 2014 -0400 - - addr_resolution_dlg.c: Fix crash when 'Statistics ! Show address resolution' is invoked. - - (Introduced when the ipv4_hash_table key format was changed in 5d98ab67) - - Change-Id: Ie5d1314f7c7cc8bc71dca8a2db05e34a0a7776d7 - Reviewed-on: https://code.wireshark.org/review/3277 - Reviewed-by: Bill Meier - (cherry picked from commit 0a12f7d2611ad25bd2525c4a62a17ad13183784c) - Reviewed-on: https://code.wireshark.org/review/3279 - -commit 9977a81 -Author: Lukas Emersberger -Date: Mon Jul 28 10:04:33 2014 +0200 - - EPL: Fix for Write Multiple by index - - Write multiple by index now correctly resolves OD names. - - Changes in regard to master - - Removed usage of proto_tree_add_subtree[_format] - - Signed-off-by: Lukas Emersberger - Reviewed-on: https://code.wireshark.org/review/3223 - Reviewed-by: Roland Knall - Reviewed-by: Lukas Emersberger - Reviewed-by: Evan Huus - - Change-Id: Iace0ccd042035a54fd615dcc5559e517eefd69bd - Reviewed-on: https://code.wireshark.org/review/3241 - Reviewed-by: Roland Knall - Reviewed-by: Lukas Emersberger - Reviewed-by: Evan Huus - Petri-Dish: Evan Huus - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann - -commit 13c5737 -Author: Michael Mann -Date: Thu Jul 10 04:32:06 2014 -0400 - - Convert tvb_get_ptr buffer access macros to use much safer tvb access macros. - - Manually merged from ede5a9d4c0364c184bb79786128244343b0abe06 (master branch) - - bug:10281 - Change-Id: I8d4ba699b8244793cdffe5d72a78ccfefe789e94 - Reviewed-on: https://code.wireshark.org/review/3269 - Petri-Dish: Michael Mann - Reviewed-by: Michael Mann - -commit 974fdcb -Author: Hannes Mezger -Date: Wed Jul 30 12:34:58 2014 +0200 - - fix encodingmask of DiagnosticInfo - - In 2008, before the OpcUa specification was released, the EncodingMask was changed to include the Locale after the LocalizedText. This commit applies the changes necessary to display DiagnosticInfo correctly. - - Change-Id: Iad35ff0557eac62a259a63505ebce3e637095136 - Reviewed-on: https://code.wireshark.org/review/3259 - Reviewed-by: Alexis La Goutte - Reviewed-by: Michael Mann - (cherry picked from commit 5894b555a160cb329ab2d058ea85aea2c317087d) - Reviewed-on: https://code.wireshark.org/review/3264 - Reviewed-by: Evan Huus - -commit 5a8eab1 -Author: Peter Wu -Date: Tue Jul 29 00:04:00 2014 +0200 - - Fix heap-use-after-free via setlocale - - setlocale returns a statically-allocated memory which can be modified by - subsequent calls of setlocale. This triggers a heap-use-after free in - ASAN when the setlocale function is called again with the previous - pointer. - - This was found when trying to use the "Show All Streams" option via - the Telephony -> RTP menu. - - While at it, add some modelines - - Change-Id: Ide47e877ce828734fd8c5c1b064d9c505ba2b37a - Reviewed-on: https://code.wireshark.org/review/3234 - Reviewed-by: Peter Wu - Reviewed-by: Evan Huus - (cherry picked from commit 0272b9c435db6b8665504d402ce1a23325f5b409) - Reviewed-on: https://code.wireshark.org/review/3239 - -commit 887c8e8 -Author: Evan Huus -Date: Mon Jul 28 21:41:59 2014 -0400 - - Fix possible uninitialized session key in netlogin auth - - Bug:10312 - Change-Id: Ia2be812e81b54d6df5a928312cca86ecd95aa6b2 - Reviewed-on: https://code.wireshark.org/review/3236 - Reviewed-by: Evan Huus - (cherry picked from commit 0aa4cb2d0eef6ab01109555fa5320486d13cc9c0) - Reviewed-on: https://code.wireshark.org/review/3237 - -commit c3a09d2 -Author: Gerald Combs -Date: Sun Jul 27 08:08:27 2014 -0700 +commit d73f272 +Author: Martin Kaiser +Date: Sat Sep 13 21:51:24 2014 +0200 - [Automatic manuf, services and enterprise-numbers update for 2014-07-27] + dissect the alphanumeric message that's part of operation 30 + Bug: 10464 - Change-Id: I673ff54c7c3a04b90f6e33bf707bb95e96b467d5 - Reviewed-on: https://code.wireshark.org/review/3209 - Reviewed-by: Gerald Combs + Change-Id: I1a42877ee549b40e0c739dd2d1cbe4615ed9b9bd + Reviewed-on: https://code.wireshark.org/review/4098 + Reviewed-by: Martin Kaiser + Tested-by: Martin Kaiser + (cherry picked from commit ed7c3282b1434641ecd28311167c0a3b3f1eae74) + Reviewed-on: https://code.wireshark.org/review/4116 -commit 7c8d408 -Author: Evan Huus -Date: Sat Jul 26 21:39:11 2014 -0400 +commit b429020 +Author: Jeff Morriss +Date: Fri Sep 12 17:21:53 2014 -0400 - Fix yet another openflow underflow issue. + Don't try to set the length, end, or text of a faked item. - I thought I'd found all of these but I guess I hadn't; good thing the fuzz-bot - kept looking. + If we try we may (in the case of setting the length or end) mistakenly assert + out. - Bug:10314 - Change-Id: I2cc209a6c87781d10cae28f2cb91400d759f5091 - Reviewed-on: https://code.wireshark.org/review/3205 + Bug: 10329 + Change-Id: I52083ba17f6427712a6a363f48f1f7ae51f2b74b + Reviewed-on: https://code.wireshark.org/review/4093 Reviewed-by: Evan Huus - Reviewed-on: https://code.wireshark.org/review/3207 - -commit 0da9639 -Author: Guy Harris -Date: Tue Jul 22 11:51:15 2014 -0700 - - Don't return an error string for NO_INTERFACES_FOUND. - - Most callers of capture_interface_list() don't expect an error string - for NO_INTERFACES_FOUND, because that's not really an error, it's just a - statement of face (and perhaps an error of 0 should be returned), so - they don't bother freeing the error string, causing a leak. - - Instead, have the one place that *did* expect it to return an error - string just put "No interfaces found" itself. - - Also, have that place not check for an error string if interfaces *were* - found, as no error code or string is returned in that case. - - Change-Id: I9cb8ed7ad22810b23e2251d2833d9b7ab02eec03 - Reviewed-on: https://code.wireshark.org/review/3165 - Reviewed-by: Guy Harris - Reviewed-on: https://code.wireshark.org/review/3167 - -commit d11b733 -Author: Gerald Combs -Date: Tue Jul 22 13:29:07 2014 -0700 - - 1.12.0rc3 → 1.12.0rc4 - - Change-Id: Ifaaf8d810557cae4ad7c3cda881012ccc0405f0b - Reviewed-on: https://code.wireshark.org/review/3166 - Reviewed-by: Gerald Combs - -commit e14d5b6 -Author: Gerald Combs -Date: Tue Jul 22 11:36:49 2014 -0700 - - Fix rc version. - - Change-Id: If386649377129003201f6cb32020e2b674aecd20 - Reviewed-on: https://code.wireshark.org/review/3164 - Reviewed-by: Gerald Combs - -commit 04e4136 -Author: Gerald Combs -Date: Tue Jul 22 10:15:55 2014 -0700 - - Build 1.12.0rc3. - - Change-Id: I49feefa838224cad4184596551618871ba5d6abe - Reviewed-on: https://code.wireshark.org/review/3163 - Reviewed-by: Gerald Combs - -commit 88834bd -Author: Patrice Fournier -Date: Wed Jul 16 13:50:11 2014 -0400 - - Makes the RTP Player graphs work with GTK3 - - Change-Id: I91c689eb3a35f02f8fa4de64fb6e3337d42c9190 - Partial-bug: 9891 - Reviewed-on: https://code.wireshark.org/review/3090 - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - (cherry picked from commit faf3261c3ae31f0c603657b5092eb6707c988dd8) - Reviewed-on: https://code.wireshark.org/review/3159 + Reviewed-by: Jeff Morriss + (cherry picked from commit af9d2dfa134eecf420fa5a9589e032db2909fe0d) + Reviewed-on: https://code.wireshark.org/review/4111 -commit dcf0717 -Author: Jeff Morriss -Date: Tue Jul 1 16:39:15 2014 -0400 +commit 4bd2382 +Author: Jeff Morriss +Date: Sun Sep 14 18:42:39 2014 +0000 - Don't put hyphens in the rc's versions. + Revert "Only fake an item by returning 'tree' if they use the same TVB" - Apparently neither RPM nor the Debian packaging systems like having hyphens in - in the version. + Bug: 10329 + This reverts commit becb4d7837dbb506ec6359a72f7adbf0166ae0a2. - This change leaves a hyphen in the daily builds (which means we can't build - RPMs or .debs of those); we might want to consider changing that to a tilde - (~). - - Change-Id: Iaa4f3135e9e6452c2e1e199d85540e50778c5cdc - Reviewed-on: https://code.wireshark.org/review/2759 - Reviewed-by: Gerald Combs + Change-Id: I7a291beb52171eedd8d21e1f3ac2e5a33aea6a70 + Reviewed-on: https://code.wireshark.org/review/4110 + Reviewed-by: Jeff Morriss -commit fd12a88 +commit d7aba08 Author: Gerald Combs -Date: Sun Jul 20 08:08:37 2014 -0700 +Date: Sun Sep 14 08:08:37 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-07-20] + [Automatic manuf, services and enterprise-numbers update for 2014-09-14] - Change-Id: I6ce16bfb03e2c7fbda83a04e11f77182d051d5bf - Reviewed-on: https://code.wireshark.org/review/3132 + Change-Id: If493ecdbbab2c4bfe9992937b4227acba63edcde + Reviewed-on: https://code.wireshark.org/review/4107 Reviewed-by: Gerald Combs -commit 8dc5330 -Author: Steev Klimaszewski -Date: Thu Jun 19 16:54:57 2014 -0500 - - va_list can't be NULL on ARM. - - Bug: 10209 - Change-Id: Ibd63a530450b7d2d4ec244e91c77caa731ba63aa - Signed-off-by: Steev Klimaszewski - Signed-off-by: Balint Reczey - Reviewed-on: https://code.wireshark.org/review/2464 - Reviewed-by: Evan Huus - Reviewed-by: Michael Mann - (cherry picked from commit 320c4f0d705a3ed94f710fb4b7b3eef897ff7bc4) - Reviewed-on: https://code.wireshark.org/review/3130 - -commit f9f1247 +commit fe97d11 Author: Martin Kaiser -Date: Sat Jul 19 15:17:17 2014 +0200 +Date: Wed Sep 10 23:03:57 2014 +0200 - fix bug 9100 + when we check the parameter for upper(), lower() or len(), + return an error if the parameter is _no_ string - object and package containers may have multiple entries - - (manually backported 30239117ac1364b03a0a000cb79f91d986a3aa60 from master) - - Change-Id: If589988795f5307dccc8106f886cb115228efad4 - Reviewed-on: https://code.wireshark.org/review/3123 + Bug: 10401 + Change-Id: I5643ef05009072538155e63c3178071ed6bab061 + Reviewed-on: https://code.wireshark.org/review/4071 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser + (cherry picked from commit 283861892ca7a93c184355e6236a026516410cf9) + Reviewed-on: https://code.wireshark.org/review/4095 -commit 90bb39f -Author: Martin Kaiser -Date: Fri Jul 18 16:02:56 2014 +0200 +commit 4413725 +Author: Guy Harris +Date: Thu Sep 11 13:29:37 2014 -0700 - add H.265 stream type + Add some additional checks in SnifferDecompress(). - Change-Id: Ic8e17f949f245ad6fe26fb8078e0545fe5b35daa - Reviewed-on: https://code.wireshark.org/review/3116 - Reviewed-by: Martin Kaiser - (cherry picked from commit 831c1f2fe1586c7d8d5aa9767033ccba8b64da91) - Reviewed-on: https://code.wireshark.org/review/3120 - -commit dc00875 -Author: Fabian Raetz -Date: Fri Jul 18 13:50:05 2014 -0700 - - Fix install_desktop_files non-portability and add out-of-tree support. + Check the input pointer in the while clause of the loop, so that we + handle an empty input buffer. - Prepend $(srcdir)/ to the sources in install commands, and get rid of - the -T flag, as it's GNU coreutils install-specific; some versions of - install don't support -T at all, and FreeBSD's install has a -T flag - that takes an argument and has a completely different meaning. + When reading a bit mask, check before fetching the bit mask that we have + two bytes of bit mask and the byte after it. - Fixes bug 10292; fix came from + Before putting an uncompressed input byte into the output, make sure we + wouldn't run past the end of the output buffer. - http://marc.info/?l=openbsd-ports&m=140571104528980&w=2 + Before copying an earlier string from the output buffer, make sure it + doesn't run past the end of the data we've decompressed so far. - Change-Id: I8e80d475a728a17848736be043f97d2b90a0be82 - Reviewed-on: https://code.wireshark.org/review/3107 + Bug: 10461 + Change-Id: I8bb8d0d291368ae8bf0ac26970ff54d3262a7e6e + Reviewed-on: https://code.wireshark.org/review/4083 Reviewed-by: Guy Harris - (cherry picked from commit 4b720691c45e1a803bdcc01567ac1ec52da62740) - Reviewed-on: https://code.wireshark.org/review/3108 + (cherry picked from commit 47c592938ba9f0caeacc4c2ccadb370e72f293a2) + Reviewed-on: https://code.wireshark.org/review/4084 -commit 331a6ca -Author: Pascal Quantin -Date: Fri Jul 18 00:02:27 2014 +0200 +commit 4a5c80b +Author: Jeff Morriss +Date: Wed Sep 3 21:57:02 2014 -0400 - WebSocket: increase max unmask payload size to 256K and indicate that packet is truncated is going above the new limit + Don't print non-printable characters in AX.25 addresses. + + Add a new routine to wsutil to make this easy: printable_char_or_period(). - Bug: 10283 - Change-Id: Iea5401d02bcf50a3427dce5f2b817c3b73a7dc11 - Reviewed-on: https://code.wireshark.org/review/3098 + Bug: 10439 + Change-Id: I0eb2bb6bc0676a1035c3d845b5e20276fa04de60 + Reviewed-on: https://code.wireshark.org/review/3981 + Petri-Dish: Alexis La Goutte Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - (cherry picked from commit deb1d8d07f17911914216c5769cd69b9a29c5999) - Reviewed-on: https://code.wireshark.org/review/3105 - Reviewed-by: Pascal Quantin - -commit 3c75739 -Author: Tatsuhiro Tsujikawa -Date: Wed Jul 16 22:41:27 2014 +0900 - - Fix assertion error when no header field was decompressed - - bug: 10279 - Change-Id: Ibf88b1622318692ccf3904aede5d964e6028bdc7 - Reviewed-on: https://code.wireshark.org/review/3087 - Reviewed-by: Pascal Quantin - (cherry picked from commit 1b8c4bae489caa26cfd5d7b68a25394f286607e4) - Reviewed-on: https://code.wireshark.org/review/3088 - -commit 3abb0f0 -Author: Jim Young -Date: Thu Jul 10 04:32:06 2014 -0400 - - Fix regression related to OSPF related enum order definitions - - bug: 10271 - Change-Id: Ic400ab922679d86887f8b17bfe371b719d33490a - Reviewed-on: https://code.wireshark.org/review/3086 + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann + (cherry picked from commit 2497482e34a108275f75cd8106e1841b35aab98e) + Change-Id: I0eb2bb6bc0676a1035c3d845b5e20276fa04de60 + Reviewed-on: https://code.wireshark.org/review/3985 + Reviewed-by: Jeff Morriss -commit 1a92fab -Author: Michael Mann -Date: Fri Jun 20 02:47:03 2014 -0400 +commit c4421f1 +Author: Bill Meier +Date: Thu Sep 11 12:43:08 2014 -0400 - Allow expert info to show only items in the display filter. + packet-cfm.c: Fix Bug 10385: "Ethernet OAM (CFM) frames including TLV's are wrongly decoded as malformed" - This was started by Chris Maynard before Qt was announced and I just polished it off for inclusion in GTK version of Wireshark. + Regression introduced in ga06cccb (svn #50352) [Jul 3 16:43:40 2013] - bug:1860 - Change-Id: Icaada6e7900f22b0a3d97c2a5656edfd8d8c8b7f - Reviewed-on: https://code.wireshark.org/review/3035 - Reviewed-by: Christopher Maynard - Reviewed-by: Michael Mann - (cherry picked from commit d8cff57ef342b909f128244f3ab5e5debcec4988) - Reviewed-on: https://code.wireshark.org/review/3077 + Bug 10385 + Change-Id: I3f5c5518a5804a1f31cac554323a6fa8d3d55d5d + Reviewed-on: https://code.wireshark.org/review/4078 + Reviewed-by: Bill Meier + (cherry picked from commit a8fabb94b6958ad66761d9346862bab402ab949e) + Reviewed-on: https://code.wireshark.org/review/4079 -commit 5446fea +commit 96e5b50 Author: Guy Harris -Date: Tue Jul 15 18:10:22 2014 -0700 +Date: Mon Sep 8 14:49:53 2014 -0700 - The plural is "PDUs", not "PDU:s". + Do the PCR and the original PCR the same way. - Change-Id: I4bef734ef17b02e254b742744e2debd3038e98a0 - Reviewed-on: https://code.wireshark.org/review/3074 - Reviewed-by: Guy Harris - (cherry picked from commit bd30abf8701c940fc995317e6ac4aee3be04ad29) - Reviewed-on: https://code.wireshark.org/review/3075 - -commit b7d81fa -Author: Guy Harris -Date: Tue Jul 15 17:56:24 2014 -0700 - - "Export PDUs to File" pops up a dialog, so put "..." after it. + In both cases, make the extension a 16-bit variable, cast the result of + extracting the extension to guint16 to clarify that only the 9 bits + visible through the mask matter. - Also, capitalize "File" in the GTK+ version (it's already capitalized in - the Qt version). + While we're at it, there's no need to use + "proto_tree_add_uint64_format_value() if the format is just the standard + format for a 64-bit unsigned integer. - Change-Id: I27eb27022930b1c0e0321cd1a1446c3b9dc1bd17 - Reviewed-on: https://code.wireshark.org/review/3072 + Change-Id: I8f1f48595830d4672984f3797be1c9d994e64ea0 + Reviewed-on: https://code.wireshark.org/review/4043 Reviewed-by: Guy Harris - (cherry picked from commit f862eaa7c29debe03c276c2d37dcbf501e18158c) - Reviewed-on: https://code.wireshark.org/review/3073 + (cherry picked from commit 7143bd72f9bc47f40f07763a9ef32459eaa5b311) + Reviewed-on: https://code.wireshark.org/review/4072 + Reviewed-by: Martin Kaiser -commit 663b13b -Author: Guy Harris -Date: Tue Jul 15 17:14:11 2014 -0700 +commit 881eb5c +Author: Bill Meier +Date: Wed Sep 10 12:51:34 2014 -0400 - Squelch a warning. - - In at least some versions of GLib, g_array_free() warns if passed a null - pointer, rather than just silently returning. + packet-netflow.c: fix bug: "top-of-stack" --> "bottom-of-stack" - Change-Id: I1bfc0a81faa1eeebe288f6e0cc58ebfb64784958 - Reviewed-on: https://code.wireshark.org/review/3068 - Reviewed-by: Guy Harris - (cherry picked from commit 28971b28518ba0c210690d97c29df984064f4cca) - Reviewed-on: https://code.wireshark.org/review/3069 + Bug #10458 + Change-Id: I733bb54b13da8dd5b96837b57c1893e14f9622ec + Reviewed-on: https://code.wireshark.org/review/4067 + Reviewed-by: Bill Meier + (cherry picked from commit 0164b7582106ceaf244e8792ee635257ab4bace4) + Reviewed-on: https://code.wireshark.org/review/4068 -commit 445abfa -Author: Guy Harris -Date: Tue Jul 15 16:40:46 2014 -0700 +commit 7da6c7e +Author: Bill Meier +Date: Wed Sep 10 10:24:10 2014 -0400 - Only one buffer.c, please. + packet-opensafety.c: Fix two bugs: - Otherwise, if you link with both libwiretap and libfiletap, it's - anybody's guess which one you get. That means you're wasting memory - with two copies of its routines if they're identical, and means - surprising behavior if they're not (which showed up when I was debugging - a double-free crash - fixing libwiretap's buffer_free() didn't fix the - problem, because Wireshark happened to be calling libfiletap' unfixed - buffer_free()). + - Actually register dissector on default UDP ports upon startup. + - expert_...() shouldn't be called under 'if (tree)' - There's nothing *tap-specific about Buffers, anyway, so it really - belongs in wsutil. + Also: cleanup proto_reg_handoff...() and apply_prefs() code. - Change-Id: I242f93013c7104f31783c9ee52adcb090ce7b367 - Reviewed-on: https://code.wireshark.org/review/3067 - Reviewed-by: Guy Harris + Change-Id: I6390d9bf311c9a62fbc43647d9bb19f90156baec + Reviewed-on: https://code.wireshark.org/review/4063 + Reviewed-by: Bill Meier + (cherry picked from commit cc412a6cdf5321925ff0d35f0bcc28b42af69483) + Reviewed-on: https://code.wireshark.org/review/4064 -commit 21bf67a -Author: Guy Harris -Date: Tue Jul 15 16:22:34 2014 -0700 +commit a706f62 +Author: Bill Meier +Date: Tue Sep 9 15:59:49 2014 -0400 - Have buffer_free() null out the buffer data pointer. + Fix some spelling and grammar in user-visible text strings. - That prevents some double-free issues (I got one when doing non-"Update - list of packets in real time" captures, if I do one such capture and - then another one). - - Change-Id: Ia08034d9d1640bad21b74960efade8926dbfc5de - Reviewed-on: https://code.wireshark.org/review/3063 - Reviewed-by: Guy Harris - (cherry picked from commit 7344cfc78ff89603af6dec685ed968f5954e757d) - Reviewed-on: https://code.wireshark.org/review/3064 + Change-Id: I198c3da22d6c176b0b589e85fa23ac924475596d + Reviewed-on: https://code.wireshark.org/review/4056 + Reviewed-by: Bill Meier -commit 15b43a1 -Author: Alexis La Goutte -Date: Tue Jul 15 16:50:32 2014 +0200 +commit 5a06576 +Author: Jeff Morriss +Date: Mon Sep 8 11:50:41 2014 -0400 - HTTP2: Fix double free - - Found by Clang Analyzer + Register the dicom dissector by name so it can be used with SSL. - Backport from https://github.com/tatsuhiro-t/nghttp2/commit/62423f5949001c375c8e325296c74c92d1be0965 - Signed-off-by: Tatsuhiro Tsujikawa - - Change-Id: Ic70f74b55ab80ca0b8d5042f07a29c9d14af4fe2 - Reviewed-on: https://code.wireshark.org/review/3059 + Bug: 10450 + Change-Id: I786de3de39c6d4829135b67a64936c28757d1ff4 + Reviewed-on: https://code.wireshark.org/review/4038 Reviewed-by: Evan Huus + Reviewed-by: Anders Broman + (cherry picked from commit 412662afb3c404df5a1e5e19988b0df8d594267a) + Reviewed-on: https://code.wireshark.org/review/4055 + Reviewed-by: Michael Mann + Reviewed-by: Jeff Morriss -commit a5591dc -Author: Guy Harris -Date: Mon Jul 14 16:48:10 2014 -0700 - - Add application/atom+xml as an XML document type. - - Change-Id: I9fcf438f3cafcb3ab3a5b6dc0f72ed2561e5a94f - Reviewed-on: https://code.wireshark.org/review/3049 - Reviewed-by: Guy Harris - (cherry picked from commit 52a4f3d121765ce758c16137b03e7b9d2e15908c) - Reviewed-on: https://code.wireshark.org/review/3050 - -commit 967c209 -Author: Guy Harris -Date: Mon Jul 14 12:18:11 2014 -0700 +commit 3131847 +Author: Bill Meier +Date: Tue Sep 9 10:27:46 2014 -0400 - Treat CR-LF at the end of a line like LF. - - That way, if we're reading a Windows-format file on UN*X, we handle it - the same way we'd handle a UN*X-format file. + packet-sip.c: col_...() functions must not be called under 'if(...tree)' (even indirectly). - This handles bug 10272 for the cfilter and dfilter file; there are other - configuration files that may need code changes as well. + Fixes Bug #10453 - While we're at it, don't hand non-ASCII characters to isspace(). - - Change-Id: Ie4ecd2c9601545a60b4d3326c6782cfff093b156 - Reviewed-on: https://code.wireshark.org/review/3046 - Reviewed-by: Guy Harris + Change-Id: I39f64b801ce9231059ee7e03416dd3828dffeb1f + Reviewed-on: https://code.wireshark.org/review/4051 + Reviewed-by: Bill Meier + (cherry picked from commit 6e7f9ec12e52c41ba2a9c44f4f321ede87677370) + Reviewed-on: https://code.wireshark.org/review/4052 -commit 53c01b1e -Author: Guy Harris -Date: Mon Jul 14 11:26:24 2014 -0700 +commit e20f747 +Author: Martin Kaiser +Date: Sun Sep 7 18:40:36 2014 +0200 - Treat CR-LF at the end of a line like LF. - - That way, if we're reading a Windows-format file on UN*X, we handle it - the same way we'd handle a UN*X-format file. + don't skip another 6 bytes after OPCR + Bug: 10446 - This handles bug 10272 for the preference file and the "recent" files; - there are other configuration files that may need code changes as well. + simplify OPCR calculation while we're at it - Change-Id: Iec15a8fac276929ce8b53ae16070e9f2855f574c - Reviewed-on: https://code.wireshark.org/review/3042 - Reviewed-by: Guy Harris - (cherry picked from commit 338369ec2f89b47729df4b56ccf8fa3eab4ea270) - Reviewed-on: https://code.wireshark.org/review/3043 + Change-Id: I8590e409895e712fe6bbb64ab23093caf5795fa7 + Reviewed-on: https://code.wireshark.org/review/4040 + Petri-Dish: Martin Kaiser + Tested-by: Petri Dish Buildbot + Reviewed-by: Martin Kaiser + (cherry picked from commit 4af01a8f30722e969046ab3cd7a1e3e3e4e3d69e) + Reviewed-on: https://code.wireshark.org/review/4041 -commit a01be9b -Author: Peter Wu -Date: Fri Jul 11 10:40:47 2014 +0200 +commit 0942b2c +Author: Evan Huus +Date: Mon Sep 8 08:11:40 2014 -0400 - dtls: fix faulty offsets and tvbuff references - - This could lead to problems for fragmented DTLS packets. + ses: initialize pres_ctx_id in session struct - Change-Id: I602c7e181ea3799a4a2e7bcfed05bfbb129f7df4 - Reviewed-on: https://code.wireshark.org/review/3017 - Reviewed-by: Peter Wu + Bug: 10454 + Change-Id: Ib381646cad0a039514117735c48b461c9950f705 + Reviewed-on: https://code.wireshark.org/review/4033 Reviewed-by: Evan Huus - (cherry picked from commit 9e5e43ba449b4431f9db0cb77cd0fa3171acf7d4) - Reviewed-on: https://code.wireshark.org/review/3028 - Reviewed-by: Hauke Mehrtens - Reviewed-by: Bill Meier + (cherry picked from commit 433a444d148f86f2562f804d25a57d00dc277cc0) + Reviewed-on: https://code.wireshark.org/review/4036 -commit 2c9dd83 +commit a6db4e8 Author: Gerald Combs -Date: Sun Jul 13 08:08:09 2014 -0700 +Date: Sun Sep 7 08:10:02 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-07-13] + [Automatic manuf, services and enterprise-numbers update for 2014-09-07] - Change-Id: I277a4f4761e2f725b3d8edfbbcb7cb28adf1efbf - Reviewed-on: https://code.wireshark.org/review/3032 + Change-Id: I30424d9a31888b5ce1d183da3a2625524b4012c1 + Reviewed-on: https://code.wireshark.org/review/4025 Reviewed-by: Gerald Combs -commit 87bcaa1 -Author: Peter Wu -Date: Fri Jul 11 00:35:04 2014 +0200 +commit 5635326 +Author: Pascal Quantin +Date: Sat Sep 6 00:32:05 2014 +0200 - ssl: move Certificate handshake dissection to ssl-utils + 6LoWPAN: fix storage of contexts coming from ICMPv6 Router Advertisement messages - There are no dissection differences between DTLS and SSL, so move to - ssl-utils. While at it, skip dissection when the tree is NULL, remove - the plural from certificates length (the length is always larger than - ome), fix type of "ti" for dtls, get rid of "failsafe" subtree - assignment in ssl, get rid of tvb_ensure_bytes_exist in ssl. + Bug: 10443 + Change-Id: I1a74b4d3036c61f0c8e1fca6373845ea40d87808 + Reviewed-on: https://code.wireshark.org/review/4008 + Reviewed-by: Pascal Quantin + Tested-by: Pascal Quantin + (cherry picked from commit b515cd3aec86f529643293995097f5a38468efa3) + Reviewed-on: https://code.wireshark.org/review/4009 + +commit 5a6ef0e +Author: Michael Mann +Date: Fri Aug 15 21:32:57 2014 -0400 + + Escape double quotes when printing ABSOLUTE_TIME field - Unrelated changes: fix param (tvb vs sub_tvb) for DTLS KeyExchange - handshake messages. + This regression was introduced by the commit e5353bf1198d6abf748de78084ff64f597f13663 done for bug 10081 - Change-Id: Iecaa45a7a601e55a52aa16180cf219a122fbe95a - Reviewed-on: https://code.wireshark.org/review/2985 - Reviewed-by: Anders Broman - (cherry picked from commit ba6d2e7cc8d8d06e9b879813d3e11dc7855a9e99) - Reviewed-on: https://code.wireshark.org/review/3000 - Reviewed-by: Peter Wu - Reviewed-by: Hauke Mehrtens + Bug: 10213 + Change-Id: I3925a47ef13055f10f49fa9fefd022731746fbb8 + Reviewed-on: https://code.wireshark.org/review/2572 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin Reviewed-by: Evan Huus + Reviewed-by: Michael Mann + (cherry picked from commit b95e6e3a6195f7ae17a9c83cafbb1210c4aacc54) + Reviewed-on: https://code.wireshark.org/review/3949 + Petri-Dish: Michael Mann -commit 7db5606 -Author: Hauke Mehrtens -Date: Sat Apr 26 11:38:40 2014 +0200 +commit a8c6e07 +Author: Roland Knall +Date: Fri Aug 29 14:52:29 2014 +0200 - ssl/dtls: add support for Raw Public keys + openSAFETY: Adapt CRC for false-positives - Instead of X.509 certificates now also Raw public keys are supported - and shown correctly. + - There are rare false-positives, where the entire + frame consists of 0 except the addr and id field, + which will lead to a correct crc#1 calculation, + but still to a false-positive detection. This + patch fixes that - This is described in this draft: - https://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11 + - Two undefinite-loop errors are corrected as well - Change-Id: Ibe7610aace31a19791b02e71ccd8d9ceb8cf979d - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/1372 - Reviewed-by: Alexis La Goutte - (cherry picked from commit a8e6d128ab85da609915b92f3d9e370203b67131) - Reviewed-on: https://code.wireshark.org/review/2999 - Reviewed-by: Peter Wu - Reviewed-by: Evan Huus + Change-Id: Ibe5e56e0172ad3a3046bdc024da3711987116e8e + Reviewed-on: https://code.wireshark.org/review/3918 + Reviewed-by: Roland Knall + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + (cherry picked from commit db6f197c962200e0be717b953c0ebe7d7c908bf1) + Reviewed-on: https://code.wireshark.org/review/3950 + Reviewed-by: Michael Mann -commit 615b70a -Author: Pascal Quantin -Date: Fri Jul 11 19:49:46 2014 +0200 +commit 1dba335 +Author: Jeff Morriss +Date: Wed Jun 25 11:03:12 2014 -0400 - GTP: allow empty Data Record Packet IE + Indicate tshark can read (-r) from stdin and named pipes now. - Bug: 10277 - Change-Id: I4edf330fa1c44a52d985d70555c7756954fb9364 - Reviewed-on: https://code.wireshark.org/review/3008 - Reviewed-by: Pascal Quantin - (cherry picked from commit 826bca091874e04ce5aa72fa233df652bf8819fb) - Reviewed-on: https://code.wireshark.org/review/3009 + (Though it works only with certain formats.) As requested in: + https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2874#c4 + + Change-Id: I2ce0509d8750b21ae0167d12459074ba0f9506f8 + Reviewed-on: https://code.wireshark.org/review/2646 + Reviewed-by: Evan Huus + (cherry picked from commit e0461ecd4384377042fe3787acddfcc4d1ed7587) + Reviewed-on: https://code.wireshark.org/review/3989 + Reviewed-by: Jeff Morriss -commit 3cebc55 -Author: Bill Meier -Date: Thu Jul 3 19:28:21 2014 -0400 +commit baf8839 +Author: Gerald Combs +Date: Wed Sep 3 14:41:02 2014 -0700 - packet-vnc.c: Fix a bug in displaying a set of FT_BOOLEAN bit fields (found by checkAPIs). + Work around an apparent bug in GtkFileChooserButton. - Backported to master-1.12 from master + It looks like some versions of GTK+ intialize GtkFileChooserButton with a + location set to NULL and crash when you select an item from the dropdown + menu. Make sure we have a valid location set in that case. - Change-Id: Ie5252d20db5826f3e48aba11da1bf85d00630db2 - Reviewed-on: https://code.wireshark.org/review/2838 - Reviewed-by: Bill Meier - Reviewed-on: https://code.wireshark.org/review/3005 + Change-Id: If2556ef939b95d8af12581a7116a48fb46586f57 + Ping-Bug: 10434 + Reviewed-on: https://code.wireshark.org/review/3977 + Reviewed-by: Gerald Combs + (cherry picked from commit 5e3a8fa85201b7f886ad41b85e6cf8c9eca4a978) + Reviewed-on: https://code.wireshark.org/review/3978 + Reviewed-by: Evan Huus -commit ef90ec1 +commit 001338b Author: Bill Meier -Date: Thu Jul 3 17:35:58 2014 -0400 +Date: Tue Sep 2 14:41:52 2014 -0400 - packet-vnc.c: Improve dissection + packet-netflow.c: netflow v9: Allow options template with zero-length scope section - - Properly dissect multiple VNC PDUs in one (or more) TCP segment(s). - - Dissect additional message types ('Fence' and 'Enable Continuous Updates'). - - Handle "num_rects" field = 0xFFFF (TightVNC). - - Add some more info as to sources of information about the VNC protocol. - - Add an XXX note as to the (incorrect) reassembly method being used. - - Add some notes as to possible ToDo's. + Fixes Bug #10432 - Backported to master-1.12 from master + Also: rework several comments. - Change-Id: Id4942c50b3d1373bd2e72c0131614835dc39ba90 - Reviewed-on: https://code.wireshark.org/review/2834 + Change-Id: I292829f6dffaf5f500cb089cc8a45e1203a2e731 + Reviewed-on: https://code.wireshark.org/review/3959 Reviewed-by: Bill Meier - Reviewed-on: https://code.wireshark.org/review/3004 + (cherry picked from commit 9555c24740540aff840605595919fa2f5e2a2c23) + Reviewed-on: https://code.wireshark.org/review/3960 -commit 7f36674 -Author: Martin Kaiser -Date: Thu Jun 19 16:49:07 2014 -0700 +commit bb7b3c0 +Author: Jamil Nimeh +Date: Tue Aug 26 18:26:19 2014 +0200 - remove duplicate offset=0 - - Backported to master-1,12 from master + TLS: fix dissection of status_request_v2 hello extension - Change-Id: I6653b733dfd2c587909371e50fd0c2efc4649dcd - Reviewed-on: https://code.wireshark.org/review/2482 - Reviewed-by: Martin Kaiser - Reviewed-on: https://code.wireshark.org/review/3003 - Reviewed-by: Bill Meier + Bug: 10416 + Change-Id: I58a3faef227f7eafd61942cafa6e38a17557ee61 + Reviewed-on: https://code.wireshark.org/review/3865 + Reviewed-by: Evan Huus + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + (cherry picked from commit f2a7a6d50378ff6000e8c777855df945165ca125) + Reviewed-on: https://code.wireshark.org/review/3947 -commit 9536540 -Author: Martin Kaiser -Date: Thu Jun 19 16:40:49 2014 -0700 +commit cce96e4 +Author: Gerald Combs +Date: Sun Aug 31 08:09:44 2014 -0700 - no need for if(tree) - - Backported to master-1.12 from master + [Automatic manuf, services and enterprise-numbers update for 2014-08-31] - Change-Id: I5762fb30f57d0f9bc3e5fc786577ed1cc49b64d7 - Reviewed-on: https://code.wireshark.org/review/2481 - Reviewed-by: Martin Kaiser - Reviewed-on: https://code.wireshark.org/review/3002 - Reviewed-by: Bill Meier + Change-Id: I4b929c84b3a6d027ba2f71962e6353a0ca2bef66 + Reviewed-on: https://code.wireshark.org/review/3929 + Reviewed-by: Gerald Combs -commit feabf6e -Author: Alexis La Goutte -Date: Tue May 6 17:54:47 2014 +0200 +commit f05d8a0 +Author: Pascal Quantin +Date: Fri Aug 29 13:19:13 2014 +0200 - HTTP2: Backport to 1.12 - * Add HPACK decompression (add lib nghttp2) - * Update to draft-13 - - HTTP2: Showing decompressed headers - - Decode the HTTP/2 header block using nghttp2 HPACK decoder - - In this patch, We use nghttp2 HPACK decoder to decompress HTTP/2 header - block. To make HPACK decompressor work, we need to track down HTTP/2 - connection from the beginning. If we see the HTTP/2 magic (connection - preface), we initialize HPACK decompressor objects. We actually use 2 - HPACK decompressor for both client and server. HPACK decompressor - objects are stored in hash tables using TCP stream index as a key. - - Most code by: Tatsuhiro Tsujikawa - - Signed-off-by: Alexis La Goutte - Signed-off-by: Pascal Quantin - - Change-Id: Idb4dd4b0a200924820cb0b34db664cc37518168d - Reviewed-on: https://code.wireshark.org/review/1527 - Reviewed-by: Pascal Quantin - Reviewed-by: Alexis La Goutte - - Add nghttp2 lib (HPACK) - - Change-Id: I2a361951924045035a2a5d38f943e6b97c170f36 - Reviewed-on: https://code.wireshark.org/review/1623 - Reviewed-by: Pascal Quantin - Reviewed-by: Michael Mann - - NGHTTP2: fix typo (nghttp2_ent.h => nghttp2_net.h) - - Change-Id: I52d3c40794841614d55e88c9fe9cf2de43a0fa46 - Reviewed-on: https://code.wireshark.org/review/1897 - Reviewed-by: Alexis La Goutte + 6LoWPAN: fix dissection when using multicast address compression - NGHTTP2: fix -Wshadow about index with some old GCC release or Mac OS X buildbot + Also update the value_string arrays with the various SAM/DAM combinations - (No problem with gcc-4.7 or gcc-4.8) - - Change-Id: Iae1f801abeb80429c08e93668133a9c5ac7977ef - Reviewed-on: https://code.wireshark.org/review/1898 - Reviewed-by: Alexis La Goutte - - nghttp2: upgrade library to g4f7223e and add casts to please buildbots - - Change-Id: Ic412d4bfc56695cbcab709d42a6f31aa9e50c64e - Reviewed-on: https://code.wireshark.org/review/1900 - Reviewed-by: Alexis La Goutte - - Fix /home/jmayer/work/wireshark/git/wsutil/nghttp2/nghttp2_hd.c:996:12: error: ‘check_index_range’ defined but not used [-Werror=unused-function] - static int check_index_range(nghttp2_hd_context *context, size_t idx) - ^ - cc1: all warnings being treated as errors - - Change-Id: Ie8e3fe12d339a689e0222eda501b253a7d6d923c - Reviewed-on: https://code.wireshark.org/review/1912 - Reviewed-by: Jörg Mayer - - HTTP2: try to please OSX 10.6 x64 buildbot - - Change-Id: I79e7a619b5dadb68b70f8b057494cc970a655cc7 - Reviewed-on: https://code.wireshark.org/review/1903 - Reviewed-by: Pascal Quantin - - Make this comple whether assertions are enabled or not. - - Make the check for a valid index range a macro, so the compiler doesn't - whine if it's not used, but it's available if it *is* used. - - Change-Id: I3cee0460eacef23187c141458dc5ac7a7acbf7c8 - Reviewed-on: https://code.wireshark.org/review/1914 - Reviewed-by: Guy Harris - - HTTP2 : Max value for type is now 0x0B (BLOCKED type), update the heuristic - - Change-Id: I8de7b63ca90803f8fc6333bbe43aeb94459e6363 - Reviewed-on: https://code.wireshark.org/review/1918 - Reviewed-by: Michael Mann - - Dissect HTTP/2 draft-13 - - Summary of changes since draft-12: - - * Pad High and Pad Low wereare replaced with single Pad Length field. - * Padding was removed from CONTINUATION frame. - * ALTSVC and BLOCKED frames were removed. - * Per-frame compression and its associated SETTINGS flag were removed. - * HPACK Huffman code table and static header table were updated. - - Change-Id: I9c4f05f8cd937bfadbb1b912f2b9ffb31e9c18d5 - Reviewed-on: https://code.wireshark.org/review/2615 + Bug: 10426 + Change-Id: I87f13c29f42770ec655d85e2247b847bfe28e3ba + Reviewed-on: https://code.wireshark.org/review/3915 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus Reviewed-by: Anders Broman - - Update libnghttp2 to latest master (add support for draft-13) - - Bug:10256 - Change-Id: I24275f1b67120f69cfd673f7e5598a50b3c7566f - Reviewed-on: https://code.wireshark.org/review/2145 - Reviewed-by: Pascal Quantin - Reviewed-by: Alexis La Goutte - - Moved nghttp2 to epan - - Cleaned up nghttp2 build - - Change-Id: I9f7adc12936155e0ffc01ec825b5aff95279f97d - Reviewed-on: https://code.wireshark.org/review/2937 - Reviewed-by: Pascal Quantin - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - Reviewed-on: https://code.wireshark.org/review/2953 - -commit 0ab474c -Author: Guy Harris -Date: Thu Jul 10 17:27:49 2014 -0700 - - Avoid sign-extending bytes before handing them to macros. - - Pointed out by the Visual Studio code analyzer. - - Change-Id: Idd429b4d0fb3db11ce171c3a5b38bdc55cc53c15 - Reviewed-on: https://code.wireshark.org/review/2988 - Reviewed-by: Guy Harris - (cherry picked from commit b5d4128bee88b42cb32337a6343bb44574ff2f3a) - Reviewed-on: https://code.wireshark.org/review/2989 - -commit 8a47b3a -Author: Bill Meier -Date: Tue Jul 8 15:32:39 2014 -0400 - - pre-commit: Add 'unset GREP_OPTIONS' (similar to Gerrit commit-msg) - - msysgit grep is fairly old and doesn't recognize certain - grep options, e.g., '--color=auto'. - - I imagine there may possibly be other grep option issues - on various platforms. - - (I also note that the various git scripts in libexec/git-core - clear out GREP_OPTIONS before calling grep). - - Change-Id: I67bc148a77cfc0167064e61e8c47a5f091704eac - Reviewed-on: https://code.wireshark.org/review/2945 - Reviewed-by: Bill Meier - (cherry picked from commit b66f614e5d5fee0aad1eb025c228fcbf7f2aae7e) - Reviewed-on: https://code.wireshark.org/review/2948 - -commit de09662 -Author: Bill Meier -Date: Mon Jul 7 11:02:56 2014 -0400 - - tools/pre-commit: Complete all checks on all files before exiting with Ok/Fail status. - - Change-Id: Iea6df6fbe5a977b282e823f87cd9f760e92a3e22 - Reviewed-on: https://code.wireshark.org/review/2918 - Reviewed-by: Bill Meier - (cherry picked from commit cdf6d62b3ba81fd40ab386f5b0b16ec61223f5a9) - Reviewed-on: https://code.wireshark.org/review/2947 - -commit 97be684 -Author: Pascal Quantin -Date: Tue Jul 8 17:06:21 2014 +0200 - - RRC: fix ASN.1 description by manually adding CR5591 - - Without it, dual-band DF-3C feature does not work - - Change-Id: I95d4a7320b77c6093f5d51efdbb2b21af0deab11 - Reviewed-on: https://code.wireshark.org/review/2942 - Reviewed-by: Pascal Quantin - (cherry picked from commit ac52c06038d919b94e77c7d0c5bdb1e3e659815c) - Reviewed-on: https://code.wireshark.org/review/2943 - -commit 6cc7671 -Author: Evan Huus -Date: Tue Jul 8 00:04:21 2014 -0400 - - udvm: free the buffer *before* throwing the exception - - Freeing it after the exception doesn't do much, for obvious reasons. Also move - the allocation a bit later, and add modelines. - - This fixes one major memory leak, although on inspection this code still isn't - safe since there are exception-throwing functions called all over the place with - glib memory active. Outside the scope of this fix though. - - Bug: 10265 - Change-Id: I1fe272e92b92cac6b99abb84866b8ae9b582e24c - Reviewed-on: https://code.wireshark.org/review/2932 - Reviewed-by: Anders Broman - -commit e74a58b -Author: Guy Harris -Date: Sun Jul 6 21:34:06 2014 -0700 - - Squelch compiler warning. - - Change-Id: I37c495cb4d68b95d8388c654bbf6a817167261ac - Reviewed-on: https://code.wireshark.org/review/2909 - Reviewed-by: Guy Harris - (cherry picked from commit e286acd05fc5494a9cc12e5b80a3ccbd2a7f5251) - Reviewed-on: https://code.wireshark.org/review/2930 - -commit 88aa372 -Author: Guy Harris -Date: Sun Jul 6 21:31:43 2014 -0700 - - Wrong macro. - - Change-Id: I2e0e7c1a30c9fc2d5af7cbd53dae26ad9a619e71 - Reviewed-on: https://code.wireshark.org/review/2908 - Reviewed-by: Guy Harris - (cherry picked from commit 9dfb3e7b46461bed36ba35a96d800f91288305ba) - Reviewed-on: https://code.wireshark.org/review/2929 - -commit 4b8f8b3 -Author: Guy Harris -Date: Sun Jul 6 21:29:09 2014 -0700 - - G_GNUC_FORMAT encapsulates __attribute((format_arg(...))). - - Change-Id: I9513c187ae4ce8b8cf8f6a926072b215e26ec64f - Reviewed-on: https://code.wireshark.org/review/2907 - Reviewed-by: Guy Harris - (cherry picked from commit eea2e156384f74320deb3f71bb22883d70de7681) - Reviewed-on: https://code.wireshark.org/review/2928 - -commit 97d02ae -Author: Guy Harris -Date: Sun Jul 6 17:11:25 2014 -0700 - - Squelch some compiler warnings. - - Change-Id: I768bf577b3871171ab33f080c5a0099ac06718ce - Reviewed-on: https://code.wireshark.org/review/2906 - Reviewed-by: Guy Harris - (cherry picked from commit 0a2f6fc01a9170ffc29570436c5496c046612a56) - Reviewed-on: https://code.wireshark.org/review/2927 - -commit bade563 -Author: Guy Harris -Date: Sun Jul 6 16:48:06 2014 -0700 - - Squelch some compiler warnings. - - Change-Id: Ie39c7b0c1fef8f862cec016a3a1a5bd1451a3df2 - Reviewed-on: https://code.wireshark.org/review/2905 - Reviewed-by: Guy Harris - (cherry picked from commit 79fcc6a1a36e0637ce21f65a7e27bc6d90213509) - Reviewed-on: https://code.wireshark.org/review/2926 - -commit 337aebe -Author: Peter Wu -Date: Sun Jul 6 15:34:38 2014 +0200 - - Add printf-format annotations, fix garbage - - The WRETH dissector showed up some garbage in the column display. Upon - further inspection, it turns out that the format string had a trailing - percent sign which caused (unsigned)-1 to be returned by - g_printf_string_upper_bound (in emem_strdup_vprintf). Then ep_alloc is - called with (unsigned)-1 + 1 = 0 memory, no wonder that garbage shows - up. ASAN could not even catch this error because EP is in charge of - this. - - So, start adding G_GNUC_PRINTF annotations in each header that uses - the "fmt" or "format" paramters (grepped + awk). This revealed some - other errors. The NCP2222 dissector was missing a format string (not - a security vuln though). - - Many dissectors used val_to_str with a constant (but empty) string, - these have been replaced by val_to_str_const. ASN.1 dissectors - were regenerated for this. - - Minor: the mate plugin used "%X" instead of "%p" for a pointer type. - - The ncp2222 dissector and wimax plugin gained modelines. - - Change-Id: I7f3f6a3136116f9b251719830a39a7b21646f622 - Reviewed-on: https://code.wireshark.org/review/2881 - Reviewed-by: Evan Huus - (cherry picked from commit f2b4daf4005d60eef7e34e2e6ebf4fe487d3c255) - Reviewed-on: https://code.wireshark.org/review/2923 - Reviewed-by: Peter Wu - Reviewed-by: Anders Broman - -commit 6217370 -Author: Jeff Morriss -Date: Mon Jun 16 17:45:57 2014 -0400 - - Add a cast to satisfy the buildbots. - - Change-Id: I1c128db8a8b0cbbef01a26f7b3a50ed2b59af229 - Reviewed-on: https://code.wireshark.org/review/2279 - Reviewed-by: Jeff Morriss - Tested-by: Jeff Morriss - (cherry picked from commit 319ad977175e34dde70799aae7c68ff24f24b977) - Reviewed-on: https://code.wireshark.org/review/2922 - Reviewed-by: Evan Huus - Reviewed-by: Peter Wu - Reviewed-by: Anders Broman - -commit 3563b09 -Author: Gerald Combs -Date: Sun Jul 6 08:26:58 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-07-06] - - Change-Id: I4a7770b144df70b577875adf6f4593682778da8c - Reviewed-on: https://code.wireshark.org/review/2891 - Reviewed-by: Gerald Combs - -commit 8da0b0d -Author: Guy Harris -Date: Sat Jul 5 19:25:47 2014 -0700 - - Fix more errors revealed by enum-to-integer conversion warnings. - - Change-Id: Ib28af874cbac0623ed94e7558f3711e9a1b03a2d - Reviewed-on: https://code.wireshark.org/review/2874 - Reviewed-by: Guy Harris - (cherry picked from commit 8481c438614427a9249aa20e31062e3bf7a86a89) - Reviewed-on: https://code.wireshark.org/review/2875 - -commit e851c0a -Author: Guy Harris -Date: Sat Jul 5 18:33:00 2014 -0700 - - Squelch a warning. - - Change-Id: Id27a6447dba9b6eda07933139a3f07edd71c8fd6 - Reviewed-on: https://code.wireshark.org/review/2872 - Reviewed-by: Guy Harris - (cherry picked from commit ab5d1cfa20b3047ed062bc3b9fbf85d396ae7e63) - Reviewed-on: https://code.wireshark.org/review/2873 - -commit e13d4d4 -Author: Guy Harris -Date: Sat Jul 5 18:13:13 2014 -0700 - - Pull the record processing into netmon_process_record(). - - That combines more common code from the read and seek-read code - paths. - - Also, separate out the individual metadata record types, with a comment - for each, to simplify the process of supporting some or all of them in - the future. - - Change-Id: Ic8ded397d9550ec6013c1f5f138333b1ef5c37e5 - Reviewed-on: https://code.wireshark.org/review/2869 - Reviewed-by: Guy Harris - (cherry picked from commit 570d52a844afe40255ccce68d4bdad66669ff709) - Reviewed-on: https://code.wireshark.org/review/2870 - -commit 9b81e6b -Author: Guy Harris -Date: Sat Jul 5 12:32:27 2014 -0700 - - Fix an error caught by enum-conversion warnings. - - (Strong typing is for weak minds. - - Human minds are weak. - - Therefore, strong typing is for human minds.) - - Change-Id: I2a973b6168235d5d1c7f2a5f8ac79b97b963d846 - Reviewed-on: https://code.wireshark.org/review/2863 - Reviewed-by: Guy Harris - (cherry picked from commit 3f7725174d2c4122b1d159958a56b8d8b928301b) - Reviewed-on: https://code.wireshark.org/review/2864 - -commit 6319ff6 -Author: Guy Harris -Date: Sat Jul 5 11:48:52 2014 -0700 - - Fix whitespace issues. - - Change-Id: I69f84ca8b947be8e06005c82526559e3bc8f6387 - Reviewed-on: https://code.wireshark.org/review/2861 - Reviewed-by: Guy Harris - (cherry picked from commit c8bcdd52716a308bf3d6cbd131c68a31203f6e0b) - Reviewed-on: https://code.wireshark.org/review/2862 - -commit df61fac -Author: Guy Harris -Date: Sat Jul 5 11:45:18 2014 -0700 - - Handle the UTC timestamps in NetMon 2.3 files. - - This addresses part of, but not all of, the issues in bug ten thousand, - one hundred, and ninety: - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10190 - - (I'm spelling it out to make sure Gerrit doesn't think this change - *does* address all the issues in that bug, and mark it as RESOLVED - FIXED; I feel like I have to treat Gerrit as a dog or small child from - whom I'm trying to keep a secret - "honey, I'm taking the dog to the - vee eee tee".) - - Change-Id: Ic234130c1ea84cfaf47901485dca775e168f71d0 - Reviewed-on: https://code.wireshark.org/review/2859 - Reviewed-by: Guy Harris - (cherry picked from commit 599b880e4c53613c243b0a39548968f34cdce0e3) - Reviewed-on: https://code.wireshark.org/review/2860 - -commit 62a429a -Author: Guy Harris -Date: Mon Jun 23 23:56:59 2014 -0700 - - proto_tree_add_uint() takes a value, not an encoding, as an argument. - - Change-Id: Ie2c0523e32b54cd13506501d98215934a8d1304e - Reviewed-on: https://code.wireshark.org/review/2611 - Reviewed-by: Guy Harris - (cherry picked from commit 4f1d20abae2c485bf0cdcaee10a917e4e01ebda1) - Reviewed-on: https://code.wireshark.org/review/2858 - -commit e166d36 -Author: Evan Huus -Date: Fri Jul 4 21:45:15 2014 +0000 - - Expand a variable from 16 to 32 bits (and make it signed). - - Fixes an overflow leading to infinite loop. - - Bug: 10259 - Change-Id: Ie76c5a810af927ba092f4067268bd789b3a7d7bf - Reviewed-on: https://code.wireshark.org/review/2856 - Reviewed-by: Evan Huus - (cherry picked from commit c92bf7e44bae7d73b65461b7fb5bf9cea72705ce) - Reviewed-on: https://code.wireshark.org/review/2857 - -commit f12aac6 -Author: Pascal Quantin -Date: Fri Jul 4 13:48:29 2014 +0200 - - Fix qtshark compilation with more explicit casts (follow-up of g106c8b3) - - Change-Id: I81f862e03977b7fd8aa6852fada0c6e1b00b52bf - Reviewed-on: https://code.wireshark.org/review/2849 - Reviewed-by: Pascal Quantin - -commit 34303a2 -Author: Pascal Quantin -Date: Fri Jul 4 11:56:48 2014 +0200 - - TCP: backport out of order packet detection algorithm from master branch - - Change-Id: I20ec27a1dc226b412eaa1caddb66b6b7caafbe4e - Reviewed-on: https://code.wireshark.org/review/2847 - Reviewed-by: Anders Broman - -commit f3a0092 -Author: Pascal Quantin -Date: Fri Jul 4 11:52:55 2014 +0200 - - Fix Windows build broken by g106c8b3 - - Change-Id: I55aa398838a6809cb6597647335ae72f824cfc43 - Reviewed-on: https://code.wireshark.org/review/2846 - Reviewed-by: Anders Broman - -commit 600a505 -Author: Peter Wu -Date: Wed Jun 25 10:54:57 2014 +0200 - - ssl-utils: add missing ett registration - - Fixes the dissector bug warning: - "epan/proto.c:4657: failed assertion "idx >= 0 && idx < num_tree_types" - - Add some comments to avoid future mistakes, add folding markers and fix - alignment of curves hf. - - Change-Id: Ibcb57bfeb09a9777324682704a86f1ce260d345e - Reviewed-on: https://code.wireshark.org/review/2642 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 4224e353f9ca3a3224ad2be3728905e729e74b9c) - Reviewed-on: https://code.wireshark.org/review/2817 - Reviewed-by: Hauke Mehrtens - Reviewed-by: Anders Broman - -commit dcc01c2 -Author: Peter Wu -Date: Mon Jun 23 23:14:06 2014 +0200 - - ssl: fix ClientKeyExchange, fix TLSv1.2 SKE for DH - - Since DTLS and TLS do not differ in handling ClientKeyExchange and - ServerKeyExchange, its dissection got moved to ssl-utils. The code is - based on the SSL dissector, with header field names adjusted to the - DTLS ones (those got capitalized). Besides a version difference (for - signatures), the header field and function names, the DTLS and SSL code - are equal (this is verified). - - This patch refactors the dissectors for DHE_RSA and ECDHE to make use of - a common function to dissect the signed_params field. All offset - tracking is also removed in favor of exception handling by the - proto_tree_add_item function. Occurrences of proto_tree_add_uint are - also replaced by proto_tree_add_item for simplicity. - - After those changes, the SKE dissector for DH key exchanges is updated - to handle the mandatory signature field in TLSv1.2, using the newly - added function. (bug 9208) - - Another bug occurred after the length check removal, pre-TLS and - OpenSSL's old DTLS implemenation do not include a vector length in - the CKE. This is now also fixed. (bug 10222) - - Other minor changes: comments added/corrected, renamed - keyex_dh -> keyex_dhe (includes DHE_RSA and DHE_DSS). - - Bug: 9208 - Bug: 10222 - Change-Id: I76e835d56a65c91facce46840d79c1c48ce8d5dd - Reviewed-on: https://code.wireshark.org/review/2542 - Reviewed-by: Evan Huus - (cherry picked from commit e22d3c9b744af8fa49806f1cde2100be85cc58cc) - Reviewed-on: https://code.wireshark.org/review/2816 - Reviewed-by: Hauke Mehrtens - Reviewed-by: Anders Broman - -commit 098aa9f -Author: Hauke Mehrtens -Date: Sat Apr 26 10:45:41 2014 +0200 - - ssl-utils: dissect the certificate type TLS extension - - This analyses the certificate type extensions and then stores the - certificate type in the ssl session. This way we can later show the - certificate in the correct from. - - This is described in this draft: - https://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11 - - Change-Id: Ifdda165807bc29f1fc138da000a9a538ecd18b6e - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/1371 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 584b81372b70f3fbb28e35df145215778b0d6663) - Reviewed-on: https://code.wireshark.org/review/2815 - Reviewed-by: Anders Broman - -commit 9c1607f -Author: Hauke Mehrtens -Date: Sun May 25 11:07:51 2014 +0300 - - ssl: use SslSession - - Use the struct SslSession instead of passing the tls version and cipher - to each function. - - Change-Id: I19b163913f8f6521a34d94d130e2ae74546a615a - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/1821 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 13e4f777c763e22a260638445d7395687d787b54) - Reviewed-on: https://code.wireshark.org/review/2814 - Reviewed-by: Anders Broman - -commit a028288 -Author: Hauke Mehrtens -Date: Sat May 24 17:51:10 2014 +0300 - - dtls: use SslSession - - Use the struct SslSession instead of passing the tls version and cipher - to each function. - - Change-Id: I95ad8cb5857794608f0f8db5c2dfd4b16e6578d5 - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/1820 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 00251edd7d6bb2720507fa30fcde4d4e2f6c4842) - Reviewed-on: https://code.wireshark.org/review/2813 - Reviewed-by: Anders Broman - -commit 3245a9f -Author: Hauke Mehrtens -Date: Thu May 22 10:45:40 2014 +0200 - - ssl: add SslSession structure - - This structure is used to store information about a SSL session which - is not only needed for decrypting the session, but also to show nice - dissection information. - - In an other patch I will add some more members to the struct because - the old way of passing them to the function does not scale. - - Change-Id: I88e7f2896e0364a41d4538752dad291de83bfbca - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/1819 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - (cherry picked from commit a7a4aa9a743f68f9864011d3b56bb5739c2cda15) - Reviewed-on: https://code.wireshark.org/review/2812 - Reviewed-by: Anders Broman - -commit 106c8b3 -Author: Andrew Bitson -Date: Wed Jul 2 09:04:47 2014 -0500 - - adding abs() functions when creating the values to be graphed since the graph only handles positive values. - Does not apply to FT_RELATIVE_TIME. - - This is being added to master-1.12 to avoid breaking future QT functionality in the graph. - - Bug 9985 - Add absolute values to i/o graph - - Change-Id: I32565c346bef48ec852f61c379df96f2c733e68f - Reviewed-on: https://code.wireshark.org/review/2780 - Reviewed-by: Evan Huus - -commit 047c4c0 -Author: Bill Meier -Date: Thu Jun 19 21:35:46 2014 -0400 - - packet-vnc.c: Improve re-assembly. - - Essentially: - - When more data is needed to continue dissecting a PDU, use - DESEGMENT_ONE_MORE_SEGMENT instead of repeatedly requesting - additional bytes (for one or a few more fields). - - - Improves the efficiency of the dissection; - - - Prevents 'one-pass' tshark dissection from redissecting - the PDU repeatedly many, many times with each time dissecting - the PDU with one or a few more additional fields. - This generated *lots* of (repeated) output since a reassembled - VNC PDU can contain many fields (each of short length). - - - (A comment in packet-tcp.c states, in effect, that repeatedly - requesting a specific amount of more bytes to dissect a PDU - will "break reassembly" although I note that the reassembly did - seem to work (in-efficiently)). - - Note: Although this patch improves the handling of reassembly, the - dissector has significant issues. For example. see Bug #5366. - - I expect this fixes the Bug #10134 issue: "Cannot allocate memory"; - - Before the fix, 'tshark -nVxr' for the input file generated trees with - multiple hundreds of thousands of entries and generated reassembled - PDUs consisting of many, many small fragments. - - Change-Id: I970037c346fbaa4bffa5726fd5bee5f69396eabf - Reviewed-on: https://code.wireshark.org/review/2471 - Reviewed-by: Bill Meier - (cherry picked from commit 728e5a1ab3e2614ec83a6af43a52742cf0f5df01) - Reviewed-on: https://code.wireshark.org/review/2821 - -commit 71cb629 -Author: Peter Wu -Date: Thu Jul 3 11:25:21 2014 +0200 - - catapult,irda: Fix ASAN crashes due to buffer underrun - - The catapult dissector tripped on this random file I had. A quick look - at other dissectors which use a construct like "-1] *= '*\\[rn]" showed - packet-irda too, so fix that as well. - - Change-Id: I4b5fadcacd0b09d0fb29bdefc3dd1f28aef9b593 - Reviewed-on: https://code.wireshark.org/review/2802 - Reviewed-by: Evan Huus - Reviewed-by: Michael Mann - (cherry picked from commit 16f8ba1bed579344df373bf38fff552ab8baf380) - Change-Id: I4b5fadcacd0b09d0fb29bdefc3dd1f28aef9b593 - Reviewed-on: https://code.wireshark.org/review/2809 - Reviewed-by: Evan Huus - -commit 58d93e1 -Author: Pascal Quantin -Date: Wed Jul 2 23:04:58 2014 +0200 - - GTP: add dissection of Extended End User Address - - Bug: 10251 - Change-Id: I174b5a2b3e2ec8ff2ead9f290b452ee468f6fe66 - Reviewed-on: https://code.wireshark.org/review/2783 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - (cherry picked from commit 2dbab6df183148c370f6ea501c1c00974364407b) - Reviewed-on: https://code.wireshark.org/review/2793 - Reviewed-by: Pascal Quantin - -commit a81265a -Author: Balint Reczey -Date: Mon Jun 30 17:56:28 2014 +0200 - - Allow overriding C/C++ flags from CMake command line - - Append user's flags to our flags instead of prepending them to make - user flags higher priority. - - Change-Id: I3ead33ee5fa06a2395d9197a027306ef99a704a2 - Reviewed-on: https://code.wireshark.org/review/2722 - Reviewed-by: Jörg Mayer - (cherry picked from commit 65e3f5c25ee48e5b736ddbdf04fb2a31601ce8c1) - Reviewed-on: https://code.wireshark.org/review/2786 - Reviewed-by: Balint Reczey - -commit fcea3cb -Author: Guy Harris -Date: Wed Jul 2 13:27:00 2014 -0700 - - Fail if any of the install-exec-hook commands fails. - - Hopefully, this will mean that somebody doing a set-UID/set-GID/setcap - installation as themselves rather than as root will not "succeed" but - leave dumpcap installed without enhanced privileges, so the underlying - problem in bugs such as bug 10247 will be more obvious. - - Change-Id: I34393bc2c9ea4dc59854a08524edb4f65e79730b - Reviewed-on: https://code.wireshark.org/review/2781 - Reviewed-by: Guy Harris - (cherry picked from commit 2c9d2bea32238223634ae975cfd4e682ba1a0b2b) - Reviewed-on: https://code.wireshark.org/review/2782 - Reviewed-by: Evan Huus - -commit d570514 -Author: Jeff Morriss -Date: Tue Jul 1 18:28:26 2014 -0400 - - Get rid of rpath when we're building RPMs. - - Fedora prohibits it, we don't need it, and it gets in the way some times. - - Change-Id: I92cee959f471866ff90efe9f96e4fa519c357dd9 - Reviewed-on: https://code.wireshark.org/review/2763 - Reviewed-by: Jeff Morriss - (cherry picked from commit a4a624e4c5f16ad75ab9124e390f82efaca06512) - Reviewed-on: https://code.wireshark.org/review/2765 - -commit 44b8729 -Author: Jeff Morriss -Date: Tue Jul 1 17:22:46 2014 -0400 - - Fix buildroot. - - Change-Id: I902db6c69ae5966da1102e4fbcfd9f46867c0b4f - Reviewed-on: https://code.wireshark.org/review/2762 - Reviewed-by: Jeff Morriss - (cherry picked from commit 5f682f1f0329d65edbb363d7db1df23840d38d83) - Reviewed-on: https://code.wireshark.org/review/2764 - -commit 5d2747c -Author: Malcolm Walters -Date: Tue Jul 1 13:38:47 2014 +0100 - - Fix for Bug 10240. - Include padding length in calculation of correct attribute length - - Change-Id: I569c6a9e1be39e3bb997e797a094b80cdcba6b07 - Reviewed-on: https://code.wireshark.org/review/2747 - Reviewed-by: Evan Huus - Reviewed-by: Pascal Quantin - (cherry picked from commit 2a306f4b05b156a08788df80648bc2714c412b1f) - Reviewed-on: https://code.wireshark.org/review/2760 - -commit 4b59394 -Author: Guy Harris -Date: Mon Jun 30 15:37:58 2014 -0700 - - Always set the crash information. - - There's no reason to do it only on Windows - and, in fact, the only - platform where we currently do anything with the information is OS X. - Every other program in the Wireshark suite that does it at all does it - on all platforms. - - Change-Id: I7d017be224628fc08aaf7e64b380af7a5beb0232 - Reviewed-on: https://code.wireshark.org/review/2731 - Reviewed-by: Guy Harris - -commit 1322190 -Author: Bill Meier -Date: Mon Jun 30 01:48:16 2014 -0400 - - Fix Bug #10238: Display filter expression dialog items do not expand/display properly. - - Unfortunately, certain proto_hier_tree_model.c functions - assume/require that a cookie generated by - proto_(first|next)_protocol_field() will never have a NULL value. - - Bug introduced in gd47ae54. - - Change-Id: I42763d02f700e15ca9b3ab9980943d4f8d933ca9 - Reviewed-on: https://code.wireshark.org/review/2712 - Reviewed-by: Evan Huus - (cherry picked from commit 9cf40b67b258616c248569b74685693f14a0aab3) - Reviewed-on: https://code.wireshark.org/review/2715 - -commit 1d08bee -Author: Pascal Quantin -Date: Sun Jun 29 15:13:43 2014 +0200 - - GSM MAP: ensure that p2p_dir is always initialized before calling GSM SMS dissector - - Bug: 10234 - Change-Id: Ie340b849015febe46f91836440d44d4cfde005a4 - Reviewed-on: https://code.wireshark.org/review/2695 - Reviewed-by: Evan Huus - Reviewed-by: Pascal Quantin - (cherry picked from commit e39e44df246c89c31d708923a181f99810240731) - Reviewed-on: https://code.wireshark.org/review/2700 - -commit a2e2571 -Author: Gerald Combs -Date: Sun Jun 29 08:07:20 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-06-29] - - Change-Id: I47f6863f34690631f4b7b8dcc654f802155794c6 - Reviewed-on: https://code.wireshark.org/review/2697 - Reviewed-by: Gerald Combs - -commit 713fbc6 -Author: Evan Huus -Date: Thu Jun 26 23:25:08 2014 -0400 - - If we have no fields, don't try to iterate through them. - - Otherwise glib throws an assertion since the array we pass it is NULL. - - Change-Id: I9159c1f5ad99b280c040cd790df3cf352738601f - Reviewed-on: https://code.wireshark.org/review/2680 - Reviewed-by: Evan Huus - (cherry picked from commit 8d2eaaab51f0c64de0488b7b2b83cac7086628c1) - Reviewed-on: https://code.wireshark.org/review/2681 - -commit a189ed8 -Author: Martin Kaiser -Date: Thu Jun 19 14:32:55 2014 -0700 - - handle TS packet reassembly for PES packets with 0 length field - (unknown length) - - this fixes bug 9527 - - Change-Id: I255ae9662dfeea06e61e4b0891e0ea8eaa254d0f - Reviewed-on: https://code.wireshark.org/review/2462 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 1e9bc6e4832d99be59e9140558b0265828fd590e) - Reviewed-on: https://code.wireshark.org/review/2679 - -commit 35ee9d2 -Author: Jeff Morriss -Date: Wed Jun 25 15:37:36 2014 -0400 - - Check the validity of fields given to tshark with "-e": complain and exit if - they aren't valid. - - Should help avoid confusion like that in - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10201 - - Bug: 10201 - Change-Id: Iff7f51ae042ca1a92d1c803b6cb61aa5d81ce205 - Reviewed-on: https://code.wireshark.org/review/2654 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - (cherry picked from commit 9d4af5fccd4061521f72d42c2afb7fef78d3e690) - Reviewed-on: https://code.wireshark.org/review/2673 - -commit b97d70d -Author: Gerald Combs -Date: Thu Jun 26 10:33:21 2014 -0700 - - Fix compilation of packet-btavdtp.c. - - Change-Id: I6962dafd8c6c2db522fb01178a1b4cdb831ee85b - Reviewed-on: https://code.wireshark.org/review/2671 - Reviewed-by: Gerald Combs - -commit ced8a05 -Author: Gerald Combs -Date: Wed Jun 25 16:00:11 2014 -0700 - - Decrease TRAFFIC_CAPTURE_DURATION from 60s to 15s. - - Change-Id: Ie6d6ac0489f0fcb506360a3900d33c44cb3477e9 - Reviewed-on: https://code.wireshark.org/review/2664 - Reviewed-by: Gerald Combs - (cherry picked from commit 81963e7f1a5c7b19b414a4de210cc65c62aee27c) - Reviewed-on: https://code.wireshark.org/review/2666 - -commit 9d8adb2 -Author: Guy Harris -Date: Wed Jun 25 14:05:36 2014 -0700 - - Update a comment. - - Also, make the block of code containing that comment intended - consistently with spaces. - - Change-Id: I8e8eb346833662f15c53ece5869b12cc430bad11 - Reviewed-on: https://code.wireshark.org/review/2661 - Reviewed-by: Guy Harris - (cherry picked from commit 765405da3e7ee501935e04a818beda6fffa4ccf9) - Reviewed-on: https://code.wireshark.org/review/2662 - -commit 4c4ae26 -Author: Guy Harris -Date: Wed Jun 25 13:42:36 2014 -0700 - - Boost the maximum snapshot length to 262144, for USBPcap. - - Change-Id: I104bd9d1519298a0e4ff818f1cf821df594b3491 - Reviewed-on: https://code.wireshark.org/review/2658 - Reviewed-by: Guy Harris - (cherry picked from commit 474b90e35898c8898695b43bb49305ec200fa6b0) - Reviewed-on: https://code.wireshark.org/review/2659 - -commit 9ade6ec -Author: Guy Harris -Date: Wed Jun 25 13:26:39 2014 -0700 - - Boost the maximum packet size to 131072. - - Libpcap 1.6/tcpdump 4.6 will support up to 131072, as the MTU on the - Linux loopback device is 65536 on at least some versions of the kernel, - and that doesn't count the fake Ethernet header, so the maximum packet - size is 65549; they went to the next power of 2 up. - - Change-Id: Ibfc66d01ef8ef7387887a75c2b567159bb78ac0f - Reviewed-on: https://code.wireshark.org/review/2655 - Reviewed-by: Guy Harris - (cherry picked from commit 8cde7a72d6c2b8e5cac87aeec5b1f200185cbe4a) - Reviewed-on: https://code.wireshark.org/review/2656 - -commit e314763 -Author: Balint Reczey -Date: Tue Jun 24 16:53:58 2014 +0200 - - Fix sorting RTP Streams by jitter - - Bug: 9460 - Change-Id: I80d991053eb47b8650561e8af4cc8dec512e2c9c - Reviewed-on: https://code.wireshark.org/review/2619 - Reviewed-by: Anders Broman - Reviewed-by: Michael Mann - (cherry picked from commit 00212e5f98b71787e274a92a3b72f41d474e888f) - Reviewed-on: https://code.wireshark.org/review/2634 - -commit 0db675d -Author: Ben Burwell -Date: Tue Jun 24 11:34:40 2014 -0400 - - Add quotes around MAKEDIR. - - Bug: 7870 - Change-Id: I6cea057c4953f5ecc0a146a24570d089e79f8352 - Reviewed-on: https://code.wireshark.org/review/2620 - Reviewed-by: Michael Mann - (cherry picked from commit 830d1b1ce9905e287386c9e8bc638c26380d77cb) - Change-Id: I6cea057c4953f5ecc0a146a24570d089e79f8352 - Reviewed-on: https://code.wireshark.org/review/2636 - Reviewed-by: Michael Mann - -commit 018fa44 -Author: Balint Reczey -Date: Tue Jun 24 14:58:46 2014 +0200 - - GTK3: Fix changing filter expression's bg color based on validity - - Bug: 8598 - Change-Id: Id5a52c05cab25df9e228b1b4d2caf07335c1f4c8 - Reviewed-on: https://code.wireshark.org/review/2614 - Reviewed-by: Anders Broman - Reviewed-by: Evan Huus - (cherry picked from commit 09b86bdb0ce6602f1c15a8fccd4057aeb1d2e823) - Reviewed-on: https://code.wireshark.org/review/2630 - -commit 25d39ca -Author: Guy Harris -Date: Tue Jun 24 13:48:40 2014 -0700 - - Support -w even if we're not built with pcap. - - You can, for example, do - - tshark -r file1 -Y filter -w file2 - - to read a file, apply a read filter, and write the packets that match - the filter to another file even if you can't capture traffic. - - Change-Id: Ifd5e1d5c0e745edef5e98ec4babc720bfbcee6d9 - Reviewed-on: https://code.wireshark.org/review/2627 - Reviewed-by: Guy Harris - (cherry picked from commit 0fb9369a5ed3381c1c243c2f34a66f3061712c4b) - Reviewed-on: https://code.wireshark.org/review/2628 - -commit c7874f7 -Author: Pascal Quantin -Date: Mon Jun 23 22:06:05 2014 +0200 - - Initialize whole buffer in GPRS Mobility and Session Management dissector - - Bug: 10216 - Change-Id: I572a7a6ce0f816063f02397b667dd46c990cf73e - Reviewed-on: https://code.wireshark.org/review/2583 - Reviewed-by: Pascal Quantin - (cherry picked from commit dd7134d907350ccc574cdec596f4162860912bb9) - Reviewed-on: https://code.wireshark.org/review/2584 - -commit d24be5b -Author: Michal Labedzki -Date: Wed Jun 18 17:10:09 2014 +0200 - - Bluetooth: A2DP: Fix fuzz failture - - Fix invalid structure casting by using defaults values, - this also fix DecodeAs for A2DP. - - Do the same for VDP. - - Change-Id: I360787af648ed65205eb54732ab6d88f8532cf15 - Reviewed-on: https://code.wireshark.org/review/2551 - Reviewed-by: Michal Labedzki - (cherry picked from commit 10fc6e253195dced1c00d59e4fbe3d020ecb739d) - Reviewed-on: https://code.wireshark.org/review/2565 - Reviewed-by: Evan Huus - -commit a3e3db5 -Author: Evan Huus -Date: Sun Jun 22 16:53:35 2014 -0400 - - Initialize whole buffer in GTP dissector - - Bug:10216 - Change-Id: Ib7de616d50937eb43b16daa4067ee0de9edc8ec7 - Reviewed-on: https://code.wireshark.org/review/2562 - Reviewed-by: Evan Huus - (cherry picked from commit 3fc441e7a5008640c68ec985e669d5092414a519) - Reviewed-on: https://code.wireshark.org/review/2563 - -commit 91a375f -Author: Evan Huus -Date: Sun Jun 22 15:33:06 2014 -0400 - - Fix leak in nbap init function - - Change-Id: I9a70d4da936ad5fd847fc1ba0b29b7220030b977 - Reviewed-on: https://code.wireshark.org/review/2558 - Reviewed-by: Evan Huus - (cherry picked from commit ce99d8a205071eaa5f3de69f281a272861294a57) - Reviewed-on: https://code.wireshark.org/review/2561 - -commit 3775ebd -Author: Gerald Combs -Date: Sun Jun 22 08:06:55 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-06-22] - - Change-Id: Iba4a0dbae673d14232a1c8d2f6f9e48e291f739c - Reviewed-on: https://code.wireshark.org/review/2544 - Reviewed-by: Gerald Combs - -commit f5ea0d2 -Author: Pascal Quantin -Date: Fri Jun 20 20:43:48 2014 +0200 - - TCP: update the list of options and put Kind and Length items in the right subtree - - Bug: 10211 - Change-Id: Ide37f2a2b33f0d6d7cdff897eed02a8c1ea24f7d - Reviewed-on: https://code.wireshark.org/review/2488 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 6808afd0172cc1507f19ef1533f500fac4b0dce2) - Reviewed-on: https://code.wireshark.org/review/2490 - Reviewed-by: Pascal Quantin - -commit 6a369cf -Author: Stig Bjørlykke -Date: Fri Jun 20 18:50:00 2014 +0200 - - Revert part of svn revision 52045 (git b38ee917) - - This fix does change the format printed for values using bitmasks - (because the bit values are printed first) and is not always wanted - in this dissectors (because of readability). - - We should have a better way of doing what I want in this dissectors, - so I'll have a look at this later. - - Change-Id: I2477aa6b1d0c42a7ad5848bba3cb74dce3bba1f0 - Reviewed-on: https://code.wireshark.org/review/2485 - Reviewed-by: Stig Bjørlykke - (cherry picked from commit 2ab2921c7d146ae453770e14ea3a4a11f2bdc2fd) - Reviewed-on: https://code.wireshark.org/review/2486 - -commit b1da509 -Author: dameiss -Date: Thu Jun 19 18:08:39 2014 -0400 - - Add GTK modules for existing LBM dissectors. - - Mainly cherry-picked from commit 46a808acf4e8c87b61169bfac00799857b38f1f0, but there were a few minor issues that were merged into this single commit. - - bug: 10204 - Change-Id: Ie21cc07b0ac9a56648ec72062ce58a1ac800318e - Reviewed-on: https://code.wireshark.org/review/2427 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - -commit 224ab2d -Author: Evan Huus -Date: Thu Jun 19 23:05:53 2014 -0700 - - Don't hide tcp option kind/len fields - - Hidden fields are deprecated, and we were hiding them inconsistently anyways. - - Bug:10211 - Change-Id: Iaf1576ae7bc04c0c0bd896c096b117f1b8af2e9e - Reviewed-on: https://code.wireshark.org/review/2474 - Reviewed-by: Evan Huus - (cherry picked from commit 80c070fb517a8c153278d936f0143e283adc01fb) - Reviewed-on: https://code.wireshark.org/review/2475 - -commit 4a5b04b -Author: Jeff Morriss -Date: Thu Jun 19 17:42:37 2014 -0400 - - Don't crash when closing the Summary window if the file has been closed. - - Yes, this is a Gtk-UI fix but it's a one-liner and easy enough. - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8715 - - Bug: 8715 - Change-Id: I554b6c953e83ff3d8cb57029e844f2f481b751dd - Reviewed-on: https://code.wireshark.org/review/2460 - Reviewed-by: Jeff Morriss - (cherry picked from commit a32dbae525386fbf2ed14d5d5b982f666ac42219) - Reviewed-on: https://code.wireshark.org/review/2463 - -commit b1c025a -Author: Pascal Quantin -Date: Thu Jun 19 23:16:56 2014 +0200 - - Update User Guide for upcoming 1.12.0 release - - Change-Id: I01dace804dc011c096753e413c27615c0661edbe - Reviewed-on: https://code.wireshark.org/review/2457 - Reviewed-by: Pascal Quantin - -commit bc075ae -Author: Pascal Quantin -Date: Thu Jun 19 21:40:20 2014 +0200 - - Kerberos: fix dissection of packets when Record Mark is present - - Bug: 10200 - Change-Id: Ied8db64120131c029e276d66aeff8b81a45a7286 - Reviewed-on: https://code.wireshark.org/review/2447 - Reviewed-by: Evan Huus - Reviewed-by: Pascal Quantin - (cherry picked from commit 0a3b1d8beb22745d6c9a04297f4056770016299e) - Reviewed-on: https://code.wireshark.org/review/2454 - -commit 7ea0d6c -Author: Pascal Quantin -Date: Thu Jun 19 21:13:17 2014 +0200 - - Long and short names are inverted - - Change-Id: Ief3c86562d5eadb845b5a32dc704a61ccd27fdf6 - Reviewed-on: https://code.wireshark.org/review/2443 - Reviewed-by: Pascal Quantin - (cherry picked from commit e1c0674564ee39ebf7bc74d6c70e9a78a92dbe7d) - Reviewed-on: https://code.wireshark.org/review/2444 - -commit 1dfe213 -Author: Evan Huus -Date: Thu Jun 19 19:06:59 2014 +0000 - - Fix underflow causing infinite loop in openflow dissector - - Bug:10208 - Change-Id: I8aff9523fd33cf9e0802153100ea032139966b26 - Reviewed-on: https://code.wireshark.org/review/2440 - Reviewed-by: Evan Huus - (cherry picked from commit 592c3673c63561c5126885933e64d734e0572769) - Reviewed-on: https://code.wireshark.org/review/2441 - -commit 7e92d04 -Author: Roland Knall -Date: Tue May 27 13:50:00 2014 +0200 - - EPL: Reassemble the splitted payload - - The data that is sent when downloading or uploading from a server is - sent in segments to the client.To clearly display all the segments - belonging together the splitted payload needs to be reassembled. - - The behaviour is described in the powerlink specification 301 v1.2.0 - chapter 6.3.2.4.1.1 Download Protocol and chapter 6.3.2.4.2 Upload - Protocol. The payload of the download/upload is now reassembled. - - Backport - This is an enhancement over the current dissector in a way, that the former segmented payload can be debugged better. - - Signed-off-by: Lukas Emersberger - Change-Id: I17c30f15e75da47bcaba8f1fda1e412849ec268c - Reviewed-on: https://code.wireshark.org/review/1120 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - (cherry picked from commit f0cf649b3265c915e4e11aeac5ecd76ada03c46c) - Reviewed-on: https://code.wireshark.org/review/2337 - Reviewed-by: Roland Knall - -commit 701b6ad -Author: Balint Reczey -Date: Wed Jun 18 12:07:20 2014 -0700 - - Generate xz compressed archives instead of .bz2-s - - Change-Id: Iad47516ae617f5ecac5b03f2d7e800208c499d4a - Reviewed-on: https://code.wireshark.org/review/2403 - Reviewed-by: Gerald Combs - (cherry picked from commit 5a6366c9b56990eb7f4af17bf628ad80fc354ece) - Reviewed-on: https://code.wireshark.org/review/2426 - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - -commit 32f4bee -Author: Balint Reczey -Date: Wed Jun 18 11:43:08 2014 -0700 - - Add simple script to export release tarball right from Git - - The files not to be present in the release tarballs are filetered based - on the contents of the .gitattributes files - - Change-Id: If12eb00cf174f5d5b6dfffd56685b078a4593bf8 - Reviewed-on: https://code.wireshark.org/review/2402 - Reviewed-by: Evan Huus - Reviewed-by: Gerald Combs - (cherry picked from commit 85499fbbc682c36482e2053e66a642f5d581d356) - Reviewed-on: https://code.wireshark.org/review/2425 - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - -commit d4f9805 -Author: Pascal Quantin -Date: Thu Jun 19 02:42:47 2014 +0200 - - Add the ability to dynamically add a new protocol to export PDU dialog box - - Change-Id: I83012cc963d514982e40010e837e11a6fcf1bc3e - Reviewed-on: https://code.wireshark.org/review/2423 - Reviewed-by: Anders Broman - (cherry picked from commit bcff3c57cc42acdda9eb9bc6f556dcbcb069e51f) - Reviewed-on: https://code.wireshark.org/review/2424 - Reviewed-by: Pascal Quantin - -commit 3d23e94 -Author: Joerg Mayer -Date: Wed Jun 18 22:57:15 2014 +0200 - - Rename the filtername to initial_rtt - - Change-Id: I64af535dc07eb4310b212077bb4c52032e97ecdb - Reviewed-on: https://code.wireshark.org/review/2413 - Reviewed-by: Jörg Mayer - (cherry picked from commit 13597c936393545abad95ab15aa8d8944a6c7f04) - Reviewed-on: https://code.wireshark.org/review/2421 - -commit 7d72f26 -Author: Joerg Mayer -Date: Wed Jun 18 21:57:47 2014 +0200 - - Rename the Shortname of initial RTT to something short (iRTT) - - Change-Id: I182f2cccae5a385572950f08fa0a6005dcf59ff1 - Reviewed-on: https://code.wireshark.org/review/2409 - Reviewed-by: Jörg Mayer - (cherry picked from commit 461c6a0984236100177aa689e89e5e18fe7f360a) - Reviewed-on: https://code.wireshark.org/review/2419 - -commit c52c909 -Author: Joerg Mayer -Date: Wed Jun 18 19:46:27 2014 +0200 - - Get rid of some ancient qualityreview comments... - - Change-Id: If25bdd594b20b656c345dcfe62765379f5dd9c5e - Reviewed-on: https://code.wireshark.org/review/2392 - Reviewed-by: Jörg Mayer - (cherry picked from commit c6324a0b1ea6478a5f2c24b41cb26d0b02014536) - Reviewed-on: https://code.wireshark.org/review/2418 - -commit 8a104e0 -Author: Evan Huus -Date: Tue Jun 17 23:12:58 2014 -0700 - - Try to calculate the initial RTT of tcp conns - - This (if it works well) will let us do much more accurate out-of-order - detection, which is currently otherwise hardcoded to 3ms. Ask Jörg for details. - - Change-Id: Ie0662723946edeaea1e43958bf7f5158f09dde71 - Reviewed-on: https://code.wireshark.org/review/2367 - Reviewed-by: Evan Huus - (cherry picked from commit b5a462b087bdd7670e1a69786ebbe3f073084ac3) - Reviewed-on: https://code.wireshark.org/review/2417 - Reviewed-by: Jörg Mayer - -commit 4a4b267 -Author: Guy Harris -Date: Wed Jun 18 13:54:33 2014 -0700 - - Get the handle for the pw_hdlc_nocw_hdlc_ppp dissector. - - Change-Id: If7bc620c19e9c6511a724847e38cf0776d26b444 - Reviewed-on: https://code.wireshark.org/review/2410 - Reviewed-by: Guy Harris - (cherry picked from commit 6da6bf77b3da928aa6fc9ae9d6b67ecfd77d25e1) - Reviewed-on: https://code.wireshark.org/review/2411 - -commit d6f4b75 -Author: Shoichi Sakane -Date: Wed Jun 18 10:40:19 2014 -0700 - - Fix copy-paste probem in COAP dissector - - Bug:8070 - Change-Id: I7a86a37f7de6b3e4e12fe1c47980a9a6604488d6 - Reviewed-on: https://code.wireshark.org/review/2390 - Reviewed-by: Pascal Quantin - Reviewed-on: https://code.wireshark.org/review/2397 - -commit e042581 -Author: Michal Labedzki -Date: Wed May 28 17:47:41 2014 +0200 - - Guarantee that open routines are initialized - - Open routines need to be initialized before try to open - capture or add/remove routine. - - This fixes crash in mergecap reported as Debian bug #751872. - - Change-Id: Ic3b88eef947ebd4a3dd2edf8120bb6bd8aec0765 - Reviewed-on: https://code.wireshark.org/review/1874 - Reviewed-by: Evan Huus - (cherry picked from commit c6d175ef67a091bdf024c11469a22b59f64f2345) - Reviewed-on: https://code.wireshark.org/review/2391 - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - -commit 2f8a254 -Author: Pascal Quantin -Date: Wed Jun 18 08:14:27 2014 +0200 - - PDCP LTE: do not try to decipher PDCP control messages (like ROHC feedback) - - Change-Id: I4a1596fd45bbc78ed8e90accf69ac048e7053161 - Reviewed-on: https://code.wireshark.org/review/2366 - Reviewed-by: Pascal Quantin - (cherry picked from commit 666127f5f9768d33095152047234ae2ebfcea9f5) - Reviewed-on: https://code.wireshark.org/review/2368 - -commit 268c965 -Author: Guy Harris -Date: Tue Jun 17 15:05:43 2014 -0700 - - When building an OS X package for GTK+, put the libraries in lib. - - This reverts to the way we did it prior to the switch to Qt; with GTK+, - Contents/MacOS/Wireshark is just a launcher, and the Wireshark binary is - in Contents/Resources/bin/wireshark-bin, and the appropriate rpath entry - would be @executable_path/../lib - @executable_path/../Frameworks, which - works for the Qt version, in which Contents/MacOS/Wireshark is the - actual executable, doesn't work for the GTK+ version. - - This should fix bug 10185. - - Change-Id: I4e50a4ead8f29a742c97a9001c821aabe1fa5e65 - Reviewed-on: https://code.wireshark.org/review/2347 - Reviewed-by: Guy Harris - (cherry picked from commit 93b5a313ada6684c7706da7a578f7787344d6144) - Reviewed-on: https://code.wireshark.org/review/2348 - -commit 2c877e0 -Author: Evan Huus -Date: Tue Jun 17 21:43:49 2014 +0000 - - Set the rlc len field before we try to use it in an expert info. - - Bug:9795 - Change-Id: I740a9fe36278995cf6e590206f600c037789f0eb - Reviewed-on: https://code.wireshark.org/review/2344 - Reviewed-by: Evan Huus - (cherry picked from commit ba6eb5c72ffe82ca0e51c7083240975a5b118ad2) - Reviewed-on: https://code.wireshark.org/review/2345 - -commit c9f2311 -Author: Evan Huus -Date: Tue Jun 17 21:25:14 2014 +0000 - - Initialize smb ioctl_function struct member - - Bug:10020 - Change-Id: I415a29dd36697887cb06485d6ed3a2b799a93464 - Reviewed-on: https://code.wireshark.org/review/2342 - Reviewed-by: Evan Huus - (cherry picked from commit f4b9ea4362cd1ffdf5315a3f1311c8418a91579d) - Reviewed-on: https://code.wireshark.org/review/2343 - -commit 35e920c -Author: Evan Huus -Date: Tue Jun 17 18:26:01 2014 +0000 - - Initialize rq_hdr.session - - Bug:10168 - Change-Id: Ida4d82d102421152785ce680aa47bcb5cf8692f6 - Reviewed-on: https://code.wireshark.org/review/2334 - Reviewed-by: Dmitry Bazhenov - Reviewed-by: Evan Huus - (cherry picked from commit 417938310ad78de5f41f1f4108e62b50ed5b4dfa) - Reviewed-on: https://code.wireshark.org/review/2341 - -commit d2b6365 -Author: Hannes Mezger -Date: Thu Jun 12 17:36:32 2014 +0200 - - Create and register subtree identifiers for all opcua array types - - Currently for all arrays, the generic ett_opcua_array is used, instead we want to be more selective for storing the expanded state of subtrees. This commit adds subtree identifiers for all array types. - - Change-Id: Idcec51a200d1109cdb557d3366021d3b066b453d - Reviewed-on: https://code.wireshark.org/review/2176 - Reviewed-by: Anders Broman - (cherry picked from commit 7067e3a34006cc15b5d050e9dd564ced0cb1bd9b) - Reviewed-on: https://code.wireshark.org/review/2314 - -commit 8e5241a -Author: Hannes Mezger -Date: Thu Jun 12 16:54:25 2014 +0200 - - Unify how opcua arrays are displayed - - - Display 'Array of ' instead of 'Array of Simple Type' - - Display array indexes for simple types - - Display data type in simple type arrays - - Change-Id: Id2cc746898f97ce329c6afb9cc49f1907a9f18e4 - Reviewed-on: https://code.wireshark.org/review/2161 - Reviewed-by: Anders Broman - (cherry picked from commit 647255d6279fe6fea6ad43388a52e55afd5549e0) - Reviewed-on: https://code.wireshark.org/review/2313 - -commit f8fcb34 -Author: Hannes Mezger -Date: Thu Jun 12 16:49:40 2014 +0200 - - Add dissect_nt_64bit_time_ex for retrieving the created proto_item - - Using dissect_nt_64bit_time it is not possible to access the created proto_item afterwards, hence the new function. - - Change-Id: I39aca92536a53841045c30b601b6ec1a7d8bfb4e - Reviewed-on: https://code.wireshark.org/review/2160 - Reviewed-by: Anders Broman - (cherry picked from commit 9991f43f273878021b41a9ba7fddb375bdfbab21) - Reviewed-on: https://code.wireshark.org/review/2311 - -commit be6ef28 -Author: Hannes Mezger -Date: Tue Jun 17 13:40:29 2014 +0200 - - Add myself as author for the opcua dissector plugin - - Change-Id: If8349e778fd91426a6a4b6d6e98d3ab870d188d5 - Reviewed-on: https://code.wireshark.org/review/2302 - Reviewed-by: Anders Broman - (cherry picked from commit 91c29ec2057c7e25a61da92f6bdbc32efa856525) - Reviewed-on: https://code.wireshark.org/review/2312 - -commit c0b5d6f -Author: Lukas Emersberger -Date: Thu Mar 20 06:56:49 2014 +0100 - - EPL: Duplicated frames - - The MN interprets the CMD layer data only if the CN increments - the Send-Sequence-Counter => new data. The MN interprets the - data only once, if the same frame is sent again the MN ignores - the data. - - The behaviour is described in the powerlink specification 301 v1.2.0 - chapter 6.3.2.3.2.3 Error: Duplication of Frame - Frames which duplicate previous sent data are now marked as - duplicated frames. - - Signed-off-by: Lukas Emersberger - Change-Id: I9ef24b52712bfd3c735856b0cd5747c47aeef72a - Reviewed-on: https://code.wireshark.org/review/992 - Reviewed-by: Evan Huus - (cherry picked from commit 75531b6a40719c9cac603f699f0cdf72159fd518) - Change-Id: I9ef24b52712bfd3c735856b0cd5747c47aeef72a - Reviewed-on: https://code.wireshark.org/review/2317 - Reviewed-by: Roland Knall - Reviewed-by: Michael Mann - -commit 1230627 -Author: Martin Kaiser -Date: Tue Jun 3 17:16:18 2014 +0200 - - simplify PCR calculation - - Change-Id: I892088e158519e331cba89be3c8d7c71f38a8925 - Reviewed-on: https://code.wireshark.org/review/1964 - Reviewed-by: Anders Broman - (cherry picked from commit 653dd75483a68ca8793ccdb482668cad7dcf950e) - Reviewed-on: https://code.wireshark.org/review/2333 - Reviewed-by: Martin Kaiser - -commit e8dd396 -Author: Martin Kaiser -Date: Mon Jun 2 23:20:05 2014 +0200 - - make the PCR value filterable - - this fixes bug #10158 - - Change-Id: Ic67b074c464c52ac523e835b9815a5c3a3fa14d9 - Reviewed-on: https://code.wireshark.org/review/1925 - Reviewed-by: Anders Broman - (cherry picked from commit cd4ba3d271fc62eca89114703b0955f9f34978d5) - Reviewed-on: https://code.wireshark.org/review/2332 - Reviewed-by: Martin Kaiser - -commit 9107e5c -Author: Martin Kaiser -Date: Sat May 31 15:30:14 2014 +0200 - - do a plausibility check for interaction channel data - in the linkage descriptor - - Change-Id: I7ebca539076b2b881e82fd6baec5bb223e778a52 - Reviewed-on: https://code.wireshark.org/review/1896 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 3ec1ec1caf3029f47dc362077af421662c86ae85) - Reviewed-on: https://code.wireshark.org/review/2331 - -commit d8f30a8 -Author: Martin Kaiser -Date: Sat May 31 11:00:30 2014 +0200 - - make population id filterable - - Change-Id: I3381e1c35795ac33331cdddb8cefa8b0a16907cc - Reviewed-on: https://code.wireshark.org/review/1894 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 877f38b46d0380d9804bbac805e6f02ffc95423a) - Reviewed-on: https://code.wireshark.org/review/2330 - -commit 70261f4 -Author: Martin Kaiser -Date: Fri May 30 19:20:11 2014 +0200 - - make terrestrial centre frequency filterable - - Change-Id: I007ff5215f52f80f25622cab6980128eabd39c5f - Reviewed-on: https://code.wireshark.org/review/1888 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 419ea28960b54ceade6216b4b9b302b6d4de1e70) - Reviewed-on: https://code.wireshark.org/review/2329 - -commit d0156c4 -Author: Evan Huus -Date: Tue Jun 17 18:13:51 2014 +0000 - - fix underflow in BER constrained bitstrings - - this can happen and cause invalid memory accesses with incorrectly-large padding - values - - Bug:10187 - Change-Id: Ib9b2a2fa10766efb4d95d588f57354a56373c626 - Reviewed-on: https://code.wireshark.org/review/2327 - Reviewed-by: Evan Huus - -commit fd2566c -Author: Martin Kaiser -Date: Fri May 30 18:28:36 2014 +0200 - - make next time offset filterable - - Change-Id: I18c2b7992b237eaaacbec04d504fc293b03558a3 - Reviewed-on: https://code.wireshark.org/review/1887 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit bc3ab61ddacab2ec6072c2709af3df405e18dfc3) - Reviewed-on: https://code.wireshark.org/review/2326 - -commit 67e6170 -Author: Martin Kaiser -Date: Fri May 30 18:17:17 2014 +0200 - - make local time offset filterable - - Change-Id: Icccc07706287df4b6a7481108f9921b939aae2d5 - Reviewed-on: https://code.wireshark.org/review/1886 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 9f0419d376d25d738539bac2b55197abe226a6ce) - Reviewed-on: https://code.wireshark.org/review/2324 - -commit a3ff1c1 -Author: Martin Kaiser -Date: Fri May 30 09:59:05 2014 +0200 - - avoid proto_tree_add_uint_format() when we just want the default - description - - Change-Id: Ice06e257a72f3b4ce1229ff90129628f0e3bbcfb - Reviewed-on: https://code.wireshark.org/review/1873 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 8515bd7633412342f579ad2d51573052c37a0b57) - Reviewed-on: https://code.wireshark.org/review/2323 - -commit 0937cce -Author: Martin Kaiser -Date: Thu May 29 17:56:17 2014 +0200 - - convert cable freq, symbol rate into doubles - - Change-Id: Iaddd3c4847e803af855c847212ae822b2529ff06 - Reviewed-on: https://code.wireshark.org/review/1860 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 7aecd47be71f300e654c277104855a341b3f48c3) - Reviewed-on: https://code.wireshark.org/review/2322 - -commit 8ce3af7 -Author: Martin Kaiser -Date: Thu May 29 17:51:37 2014 +0200 - - conver sat freq and symbol rate into doubles in order to make the - filtering work, fix typos - - Change-Id: I7ed989807826d1322dab00d13d998488caaf73ff - Reviewed-on: https://code.wireshark.org/review/1859 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 91dac2771b9374c61d0d2b45ef08202cb404e59a) - Reviewed-on: https://code.wireshark.org/review/2321 - -commit 33caf46 -Author: Martin Kaiser -Date: Fri Mar 14 10:14:14 2014 +0100 - - dissect more components of the track header box - - Change-Id: If8d35122ce096f52837bdff1c6599b47456697d5 - Reviewed-on: https://code.wireshark.org/review/1858 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 254e227266a37eddd887ba5721a72b9dcf8a900b) - Reviewed-on: https://code.wireshark.org/review/2320 - -commit 04792d5 -Author: Martin Kaiser -Date: Tue May 27 23:37:31 2014 +0200 - - use proto_tree_add_float_format_value() correctly - - Change-Id: I927a2f32aa0016b5b0c476fa4c16fc1dbe0aebb0 - Reviewed-on: https://code.wireshark.org/review/1825 - Reviewed-by: Martin Kaiser - (cherry picked from commit b4fb165ef30d246d1fda03eab597e1f4060ec563) - Reviewed-on: https://code.wireshark.org/review/2319 - -commit d34c0d0 -Author: Martin Kaiser -Date: Tue May 27 23:36:32 2014 +0200 - - make cable symbol rate filterable - - Change-Id: I034b351d4bc12f6c00a0224a5c5b9f85496657b6 - Reviewed-on: https://code.wireshark.org/review/1824 - Reviewed-by: Martin Kaiser - (cherry picked from commit b3008f31ec72f4476df261e37784214565057e2f) - Reviewed-on: https://code.wireshark.org/review/2318 - -commit 3c1f13c -Author: Martin Kaiser -Date: Fri May 23 18:40:15 2014 +0200 - - make cable frequency filterable - - Change-Id: I8464fb8e98e485523127dd95948a717554b6aee4 - Reviewed-on: https://code.wireshark.org/review/1823 - Reviewed-by: Martin Kaiser - (cherry picked from commit 9c98f9fdbd07815c7c22d1ebac347d59c6f5f57c) - Reviewed-on: https://code.wireshark.org/review/2316 - -commit e9c3905 -Author: Martin Kaiser -Date: Fri May 23 18:23:59 2014 +0200 - - make the satellite symbol rate filterable - - Change-Id: I301d0804e097c62cd8bf7b27003918eedab9616a - Reviewed-on: https://code.wireshark.org/review/1816 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 0911ce12ff3304eb7a745a409fc3a1eb6797e0d5) - Reviewed-on: https://code.wireshark.org/review/2315 - -commit b8cb7d3 -Author: Alex Badea -Date: Tue Jun 17 13:12:34 2014 +0300 - - isakmp: add support for IKEv1 AES decryption - - Select an appropriate gcrypt cipher based on ISAKMP encryption ID and - key length attribute. Fixes bug 10128. - - Bug:10128 - Change-Id: Ie74fc51eb9bfe6d68340056d3ef2ef28c7677fb8 - Signed-off-by: Alex Badea - Reviewed-on: https://code.wireshark.org/review/2296 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - (cherry picked from commit d1cdbd715a5c5e9395d9672394783061dd3a4bf2) - Reviewed-on: https://code.wireshark.org/review/2309 - -commit 225aeef -Author: Martin Kaiser -Date: Fri May 23 18:16:40 2014 +0200 - - make satellite orbital position filterable - - Change-Id: Ibd4edd30eca969699fea1971e1885299e4d3e552 - Reviewed-on: https://code.wireshark.org/review/1813 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - (cherry picked from commit 75272241a10c23543fce1e14d7a59b1e0161ee6d) - Reviewed-on: https://code.wireshark.org/review/2310 - -commit 1d87b4d -Author: Alex Badea -Date: Mon Jun 16 18:55:45 2014 +0300 - - isakmp: support decryption for SHA-2 hash algorithms - - Simply map ISAKMP hash IDs for sha256, sha384 and sha512 to gcrypt MDs. - Fixes bug 10181. - - Change-Id: I9c8265bf3c5c8f8d2fd6d251cc0f267964e3be8e - Signed-off-by: Alex Badea - Reviewed-on: https://code.wireshark.org/review/2250 - Reviewed-by: Alexis La Goutte - (cherry picked from commit faac494d989951d0995da00ea31e5b66511ae0d0) - Reviewed-on: https://code.wireshark.org/review/2308 - -commit c6736f0 -Author: Alex Badea -Date: Tue Jun 17 13:55:06 2014 +0300 - - isakmp: allow IKEv1 decryption with non-PSK authentication - - There is a check that disables decryption for non-PSK authentication. It - has been around ever since its introduction in commit acfe071e (svn - r17229). As suggested in bug 7951, remove this check to allow decryption - for e.g. certificates authentication. - - Bug: 7951 - Change-Id: I5e98407d0f8dbabac2cdaf632cf0af403192872b - Signed-off-by: Alex Badea - Reviewed-on: https://code.wireshark.org/review/2297 - Reviewed-by: Anders Broman - (cherry picked from commit f9b05dc13213832dba10600bd0116505ed251fec) - Reviewed-on: https://code.wireshark.org/review/2305 - Reviewed-by: Alexis La Goutte - -commit c41b64b -Author: Hannes Mezger -Date: Thu Jun 12 12:22:35 2014 +0200 - - Cleanup subtree types in opcua plugin - - - make ett_opcua_transport static, is only used locally - - format code grouping extern ett variables - - add subtree variables for encodingmasks of simple types - - Change-Id: Ia044ca6ca0ff19e940a03d21610db67fe3679b01 - Reviewed-on: https://code.wireshark.org/review/2157 - Reviewed-by: Anders Broman - (cherry picked from commit 2f369b216fc18624a2e8b2c6bc1da80f964e54d7) - Reviewed-on: https://code.wireshark.org/review/2295 - -commit 7eb1aec -Author: Hannes Mezger -Date: Thu Jun 12 10:11:06 2014 +0200 - - Display status code info bits if set - - Checks if a StatusCode has any of the additional info bits set and displays them accordingly. - - Change-Id: Ic584233083174d3fd30c6ec6684f308e0e5ae22e - Reviewed-on: https://code.wireshark.org/review/2127 - Reviewed-by: Evan Huus - (cherry picked from commit 0bb0b62ec8580ab48c1e8c3eaa82b9fa255d7a4e) - Reviewed-on: https://code.wireshark.org/review/2294 - Reviewed-by: Anders Broman - -commit f399a63 -Author: Hannes Mezger -Date: Tue Jun 10 13:36:06 2014 +0200 - - Display text representation of status codes - - Adds a table containing all known StatusCodes and displays them if found. - The list of StatusCodes is in a separate file for easy generating of the list if necessary. - - Change-Id: Iab74b22b7fc4fb53d8f072c4e3a4cea4ae18196c - Reviewed-on: https://code.wireshark.org/review/2126 - Reviewed-by: Evan Huus - (cherry picked from commit a9b18eff0fe904c87c38262148b39718f6e3cea5) - Reviewed-on: https://code.wireshark.org/review/2293 - Reviewed-by: Anders Broman - -commit da96994 -Author: AndersBroman -Date: Wed Jun 11 16:25:06 2014 +0200 - - opcua_simpletypes.c:94:12: error: static declaration of 'hf_opcua_NamespaceUri' follows non-static declaration - - Change-Id: I2cae9691408c22a64144f5482cc536a5dc88ec6c - Reviewed-on: https://code.wireshark.org/review/2135 - Reviewed-by: Anders Broman - (cherry picked from commit 803d47d49ecfb37cc649911443edf6f1290fec90) - Reviewed-on: https://code.wireshark.org/review/2175 - -commit eaeb03b -Author: Hannes Mezger -Date: Tue Jun 10 18:05:46 2014 +0200 - - Remove unused array length fields - - The NoOf... fields are not used at all in the dissector. - - Change-Id: I1f20a9992eab5d47c7e0ad34dabeaed07efa4a80 - Reviewed-on: https://code.wireshark.org/review/2130 - Reviewed-by: Anders Broman - (cherry picked from commit 5e67c45160c6c69e6a22034607bbef9a89a14c8b) - Reviewed-on: https://code.wireshark.org/review/2174 - -commit 35c980f -Author: Hannes Mezger -Date: Tue Jun 10 18:01:27 2014 +0200 - - Regenerate all sources using latest OPC UA specification - - - HistoryUpdateEventResult has been removed - - Fixes two enums - - Removes unused identifier defines - - Change-Id: I39c65c1eca1701b60dfaa3541cd7a5d1b479fb9b - Reviewed-on: https://code.wireshark.org/review/2129 - Reviewed-by: Anders Broman - (cherry picked from commit abf1b5ead7f58ff6cd204c3727bed30eebe75e4e) - Reviewed-on: https://code.wireshark.org/review/2173 - -commit 547f731 -Author: Hannes Mezger -Date: Tue Jun 10 13:09:24 2014 +0200 - - Improve display of Open/CloseSecureChannel requests and responses - - - Return the ServiceId of the service calls for displaying if it's a request or response - - Add the missing parsing code for CloseSecureChannel, some fields were missing - - Change-Id: Id9b1e1986e222a77ad979fb615adc6ac62a4ced8 - Reviewed-on: https://code.wireshark.org/review/2125 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 2ab3b2ac2b6300fd10df046e2d75acf6328ac332) - Reviewed-on: https://code.wireshark.org/review/2172 - Reviewed-by: Anders Broman - -commit 95cc25a -Author: Hannes Mezger -Date: Tue Jun 10 12:27:34 2014 +0200 - - Move ServiceFault from ComplexType- to ServiceParser - - ServiceFaults are always sent as a service response and never as value, this moves the parsing code to the correct location. - - Change-Id: Ida9cb561aa40fcbfc3c0429aed732d108b295138 - Reviewed-on: https://code.wireshark.org/review/2124 - Reviewed-by: Alexis La Goutte - (cherry picked from commit baa58887886c6bbe24f2894e40a4c0e1bccd5314) - Reviewed-on: https://code.wireshark.org/review/2171 - Reviewed-by: Anders Broman - -commit 3e1eaed -Author: Hannes Mezger -Date: Tue Jun 10 11:47:07 2014 +0200 - - Unify displaying of NodeId - - Adds hf_register_info for all possible NodeId identifier types for unified displaying. - - Change-Id: Ic7a8077a32f435d5acfb1a956117d21a0b51b43b - Reviewed-on: https://code.wireshark.org/review/2123 - Reviewed-by: Alexis La Goutte - (cherry picked from commit fabee432def958af4a102eca6bfe935ec80836f6) - Reviewed-on: https://code.wireshark.org/review/2170 - Reviewed-by: Anders Broman - -commit ee3f0a9 -Author: Hannes Mezger -Date: Tue Jun 10 11:46:05 2014 +0200 - - Fix NodeId and ExpandedNodeId encoding mask display - - There are no 'URI' NodeIds, removed this option and changed GUID/Opaque to their correct values as stated in the UA specification. - - Change-Id: Ibf9afdbd72f8ad336f5eb83ece5adbcce51e8365 - Reviewed-on: https://code.wireshark.org/review/2122 - Reviewed-by: Alexis La Goutte - (cherry picked from commit e2ae387d9c9d2d38d1da788f39b8e65a22fff8dd) - Reviewed-on: https://code.wireshark.org/review/2169 - Reviewed-by: Anders Broman - -commit a95d0f1 -Author: Hannes Mezger -Date: Tue Jun 10 11:25:30 2014 +0200 - - Unify variable and identifier names according to the UA specification - - - Rename Uri to NamespaceUri for clarity - - Correct NsId to NsIndex - - ByteString NodeIds are called 'Opaque' - - Change-Id: I622d408ef9e19a2a899906b4127bae497735d402 - Reviewed-on: https://code.wireshark.org/review/2121 - Reviewed-by: Alexis La Goutte - (cherry picked from commit ddc275c562805757d5d971ccc31ef47dbc6df4bc) - Reviewed-on: https://code.wireshark.org/review/2168 - Reviewed-by: Anders Broman - -commit fb0266f -Author: Stig Bjørlykke -Date: Mon Jun 16 22:15:55 2014 +0200 - - Do not handle P_Mul packet as ASCII string when calculating checksum. - - This bug was introduced when rewriting tvb_get_string() to - handle encoding (and thus handling ASCII string different). - - Change-Id: Ic107d7b9e2f63aea33fdf55b9c20c22202f7b458 - Reviewed-on: https://code.wireshark.org/review/2270 - Reviewed-by: Stig Bjørlykke - -commit b27bf15 -Author: Yan Burman -Date: Mon Jun 16 11:54:24 2014 +0300 - - Fix SDP dissector crash during fuzz testing - - Change-Id: Ic133dd9440feb61964d197fa0aaacd86241f229d - Signed-off-by: Yan Burman - Reviewed-on: https://code.wireshark.org/review/2248 - Reviewed-by: Michael Mann - (cherry picked from commit 0a29589c01b5aa9ec32c6624e90b32f546090c12) - Change-Id: Ic133dd9440feb61964d197fa0aaacd86241f229d - Reviewed-on: https://code.wireshark.org/review/2249 - Reviewed-by: Michael Mann - -commit 0406c06 -Author: Balint Reczey -Date: Wed Jun 11 16:52:56 2014 +0200 - - Depend on docbook-xml and drop obsoleted 0005-...patch - - Change-Id: I4c849a1e8205b65ba05959213967bac5f378c96c - Reviewed-on: https://code.wireshark.org/review/2137 - Reviewed-by: Evan Huus - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - (cherry picked from commit 14903d65c340b89a8b5fbbe80f8d40fd8a290719) - Reviewed-on: https://code.wireshark.org/review/2235 - -commit f386b83 -Author: Gerald Combs -Date: Sun Jun 15 08:07:03 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-06-15] - - Change-Id: I6da50d3a45673190991c635a7774f5c396d49047 - Reviewed-on: https://code.wireshark.org/review/2228 - Reviewed-by: Gerald Combs - -commit 697c069 -Author: Gerald Combs -Date: Fri Jun 13 15:42:41 2014 -0700 - - Prep for 1.12.0-rc3. - - Change-Id: I62edfc9df0d1b14b717624f29845977f238e44e3 - Reviewed-on: https://code.wireshark.org/review/2203 - Reviewed-by: Gerald Combs - -commit fd017ee -Author: Gerald Combs -Date: Fri Jun 13 12:51:29 2014 -0700 - - Fix package version stamping. - - Change-Id: I1615364071563c4f56b071d7d68e4660dd989296 - Reviewed-on: https://code.wireshark.org/review/2198 - Reviewed-by: Gerald Combs - -commit 3b9e39f -Author: Gerald Combs -Date: Fri Jun 13 12:06:43 2014 -0700 - - Prep for 1.12.0-rc2. - - Change-Id: I6fc1db5adcee0ab762b2afcb761232544dab57e3 - Reviewed-on: https://code.wireshark.org/review/2197 - Reviewed-by: Gerald Combs - -commit 4911f85 -Author: Gerald Combs -Date: Fri Jun 13 11:34:49 2014 -0700 - - We're not on master any more. - - Change-Id: Ia38c4ee2677efbf39deecf977477d4a750b1821d - Reviewed-on: https://code.wireshark.org/review/2196 - Reviewed-by: Gerald Combs - -commit 2caf31b -Author: Pascal Quantin -Date: Thu Jun 12 23:22:31 2014 +0200 - - RTP: fix invalid memory access - - Bug: 10176 - Change-Id: If54e4a5a118ea10befeeed5278394665df99425e - Reviewed-on: https://code.wireshark.org/review/2187 - Reviewed-by: Pascal Quantin - (cherry picked from commit 51750bea8a61d1a7823bef5ebe5db5cd95b939d3) - Reviewed-on: https://code.wireshark.org/review/2188 - -commit 65c6ba6 -Author: Hannes Mezger -Date: Tue Jun 10 10:51:52 2014 +0200 - - Fix switch case on ExpandedNodeId encoding mask - - Only the bits 0-3 are significant for the type of the NodeId contained in the ExpandedNodeId. - The other bits are a mask telling if a NamespaceUri and/or a ServerIndex is set. - - Change-Id: I17948524f8a1bf6cb9dffc5f66ec5cddee580bcd - Reviewed-on: https://code.wireshark.org/review/2120 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 6ddf081f6448c016987330fa6ada210dbc79d0ab) - Reviewed-on: https://code.wireshark.org/review/2167 - Reviewed-by: Michael Mann - -commit e519b31 -Author: Peter Harris -Date: Wed Jun 11 17:59:58 2014 -0400 - - X11: Update generated dissector - - Change-Id: Id3fbc64b4d797d50e935223c40c5c2321a1c8198 - Signed-off-by: Peter Harris - Reviewed-on: https://code.wireshark.org/review/2148 - Reviewed-by: Anders Broman - (cherry picked from commit 1dead2b38c3eef6157d68533bc567703e8da37b7) - Reviewed-on: https://code.wireshark.org/review/2178 - Reviewed-by: Jeff Morriss - Tested-by: Jeff Morriss - -commit 5d2b4ce -Author: Peter Harris -Date: Wed Jun 11 17:55:15 2014 -0400 - - X11: Support XCB's new - - Change-Id: I0a45380ffcfb3be7e3190d0875626ed0fe046c4e - Signed-off-by: Peter Harris - Reviewed-on: https://code.wireshark.org/review/2147 - Reviewed-by: Jeff Morriss - (cherry picked from commit 515b78c292bb880434f28a11140bf29f4e02f6bb) - Reviewed-on: https://code.wireshark.org/review/2177 - -commit be65a31 -Author: Martin Mathieson -Date: Thu Jun 12 13:42:35 2014 +0100 - - Fix a regression, as -1 can no longer means until the end of the tvb - - Change-Id: I2bbb9c5f62984f0365a3cad6b60401ee70418e74 - Reviewed-on: https://code.wireshark.org/review/2158 - Reviewed-by: Martin Mathieson - (cherry picked from commit d17aa368333f1a4f05df63f1f5cd9904ad37a3bf) - Reviewed-on: https://code.wireshark.org/review/2159 - Reviewed-by: Pascal Quantin - -commit 85fb7dc -Author: Guy Harris -Date: Wed Jun 11 16:56:55 2014 -0700 - - Some more SVN->Git. - - Change-Id: Iba5274ab5e653a0a3c0a56e62ee168ac957daf27 - Reviewed-on: https://code.wireshark.org/review/2152 - Reviewed-by: Guy Harris - (cherry picked from commit 95065da33d2d22cad046219e291e54cb2fce33be) - Reviewed-on: https://code.wireshark.org/review/2153 - -commit b0c0b33 -Author: Guy Harris -Date: Wed Jun 11 16:49:05 2014 -0700 - - A Subversion->Git change that we missed. - - Change-Id: I651d25cb0a59f9ec350d4c482062077833c8f278 - Reviewed-on: https://code.wireshark.org/review/2149 - Reviewed-by: Guy Harris - (cherry picked from commit 7db2135069b03b9dcbfa12a244969246b938443d) - Reviewed-on: https://code.wireshark.org/review/2150 - -commit db50467 -Author: Vladimir Kondratiev -Date: Wed Jun 11 19:02:12 2014 +0300 - - Fix bit fields definition in the "DMG Capability" IE - - Bits in the byte was counted wrong direction; - bit0 should be LSB (0x01) and bit7 - MSB (0x80) - Also, all fields are interpreted as little-endian - - Change-Id: I3485e8743a156e2e8cb84e726045211f1d332598 - Signed-off-by: Vladimir Kondratiev - Reviewed-on: https://code.wireshark.org/review/2141 - Reviewed-by: Alexis La Goutte - -commit ed14bc8 -Author: Anish Bhatt -Date: Wed Jun 11 02:39:08 2014 -0700 - - Rename temp variables to a more human readable form - - Change-Id: Idafe97df6be71d885203e2e3426fdb6a133862c4 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/2140 - Reviewed-by: Evan Huus - Reviewed-on: https://code.wireshark.org/review/2144 - Reviewed-by: Alexis La Goutte - -commit 268eadc -Author: Anish Bhatt -Date: Wed Jun 11 02:19:33 2014 -0700 - - Use offset instead of tempOffset, return offset instead of calculating (len + n) where possible - - Change-Id: I91ef4ec59698903cb2a7be00e7e0ece478fc26a8 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/2139 - Reviewed-by: Evan Huus - (cherry picked from commit 508d16b037ef09c9bf700172c38c1d514d26f660) - Reviewed-on: https://code.wireshark.org/review/2143 - Reviewed-by: Alexis La Goutte - -commit dfdaebc -Author: Anish Bhatt -Date: Tue Jun 10 23:49:48 2014 -0700 - - Use expert info for Invalid length/type where possible, other minor fixes - - Change-Id: I4a0421bf918439261f31f4bfc2cb5519b38f1711 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/2118 - Reviewed-by: Alexis La Goutte - Reviewed-by: Michael Mann - (cherry picked from commit d8a21c8f8efcbbd917a3fe623cfb9721b27048da) - Reviewed-on: https://code.wireshark.org/review/2142 - -commit 54a85ab -Author: U-beauty\bdn -Date: Wed Jun 11 11:02:40 2014 +0600 - - IPMI trace dissector - - Added KCS and TMode protocol dissectors. - Request/response logic has been revised. - Saved request data logic has been revised. - Added Get Message command response dissector. - Added missing PICMG command dissectors. - Added new PICMG command dissectors. - Added new PPS OEM command entries. - Added VITA 46.11 command dissectors. - - From: Bill Meier: - - refs to value_strings/range_strings in hf[] entries, by convention, should use VALS/RVALS macros; - - refs to true_false_strings should use TFS(&...) macro. - also: true_false_string definitions should not be defined as arrays. - - remove some unneeded #includes (packet-ipmi.c). - - Do some re-indentation. - - Add editor-modelines as needed. - - bug: 10004 - Change-Id: Ib269b35784c0b70892d1e0111bcfb483ea64092c - Reviewed-on: https://code.wireshark.org/review/1185 - Reviewed-by: Anders Broman - (cherry picked from commit 977a811217d2ce9853aeeac4e4e97167d35a94fb) - Reviewed-on: https://code.wireshark.org/review/2117 - Reviewed-by: Michael Mann - -commit 6b57f77 -Author: AndersBroman -Date: Wed Jun 11 14:16:51 2014 +0200 - - Fix - Warn Dissector bug, protocol LPP, in packet 1: proto.c:3403: - failed assertion "DISSECTOR_ASSERT_NOT_REACHED" - redifine FT of NavModel-GLONASS-ECEF/gloP1 - - Change-Id: Id865c39b8d15528417075f9e7ed0378704aa98dc - Reviewed-on: https://code.wireshark.org/review/2132 - Reviewed-by: Anders Broman - (cherry picked from commit af687c581f71d3d0d779ee0fea0dd62a9192d79d) - Reviewed-on: https://code.wireshark.org/review/2133 - Reviewed-by: Pascal Quantin - -commit bc2612c -Author: Anish Bhatt -Date: Tue Jun 10 18:27:53 2014 -0400 - - Fix bug in dissect_lldp_port_id, support all port id subtypes - - Change-Id: I8b44e0d55701ba5d583e3e734e19d4d2aa024b25 - Reviewed-on: https://code.wireshark.org/review/2049 - Reviewed-by: Michael Mann - (cherry picked from commit 3fcd016029672b5683406ceeb75faa0533ce63c1) - Reviewed-on: https://code.wireshark.org/review/2119 - Reviewed-by: Alexis La Goutte - -commit 1fd1d3b -Author: Richard Sharpe -Date: Sat May 31 16:27:34 2014 -0700 - - This fix now allows SASL/GSS-API with integrity only to be properly dissected - in that we now properly indicate the checksum and provide the wrapped token to - the LDAP dissector to dissect. - - There is still a problem in that the wrong parts of the SASL packet can be - indicated when users click on some parts. - - I am committing it for review and because it is much better than the current - code. - - Bug:9398 - Change-Id: I552fc249db26835b79abfc8793438a95f221663a - Signed-off-by: Richard Sharpe - Reviewed-on: https://code.wireshark.org/review/1905 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - (cherry picked from commit 09b5361302725cc83b7c8d76282441d031050c38) - Reviewed-on: https://code.wireshark.org/review/2076 - Reviewed-by: Michael Mann - -commit 474de10 -Author: Alexis La Goutte -Date: Tue Jun 10 08:58:39 2014 +0200 - - CAPWAP: Fix soft-deprecated APIs warning - - tvb_length_remaining => tvb_reported_length_remaining - - Change-Id: Ie1fa09e00e098c41df2e87771300e3842659dad6 - Reviewed-on: https://code.wireshark.org/review/2095 - Reviewed-by: Anders Broman - (cherry picked from commit 5cff2b6d03568e4279b1664769053b13c0cc9ec9) - Reviewed-on: https://code.wireshark.org/review/2106 - Reviewed-by: Alexis La Goutte - -commit d34b85c -Author: Pascal Quantin -Date: Tue Jun 10 12:34:18 2014 +0200 - - 3GPP NAS: add dissection of MSISDN in PCO - - Change-Id: Ie8dac8c898ff94e955a4c0fdde7f4ffff496e97f - Reviewed-on: https://code.wireshark.org/review/2098 - Reviewed-by: Pascal Quantin - (cherry picked from commit e7fbf05b484f4537783293271f2f08e28facf21c) - Reviewed-on: https://code.wireshark.org/review/2108 - -commit e3cd818 -Author: Anish Bhatt -Date: Sun Jun 8 19:35:44 2014 -0700 - - remove all checks for if (tree) - - Change-Id: I82617c0a396fdf42735ba39a5ed266a3f5240854 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/2048 - Tested-by: Alexis La Goutte - Reviewed-by: Alexis La Goutte - (cherry picked from commit f33ead547920609d732cd70415d65508ec377ba0) - Reviewed-on: https://code.wireshark.org/review/2107 - -commit 4ac46b6 -Author: Alexis La Goutte -Date: Tue Jun 10 08:48:27 2014 +0200 - - CAPWAP: Display incorrect value for Wireless IEEE802.11 RSSI and Data Rate - - * Wireless data ieee80211 RSSI (dBm) is a signed integer. In the wireless radio the dBm value is negative. - * Wireless data ieee80211 Data Rate (Mbps) is a 100Kbps. You need divide this value by 10. - - Issue found by Massimo Vellucci (SmartCAPWAP) - - Change-Id: I04dd8a9e38a5f60ee5bf64cd304db1b11413c809 - Reviewed-on: https://code.wireshark.org/review/2094 - Reviewed-by: Anders Broman - (cherry picked from commit 2f13ccc64c6e38336674d1fd6d13e9ece9efec84) - Reviewed-on: https://code.wireshark.org/review/2104 - Reviewed-by: Alexis La Goutte - -commit 2724a61 -Author: Anish Bhatt -Date: Mon Jun 9 17:10:44 2014 -0700 - - Current test for GIT_DIR introduced in changeset Ie1560c372e23e58fb0e310f681388b5e1a65ba5b doesn't seem to be working correctly on bash 4.3.18 : .git/hooks/pre-commit: line 11: .git: command not found - - This test works correctly in bash/dash/zsh - - Change-Id: Ic89fc2764d1a70e9e5d112c7928cee6ed783f50f - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/2092 - Reviewed-by: Evan Huus - (cherry picked from commit 8878d7778e6fb10bf9e6ce20af16f4e247e51e04) - Reviewed-on: https://code.wireshark.org/review/2103 - Reviewed-by: Alexis La Goutte - -commit 6a662cf -Author: Anish Bhatt -Date: Mon Jun 9 14:42:30 2014 -0700 - - Add modelines - - Change-Id: Ib8e157e2744198eaa1a5a69732bd8e977b146026 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/2089 - Reviewed-by: Evan Huus - (cherry picked from commit 9516675ca732a775f085fb53e1e9b95c2f2d1b09) - Reviewed-on: https://code.wireshark.org/review/2102 - Reviewed-by: Alexis La Goutte - -commit f1b756c -Author: Anish Bhatt -Date: Fri Jun 6 15:54:07 2014 -0700 - - Misc lldp cleanup. - I'm cheating a bit here, hf_media_loc_long & hf_media_loc_lat need a 5byte bitmask, but the bitmask field in hf is restricted to guint32 - - Change-Id: I7e044fc680bb947973e437fc66057488a8deee67 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/2012 - Reviewed-by: Evan Huus - (cherry picked from commit b69642db300a44c244ccbc641facc9cb0c86d072) - Reviewed-on: https://code.wireshark.org/review/2101 - Reviewed-by: Alexis La Goutte - -commit 0c20611 -Author: Anish Bhatt -Date: Fri Jun 6 16:35:49 2014 -0700 - - Updates as requested - - Change-Id: I447b2c1f713710820ce81dda40992b5311285d09 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/2015 - Reviewed-by: Anders Broman - (cherry picked from commit a048dc1d0d33728022831a538d878e967da88901) - Reviewed-on: https://code.wireshark.org/review/2100 - Reviewed-by: Alexis La Goutte - -commit c0c260f -Author: Anish Bhatt -Date: Thu Jun 5 01:26:49 2014 -0700 - - LLDP-MED Cleanup - - Co-ordinate based LCI is untested, as the sample capture does not have this, could not find one anywhere. - - Change-Id: Id0b52c234d6a36ee430ab9a7265bcd84f151c80c - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1929 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 65abca673f16792ec1eb6f8173009db737e3a626) - Reviewed-on: https://code.wireshark.org/review/2099 - -commit 174cd47 -Author: Gerald Combs -Date: Mon Jun 9 10:07:10 2014 -0700 - - Add back Balint's copyright. - - Change-Id: Ib7a3789c95c4651beec76ab318410b1b7a3aaa2b - Reviewed-on: https://code.wireshark.org/review/2082 - Reviewed-by: Gerald Combs - -commit 31783cc -Author: Gerald Combs -Date: Mon Jun 9 10:01:46 2014 -0700 - - Copy over git-compare-abis.sh from master-1.10. - - Change-Id: Iea7ad9518240955da202a5c943c0f304709d77b6 - Reviewed-on: https://code.wireshark.org/review/2081 - Reviewed-by: Gerald Combs - -commit fa85cc9 -Author: Balint Reczey -Date: Sun Jun 8 23:38:21 2014 +0700 - - Fix make dist - - Change-Id: I96e25a3be6db53fcfacb631fdc48c03a63f195f2 - Reviewed-on: https://code.wireshark.org/review/2040 - Reviewed-by: Evan Huus - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - (cherry picked from commit 671d6c9095a0d7d6fd3f05287e9101ef4e9bafb2) - Reviewed-on: https://code.wireshark.org/review/2080 - Reviewed-by: Gerald Combs - -commit b62f155 -Author: Richard Sharpe -Date: Mon May 26 16:05:36 2014 -0700 - - Improve the fix by removing code that miss dissects SPNEGO stuff ... as well - as remove redundant stuff from the spnego.cnf file. - - Signed-off-by: Richard Sharpe - Change-Id: I90a962a39dc4da0f13055c9b3893c26044f1fc97 - Reviewed-on: https://code.wireshark.org/review/1809 - Reviewed-by: Tomáš Kukosa - Reviewed-by: Michael Mann - (cherry picked from commit 88a64b9e2b1e39c643277edeb4c4ae969a0b39a5) - Reviewed-on: https://code.wireshark.org/review/2069 - Reviewed-by: Alexis La Goutte - -commit 338ad80 -Author: Balint Reczey -Date: Mon Jun 9 01:28:44 2014 +0700 - - Fix Wireshark's name in Vietnamese translation - - Change-Id: Idf07c767587815d2cb2c8c094fd820983302b043 - Reviewed-on: https://code.wireshark.org/review/2043 - Reviewed-by: Michael Mann - (cherry-picked from commit 7de3d23229211108e0f9c2fc85b2cc9f487f9423) - Reviewed-on: https://code.wireshark.org/review/2062 - Reviewed-by: Alexis La Goutte - -commit d2efa6c -Author: Evan Huus -Date: Mon Dec 23 15:19:25 2013 +0000 - - Add GPLv2+ license header to headers-check.c as per private email from the - author. - - svn path=/trunk/; revision=54384 - - Change-Id: I464197c19316700457a5575b370600db38ce4962 - Reviewed-on: https://code.wireshark.org/review/2041 - Reviewed-by: Evan Huus - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - Reviewed-on: https://code.wireshark.org/review/2061 - Reviewed-by: Alexis La Goutte - -commit 4736f58 -Author: Balint Reczey -Date: Fri Jun 6 22:54:50 2014 +0700 - - .deb package format is 'native' - - Change-Id: I2b52648c74290df0e98e4be31ac6c51db309eaaf - Reviewed-on: https://code.wireshark.org/review/2001 - Reviewed-by: Evan Huus - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - (cherry-picked from commit cb4ec166d83afac0077b5a2e45bc07f7815458dd) - Reviewed-on: https://code.wireshark.org/review/2060 - Reviewed-by: Alexis La Goutte - -commit 321ec17 -Author: Balint Reczey -Date: Fri Jun 6 20:58:20 2014 +0700 - - Don't ship libfiletap in the .deb packages yet - - Change-Id: I5b179d2b84bc95e540def544a8b710f81fb0fccb - Reviewed-on: https://code.wireshark.org/review/2000 - Reviewed-by: Michael Mann - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - (cherry-picked from commit 6d783f228c9148b04c2da097727931237c742bd4) - Reviewed-on: https://code.wireshark.org/review/2059 - Reviewed-by: Alexis La Goutte - -commit 6adf20b -Author: Balint Reczey -Date: Thu Jun 5 17:30:41 2014 +0700 - - Sync .deb packaging from Debian - - The sync makes CMake the build system for the .deb package - and starts providing wireshark-qt in the wireshark-qt package. - The package structure, i.e. the libraries are shipped in separate - packages is also sync-ed. - - Wireshark-qt uses the Qt 4 libraries, but it is easy to switch - it to Qt 5. - - Change-Id: I849d18bdb8ca6ebf4072cf1d73d749080ac5dac2 - Reviewed-on: https://code.wireshark.org/review/1986 - Reviewed-by: Gerald Combs - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - (cherry-picked from commit 97e1491aa8f418a7f5bd7fdd92561d2403c187f6) - Reviewed-on: https://code.wireshark.org/review/2058 - Reviewed-by: Alexis La Goutte - -commit 1194ef7 -Author: Pascal Quantin -Date: Sun Jun 8 22:46:45 2014 +0200 - - IEEE 80211: fix dissection of HT Capabilities - - Bug: 10166 - Change-Id: Iafe789968bd5b9a6e593b682f8d42ba42db5fce9 - Reviewed-on: https://code.wireshark.org/review/2046 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - (cherry picked from commit 89960510e30b9b96a0d0b84619df099fd8a707f1) - Reviewed-on: https://code.wireshark.org/review/2051 - Reviewed-by: Pascal Quantin - -commit 0c4095c -Author: Richard Sharpe -Date: Wed May 28 21:05:41 2014 -0400 - - Try to fix the problems with the SPNEGO negTokenInit differences in Microsoft implementations - - Change-Id: Ifbfca88469a6bc479072c921deba280e667c7087 - Reviewed-on: https://code.wireshark.org/review/1804 - Reviewed-by: Michael Mann - (cherry picked from commit 0ed2672abf6d8a41e0ddc11358bb73d86a30fe92) - Reviewed-on: https://code.wireshark.org/review/2047 - Reviewed-by: Richard Sharpe - Reviewed-by: Alexis La Goutte - -commit afa09b0 -Author: Pascal Quantin -Date: Wed Jun 4 19:17:44 2014 +0200 - - Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0 - - Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 - Reviewed-on: https://code.wireshark.org/review/1978 - Reviewed-by: Pascal Quantin - - (cherry picked from ad7b5381ac54567217f12ee729c7be6cd2848d0f) - - Change-Id: I3f67b80e984e187ed65c0997fcd02ae3d715995b - Reviewed-on: https://code.wireshark.org/review/2021 - Reviewed-by: Evan Huus - -commit d801c7f -Author: Gerald Combs -Date: Sun Jun 8 08:07:05 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-06-08] - - Change-Id: Iee71c0f722e297f3c7862fc21c6e8ceb7c556421 - Reviewed-on: https://code.wireshark.org/review/2037 - Reviewed-by: Evan Huus - -commit ff44f34 -Author: Guy Harris -Date: Sat Jun 7 12:00:31 2014 -0700 - - PEEKREMOTE packets don't appear to have Atheros padding. - - Call the without-Atheros-padding dissector for the payload. - - Fixes bug 10139. - - Change-Id: I883bf4e58899aa78b07fae63d8c0376a31bda444 - Reviewed-on: https://code.wireshark.org/review/2027 - Reviewed-by: Guy Harris - (cherry picked from commit 39cdb98606b821136aabc6d60b2e1ce4846aab8b) - Reviewed-on: https://code.wireshark.org/review/2029 - -commit 94dccc7 -Author: Guy Harris -Date: Sat May 31 02:27:31 2014 -0700 - - We need a "wlan_datapad" dissector as well. - - Change-Id: I8d7e0ebeef2a912737b3afc08fcaf166dfb525b1 - Reviewed-on: https://code.wireshark.org/review/1895 - Reviewed-by: Guy Harris - (cherry picked from commit 799972425dc2178b28067e729abc99d31e0ccc67) - Reviewed-on: https://code.wireshark.org/review/2028 - -commit 9cf44c1 -Author: Guy Harris -Date: Sat Jun 7 10:44:17 2014 -0700 - - Only nuke the startup item once we've installed the launch daemon. - - That way, if we crash in the middle, there's still something installed - that will try to set the permissions on the BPF devices. - - Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411 - Reviewed-on: https://code.wireshark.org/review/2023 - Reviewed-by: Guy Harris - (cherry picked from commit 39ca18d71b85d0b99c0fd3c5edab48fa217d7d34) - Reviewed-on: https://code.wireshark.org/review/2024 - -commit a8df07c -Author: Pascal Quantin -Date: Thu Jun 5 17:24:00 2014 +0200 - - Use -O2 option when compiling with MSVC - - Change-Id: I1b7e3c94de13e44ee46d5f8abcb70b5ed6af7051 - Reviewed-on: https://code.wireshark.org/review/1984 - Reviewed-by: Pascal Quantin - -commit 003746c -Author: Guy Harris -Date: Fri Jun 6 23:41:51 2014 -0700 - - When installing the launch daemon, get rid of the old startup item. - - Only one is necessary; get rid of the startup item. - - Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86 - Reviewed-on: https://code.wireshark.org/review/2016 - Reviewed-by: Guy Harris - (cherry picked from commit b319a67bfb23a93a7f15076a94be3fe6adb9983d) - Reviewed-on: https://code.wireshark.org/review/2017 - -commit 5741a40 -Author: Gerald Combs -Date: Fri Jun 6 12:14:55 2014 -0700 - - Try to fix OS X GTK+ app creation. - - Change-Id: I81683968ee68da4826dd703bd38c233a72b2083d - Reviewed-on: https://code.wireshark.org/review/2006 - Reviewed-by: Gerald Combs - -commit 51ef489 -Author: Guy Harris -Date: Fri Jun 6 12:14:27 2014 -0700 - - Switch to a launch daemon for ChmodBPF. - - "Ah finally blew that varmint to Kingdom Come!" - - Change-Id: I4ef5f8692924772189af4158eddbc125c1c7d521 - Reviewed-on: https://code.wireshark.org/review/2004 - Reviewed-by: Guy Harris - (cherry picked from commit 2b2fbff2dc2af6f47edda62cedd22b22d6c9d9e0) - Reviewed-on: https://code.wireshark.org/review/2005 - -commit 25bb29a -Author: Gerald Combs -Date: Thu Jun 5 16:19:22 2014 -0700 - - Windows packaging and release note updates. - - Use "Wireshark" and "Wireshark 2 Preview" instead of "Wireshark (GTK+)" - and "Wireshark (Qt)" respectively in the Windows installer. Shorten the - descriptions of the command line tools. Warn against (but don't prohibit) - installing on XP. - - Note that XP is deprecated and that 32-bit OS X and U3 are no longer - supported. - - Change-Id: Ica37ffa5b04eb48cadf41842b6fb9b1431c69803 - Reviewed-on: https://code.wireshark.org/review/1988 - Reviewed-by: Gerald Combs - -commit 77df529 -Author: Balint Reczey -Date: Thu May 29 19:07:44 2014 +0700 - - Fix wireshark.pc install destination - - Change-Id: I136d654ac5ea54237494d9b61c3ddb445b0720ae - Reviewed-on: https://code.wireshark.org/review/1863 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 7c1171f7846459412a213cd3aa16efc918f54646) - Reviewed-on: https://code.wireshark.org/review/1977 - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - -commit 8bcaca0 -Author: Balint Reczey -Date: Thu May 29 10:58:05 2014 +0700 - - Honor configured CMAKE_INSTALL_LIBDIR when installing libraries - - Change-Id: I860c9408ed01e9567992b0dcf5c6c6421344c13e - Reviewed-on: https://code.wireshark.org/review/1862 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 5c6403b27bdcc0e0aac065b2daf9a2625292610f) - Reviewed-on: https://code.wireshark.org/review/1976 - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - -commit eb79329 -Author: Balint Reczey -Date: Thu May 29 00:32:20 2014 +0700 - - Set PLUGIN_INSTALL_DIR properly for wireshark.pc - - Change-Id: I64c04095ce780ce2cc44a54a68695506d27e5747 - Reviewed-on: https://code.wireshark.org/review/1861 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 7bf49b31ace52a0cfbc33ffe29afce5c0befb685) - Reviewed-on: https://code.wireshark.org/review/1975 - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - -commit 5756a84 -Author: Bill Meier -Date: Wed Jun 4 15:18:16 2014 -0400 - - tshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991. - - Change-Id: I182357fc57d6e57033319afc762549d805c2c10c - Reviewed-on: https://code.wireshark.org/review/1954 - Reviewed-by: Bill Meier - (cherry picked from commit 68a1b552f74152a4da39097e8ae5e463518bbb28) - Reviewed-on: https://code.wireshark.org/review/1957 - -commit 60f1288 -Author: Bill Meier -Date: Wed Jun 4 15:15:42 2014 -0400 - - tshark.c: Change "Live captures can only be saved in libpcap format" to "[...] in pcap or pcapng format" - - Change-Id: I18dd0d15e261ecbc1ec086b4870a994afc7665ee - Reviewed-on: https://code.wireshark.org/review/1953 - Reviewed-by: Bill Meier - (cherry picked from commit dc02627adf92ad98bdc6dbeded2f9092b06af7e5) - Reviewed-on: https://code.wireshark.org/review/1956 - -commit 5ba06c9 -Author: Bill Meier -Date: Wed Jun 4 14:59:41 2014 -0400 - - (Trivial) Fix a typo. - - Change-Id: I111d3af8d9f1a96ebbe3f4b19ab1597a93348058 - Reviewed-on: https://code.wireshark.org/review/1952 - Reviewed-by: Bill Meier - (cherry picked from commit 3d23cbd11f8afb11160abdab5a679ffd374364e4) - Reviewed-on: https://code.wireshark.org/review/1955 - -commit d9f4d37 -Author: Michael Tüxen -Date: Wed Jun 4 19:20:20 2014 +0200 - - The subtype_seek_read() functions populate *phdr, not wth->phdr. - So don't use the values. - This problem show up on pcapng files resulting from captures of - multiple interfaces. - - Change-Id: I30b0598602b0b69233107d35be4360475d8648d8 - Reviewed-on: https://code.wireshark.org/review/1950 - Reviewed-by: Guy Harris - (cherry picked from commit 91afb5a36ed9f3fb0056ac3f9aff5d5eda22ba01) - Reviewed-on: https://code.wireshark.org/review/1951 - -commit e4cb1a6 -Author: Pascal Quantin -Date: Tue Jun 3 19:42:25 2014 +0200 - - MBIM: do not access to hash map when it is not initialized yet - - Change-Id: I560941115316ead5a85b9e0b55be693217fddff2 - Reviewed-on: https://code.wireshark.org/review/1940 - Reviewed-by: Pascal Quantin - - (cherry picked from commit c5de173edc09cceb7c351cf8b85a470ad597be17) - - Change-Id: Ibcd01eb1b44e6eec57fca73dd82ffafa447ade39 - Reviewed-on: https://code.wireshark.org/review/1941 - Reviewed-by: Pascal Quantin - -commit 5c5996d -Author: Alexis La Goutte -Date: Mon Jun 2 16:54:00 2014 +0200 - - Qt: Export Object - * Fix indent (remove tabs) - * Add title to the window - - Change-Id: I454046e47fa17969c710fa8dec4fac8cb7dbf22f - Reviewed-on: https://code.wireshark.org/review/1939 - Reviewed-by: Alexis La Goutte - -commit 52b1ca6 -Author: Pascal Quantin -Date: Tue Jun 3 11:00:46 2014 +0200 - - Make TCP and UDP functions available for plugins - - Change-Id: I77b6a12f3ab23ccb318e68a27251727716b3bc12 - Reviewed-on: https://code.wireshark.org/review/1931 - Reviewed-by: Pascal Quantin - -commit e50fe32 -Author: Anish Bhatt -Date: Sun Jun 1 19:13:55 2014 -0700 - - LLDP : Fix bug in mdi_power_source hf. - While it compiles fine, hits an assert in add_string : - failed assertion "hfinfo->type == FT_STRING || hfinfo->type == FT_STRINGZ || hfinfo->type == FT_STRINGZPAD" - - Fix takes care of this issue, but seems like we're losing the bitmask info here, is there a better way to do this ? - - Change-Id: I7156d734f4b058113730d5dfbf6498e801c36770 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1915 - Reviewed-by: Alexis La Goutte - (cherry picked from commit de9efa1cb91afddb70d1b56a2574fb0def628bd3) - Reviewed-on: https://code.wireshark.org/review/1930 - -commit aec0627 -Author: Peter Palúch -Date: Sun Jun 1 19:29:24 2014 +0200 - - EIGRP Sequence TLV Dissector Patch - - In the EIGRP packet dissector, the dissector routine for the Sequence TLV - dissected the TLV only up to the first address in the list. However, the - Sequence TLV contains a variably sized list of addresses. This patch - modifies the routine so that it processes the entire TLV, not just the - first address in the contained list. - - Also, in the dissect_eigrp(), replaced calls to tvb_new_subset() with - the reported length set to -1 with the call to tvb_new_subset_length(). - TLVs always carry information about their length. And this time, - correct truly ALL calls in the switch{} section. - - Sample packet capture is available in BugZilla. - - Bug: 10156 - Change-Id: Idaaf182c05bcf799f770f23a2ce2b1e05a3d569a - Reviewed-on: https://code.wireshark.org/review/1911 - Reviewed-by: Pascal Quantin - - (cherry picked from commit 75e53a165c1167607f49962919df2e946e6476cf) - - Change-Id: Ia8e2c53bf227b0028691f1a95f6947921133a19e - Reviewed-on: https://code.wireshark.org/review/1923 - Reviewed-by: Pascal Quantin - -commit 52d1efa -Author: Gerald Combs -Date: Sun Jun 1 08:07:09 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-06-01] - - Change-Id: I0d90a3f1428cfe2b0c940dc80ed38accb09732fc - Reviewed-on: https://code.wireshark.org/review/1908 - Reviewed-by: Alexis La Goutte - -commit ad64632 -Author: Balint Reczey -Date: Thu May 29 18:21:37 2014 +0700 - - Bump .so versions for 1.12 in CMake builds, too - - Change-Id: Id8f9c9b64dee0340eef08583f5931f5076ef5089 - Reviewed-on: https://code.wireshark.org/review/1864 - Reviewed-by: Gerald Combs - Reviewed-by: Alexis La Goutte - -commit fe38765 -Author: Bill Meier -Date: Tue May 27 17:58:17 2014 -0400 - - FIELDDISPLAY can be or'd with BASE_VAL64_STRING. - - Change-Id: I43014922fc51ddeed70235006296500ec00bd437 - Reviewed-on: https://code.wireshark.org/review/1826 - Reviewed-by: Bill Meier - (cherry picked from commit cc3931c7971ebaae63889d88c52bb15b61f6922a) - Reviewed-on: https://code.wireshark.org/review/1872 - Reviewed-by: Guy Harris - -commit cb26f37 -Author: ruengeler -Date: Wed May 28 13:19:50 2014 +0200 - - Clang complains about the size of empty structs. - - Change-Id: I2951b1b384cf9b32677aea81c66c34ab07b0090f - Reviewed-on: https://code.wireshark.org/review/1835 - Reviewed-by: Michael Mann - Reviewed-by: Michael Tüxen - (cherry picked from commit 925b48ec75b9d72f15793a399732108b8669ba2e) - Reviewed-on: https://code.wireshark.org/review/1871 - Reviewed-by: Guy Harris - -commit 2e41a53 -Author: Pascal Quantin -Date: Sun May 25 23:13:57 2014 +0200 - - MAC LTE: fix dissection of Extended Power Headroom control element - - Change-Id: Ia57b4769732f2e18dd2864b576c5c77fc68deb20 - Reviewed-on: https://code.wireshark.org/review/1798 - Reviewed-by: Pascal Quantin - (cherry picked from commit 37d40eb210b6192909dc27cd91592a796a7731cd) - Reviewed-on: https://code.wireshark.org/review/1870 - Reviewed-by: Guy Harris - -commit c813024 -Author: Evan Huus -Date: Sun May 25 11:13:04 2014 -0400 - - Grab-bag of dead initializers and two actual bugs. - - All caught by cppcheck. The two (semi)-interesting bugs are: - - in asn1/atn-cpdlc/packet-atn-cpdlc-template.c where the break statement should - have been inside the brace, causing potential control-flow weirdness with - exceptions - - in epan/dissectors/packet-ieee80211.c where the bounds check for tag_len did - not match the expert info given - - Change-Id: Ie173fb8d917aabb9b4571435d671d6f16e1c7569 - Reviewed-on: https://code.wireshark.org/review/1793 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - (cherry picked from commit 08ce84ebbe91eaaccd8bbf8c8d43c8cecfc7945a) - Reviewed-on: https://code.wireshark.org/review/1869 - Reviewed-by: Guy Harris - -commit c706276 -Author: Guy Harris -Date: Thu May 29 18:17:31 2014 +0000 - - Revert "MAC LTE: fix dissection of Extended Power Headroom control element" - - I'll reapply this after either succeeding or failing to cherry-pick Evan's grab bag of fixes. - - This reverts commit e5b7a953653bd7e2be81e73e82e0599a7c7761e0. - - Change-Id: Id2a37fa362785111862b5761c4abe6ea7ac6d7db - Reviewed-on: https://code.wireshark.org/review/1868 - Reviewed-by: Guy Harris - -commit 5e3b7ec -Author: Guy Harris -Date: Thu May 29 10:56:46 2014 -0700 - - Introduce 802.11 dissectors with wired-in "FCS present" indications. - - For a number of protocols that encapsulate 802.11 frames inside packets, - whether the frame includes an FCS or not is specified by the protocol, - not by whether the link-layer frame carrying the packets *itself* - includes an FCS. As we've done with Ethernet, add "_withfcs" and - "_withoutfcs" dissectors, which *don't* check the pseudo-header FCS - length indication, and call those, rather than dissectors that check the - pseudo-header length indication, from the dissectors for those protocols. - - Change-Id: Ib8c8ecdd872e1782fdfc66e7573415d91911a62e - Reviewed-on: https://code.wireshark.org/review/1866 - Reviewed-by: Guy Harris - (cherry picked from commit 21a1208735315a3a67e8a66ae6b5cb2776be6d60) - Reviewed-on: https://code.wireshark.org/review/1867 - -commit 42e8515 -Author: Guy Harris -Date: Thu May 29 02:34:14 2014 -0700 - - Have the protocol item cover only the PEEKREMOTE header. - - Change-Id: I8e5991f636e68a956bf5e09dd6bf4be1d4619ba0 - Reviewed-on: https://code.wireshark.org/review/1852 - Reviewed-by: Guy Harris - (cherry picked from commit ababf68de7b0f61690c49db481ae6b61cc83eacd) - Reviewed-on: https://code.wireshark.org/review/1853 - -commit 6c4889c -Author: Hauke Mehrtens -Date: Mon May 26 19:29:45 2014 +0300 - - ssl-utils: fix TLS number of padding extension - - The padding extension got the number 21 (0x15) by the IANA and not 20 - (0x14), see this list for details: - https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml - - The number 20 is assigned to the server certificate type extension. - - Change-Id: I17271a3a336bcf5a323f15da3a5301115ca4cb45 - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/1822 - Reviewed-by: Martin Kaiser - (cherry picked from commit 3ce020a5fcb8035a41f3248c990b2abfa60eb325) - Reviewed-on: https://code.wireshark.org/review/1831 - Reviewed-by: Alexis La Goutte - -commit 029c11c -Author: Anish Bhatt -Date: Tue May 27 22:45:48 2014 -0700 - - LLDP Cleanup : 802.1 Qbg TLV - - Change-Id: Ibdea530928d1bd98cb353ad8d7d938f739aa693f - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1830 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 482e6a65102a0007ce7665501215e2851be413ed) - Reviewed-on: https://code.wireshark.org/review/1832 - -commit 7477e31 -Author: Michael Mann -Date: Tue May 27 19:49:46 2014 -0400 - - bugfix address handling - - Change-Id: I18e48084ba3c30a55fe0bd498c88bce56d32d885 - Reviewed-on: https://code.wireshark.org/review/1829 - Reviewed-by: Michael Mann - -commit 7e44111 -Author: Evan Huus -Date: Mon May 26 16:33:42 2014 -0400 - - Fix fencepost error in HTTP dissector - - Strndup adds +1 for the null-terminator itself, no need to do it in the caller. - This was causing us to go past the end of the buffer when the HTTP header line - didn't have any spaces in it. Caught by Alexis using ASAN. - - Bug:10135 - Change-Id: Iee1b26da4740b774581ca6ec784ee40f7b920832 - Reviewed-on: https://code.wireshark.org/review/1807 - Reviewed-by: Evan Huus - -commit 8da17d1 -Author: Evan Huus -Date: Fri May 23 16:18:00 2014 -0400 - - Replace manual string handling with strbuf - - Much simpler and should probably fix bug 10121. - Also add modelines. - - Bug:10121 - Change-Id: Ib92977e734ebe1b8529c7b6b41fbd81eac13b186 - Reviewed-on: https://code.wireshark.org/review/1758 - Tested-by: Alexis La Goutte - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - (cherry picked from commit 26840fa88fea22959c0038ff438f5b314a5452ea) - Reviewed-on: https://code.wireshark.org/review/1801 - -commit 97dc329 -Author: Bill Meier -Date: Sun May 25 14:21:38 2014 -0400 - - Fix [-Werror=clobbered] gcc warning - - Change-Id: Ibeef517a5100ae6d2c01f329022281b81a8b56a9 - Reviewed-on: https://code.wireshark.org/review/1795 - Reviewed-by: Bill Meier - (cherry picked from commit f8d63516351e67432e8bbeee4f1c2e57dbe11d0f) - Reviewed-on: https://code.wireshark.org/review/1800 - -commit e5b7a95 -Author: Pascal Quantin -Date: Sun May 25 23:13:57 2014 +0200 - - MAC LTE: fix dissection of Extended Power Headroom control element - - Change-Id: Ia57b4769732f2e18dd2864b576c5c77fc68deb20 - Reviewed-on: https://code.wireshark.org/review/1798 - Reviewed-by: Pascal Quantin - - Conflicts: - epan/dissectors/packet-mac-lte.c - - (cherry picked from commit 37d40eb210b6192909dc27cd91592a796a7731cd) - - Change-Id: I06f657db181abcf68f429604a4ad1cf8638c1ee3 - Reviewed-on: https://code.wireshark.org/review/1799 - Reviewed-by: Pascal Quantin - -commit a9298b8 -Author: Pascal Quantin -Date: Sun May 25 18:01:31 2014 +0200 - - GSM RLC MAC: Do not skip too many lines of the CSN_DESCR when the field is missing - - While we are at it, replace an undefined hf_timeslot_allocation_usf_tn by its hf_usf equivalent - - Bug: 10120 - Change-Id: I3fe113279c779a9d8143d07489747a67d7351664 - Reviewed-on: https://code.wireshark.org/review/1794 - Reviewed-by: Pascal Quantin - - (cherry picked from commit c4ead251da7199cfd746d378c51eb8c30d09a6ba) - - Change-Id: I16259e8601add99709782a610e4d5250ac6f5fa6 - Reviewed-on: https://code.wireshark.org/review/1796 - Reviewed-by: Pascal Quantin - -commit a83174e -Author: Gerald Combs -Date: Sun May 25 08:06:48 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-05-25] - - Change-Id: I92264ffa04a4e2059b6242234cb3d65a3af08d2f - Reviewed-on: https://code.wireshark.org/review/1790 - Reviewed-by: Evan Huus - -commit 1f5f8ed -Author: Guy Harris -Date: Sat May 24 17:37:52 2014 -0700 - - Get rid of trailing blank. - - Change-Id: I9eb6baee8866241a42d007d9bc69f64ab46f9a2e - Reviewed-on: https://code.wireshark.org/review/1786 - Reviewed-by: Guy Harris - (cherry picked from commit 32298547e4e17c7a6e9a6848fb7f088ecaf43bd8) - Reviewed-on: https://code.wireshark.org/review/1787 - -commit 59509c2 -Author: Guy Harris -Date: Sat May 24 17:35:08 2014 -0700 - - Add support for dissecting pcap-ng file-type-specific blocks. - - Add a dissector for pcap-ng file-type-specific blocks; it creates a - dissector table using the block type as the key, attempts to call the - appropriate dissector using that table, and does a minimal dissection if - that fails. - - Change-Id: I67e139f06ba88d40faa5b4ab169e8df08f5bfe7b - Reviewed-on: https://code.wireshark.org/review/1784 - Reviewed-by: Guy Harris - (cherry picked from commit 088b06418ad945ab417a661402c142d09b25b532) - Reviewed-on: https://code.wireshark.org/review/1785 - -commit 0c2fdbc -Author: Guy Harris -Date: Sat May 24 17:04:44 2014 -0700 - - Add support for dissecting non-packet records. - - Add a dissector table indexed by the file type, and, for the - file-type-specific records, have the frame dissector skip the usual - pseudo-header processing, as the pseudo-header has a file-type-specific - record subtype in it, and call the dissector for that file type's - records. - - Change-Id: Ibe97cf6340ffb0dabc08f355891bc346391b91f9 - Reviewed-on: https://code.wireshark.org/review/1782 - Reviewed-by: Guy Harris - (cherry picked from commit 318cf8a6782d8911c7c2891c395062f98eb0a316) - Reviewed-on: https://code.wireshark.org/review/1783 - -commit 1d20394 -Author: Sean O. Stalley -Date: Fri May 23 15:40:08 2014 -0700 - - Fixed mausb valid bit & added invalid_valid TFS - - Fixed valid bit check for MAUSB EPHandleResp packet. the valid bit - is active low (ie: valid = 0, invalid = 1). - - I noticed Some other dissectors also defined an tfs_invalid_valid, - so got rid of their local definitions & added it to epan/tfs.c. - - Change-Id: Ifd78325f9c7c046224073fc9b29e0cc60dc5c286 - Reviewed-on: https://code.wireshark.org/review/1766 - Reviewed-by: Alexis La Goutte - (cherry picked from commit 33ae4cb024e36192ff7c6fa1d3d6bdcce9b25b7a) - Reviewed-on: https://code.wireshark.org/review/1781 - Reviewed-by: Guy Harris - -commit c74afc3 -Author: Guy Harris -Date: Sat May 24 14:53:15 2014 -0700 - - Distinguish between "events" and "reports". - - Have two different classes of file-type-specific records - "events" and - "reports". An "event" indicates something that happened in the capture - process, such as a status transition on the network; a "report" just - gives information not corresponding to something happening in the - capture process, such as capture statistics. - - Note that both of those should be dissected and displayed like packets, - and leave open the possibility of file-type-specific records whose - contents should be processed and saved but not displayed in the packet - list. - - Shorten "file_type_specific" to "ft_specific". - - Change-Id: I2342d82ef992c794b76f354c057823dd5eb371e6 - Reviewed-on: https://code.wireshark.org/review/1779 - Reviewed-by: Guy Harris - (cherry picked from commit 6dffc3b7e364b7446c30db54d2193476a5f0fa93) - Reviewed-on: https://code.wireshark.org/review/1780 - -commit 782d41e -Author: Guy Harris -Date: Sat May 24 14:21:06 2014 -0700 - - Fix a compiler warning. - - Change-Id: I5b4b518982dc6033842b1e791e67d2faddfb5487 - Reviewed-on: https://code.wireshark.org/review/1777 - Reviewed-by: Guy Harris - (cherry picked from commit d5b173009c6aa4442752976374bf9f1a1ec79ca2) - Reviewed-on: https://code.wireshark.org/review/1778 - -commit 9b03a0e -Author: Guy Harris -Date: Sat May 24 13:57:11 2014 -0700 - - Add support for plugins to handle pcap-ng block types. - - We rename "file format" plugins to "libwiretap" plugins, as they can - register as read handlers for a new file type, read/write handlers for a - pcap-ng block type (or both). - - To register as a pcap-ng block type handler, in the - register_wtap_module() routine of your plugin, call - register_pcapng_block_type_handler() with the pcap-ng block type and - pointers to your routines to read and write those blocks. Those - routines should read and write REC_TYPE_FILE_TYPE_SPECIFIC records, with - the block type in the pseudo-header for the record in the struct - wtap_pkthdr structure, with time stamps stored in that structure, and - with a blob of data for the rest of the record. - - This is for bug 8590. - - Change-Id: I71847d834854a29ceb85894fd094c2ae91a04273 - Reviewed-on: https://code.wireshark.org/review/1775 - Reviewed-by: Guy Harris - (cherry picked from commit 1b6cc6320ee8d07293b3741738ee601bc86ba068) - Reviewed-on: https://code.wireshark.org/review/1776 - -commit 2310c43 -Author: Guy Harris -Date: Sat May 24 11:28:30 2014 -0700 - - Allow wtap_read() and wtap_seek_read() to return records other than packets. - - Add a "record type" field to "struct wtap_pkthdr"; currently, it can be - REC_TYPE_PACKET, for a record containing a packet, or - REC_TYPE_FILE_TYPE_SPECIFIC, for records containing file-type-specific - data. - - Modify code that reads packets to be able to handle non-packet records, - even if that just means ignoring them. - - Rename some routines to indicate that they handle more than just - packets. - - We don't yet have any libwiretap code that supplies records other than - REC_TYPE_PACKET or that supporting writing records other than - REC_TYPE_PACKET, or any code to support plugins for handling - REC_TYPE_FILE_TYPE_SPECIFIC records; this is just the first step for bug - 8590. - - Change-Id: Idb40b78f17c2c3aea72031bcd252abf9bc11c813 - Reviewed-on: https://code.wireshark.org/review/1773 - Reviewed-by: Guy Harris - (cherry picked from commit 6db77b000fe58173eeed23b91b32c92c681feda2) - Reviewed-on: https://code.wireshark.org/review/1774 - -commit 95a057a -Author: Guy Harris -Date: Fri May 23 16:44:23 2014 -0700 - - Fix some whitespace issues. - - Change-Id: I363361e898c4b37fcde29847a1473530e5052733 - Reviewed-on: https://code.wireshark.org/review/1771 - Reviewed-by: Guy Harris - (cherry picked from commit f67fc8a4d21d69ede7939874f69c3c5b8a0a4ce4) - Reviewed-on: https://code.wireshark.org/review/1772 - -commit d5d0f51 -Author: Guy Harris -Date: Fri May 23 16:40:56 2014 -0700 - - More handling of missing time stamps. - - Make nstime_cmp() handle "unset" time stamps (they're equal to other - "unset" time stamps, and less than all other time stamps), use it in - reordercap, and "unset" the time stamp if it's absent. - - Also, nstime_cmp() does not modify its argument, so make it const. - - Change-Id: I016dab5fefaf4696e78cbd8c6dd3395808e54369 - Reviewed-on: https://code.wireshark.org/review/1769 - Reviewed-by: Guy Harris - (cherry picked from commit d470a468a63a081688ddc2c6d125e4e2edafecfc) - Reviewed-on: https://code.wireshark.org/review/1770 - -commit b056e18 -Author: Guy Harris -Date: Fri May 23 16:23:58 2014 -0700 - - Set the presence flags. - - If we're going to stuff a time stamp in there, let's at least indicate - that it's there. - - Change-Id: Idc3d4ba5fdc109b21b5c6034906664a763b2ddda - Reviewed-on: https://code.wireshark.org/review/1767 - Reviewed-by: Guy Harris - (cherry picked from commit 9e2db542a28377d106c4dc99fff15499a4e26fd7) - Reviewed-on: https://code.wireshark.org/review/1768 - -commit 73c9c7c -Author: Guy Harris -Date: Fri May 23 15:35:32 2014 -0700 - - More checks for the presence of a time stamp. - - Change-Id: If8dd4c37bcb1b35dd9f988184ad53118172ae9db - Reviewed-on: https://code.wireshark.org/review/1764 - Reviewed-by: Guy Harris - (cherry picked from commit dc0ff56d753355049e1bd2e7058f6d8691817584) - Reviewed-on: https://code.wireshark.org/review/1765 - -commit 1f897cc -Author: Guy Harris -Date: Fri May 23 14:03:42 2014 -0700 - - More checks for the presence of a time stamp. - - And make sure we have a pointer to the struct wtap_pkthdr for the packet - before we check it for a time stamp. - - Change-Id: I26b205e5467a3a1236e9fd1f7633e86ece5e9040 - Reviewed-on: https://code.wireshark.org/review/1762 - Reviewed-by: Guy Harris - (cherry picked from commit f635efb6a63e10c03713cfae75490dda7cd1092e) - Reviewed-on: https://code.wireshark.org/review/1763 - -commit 7da8c2a -Author: Gerald Combs -Date: Fri May 23 13:23:17 2014 -0700 - - Initialize master-1.12. - - Change-Id: Idc679d0c7f13934fceb4d196d76abdefc51f4450 - (cherry picked from commit 543ff5713546c82f9bc44af3198136501593e09f) - Reviewed-on: https://code.wireshark.org/review/1760 - Reviewed-by: Gerald Combs - -commit 8a7e1f4 -Author: Guy Harris -Date: Fri May 23 11:53:08 2014 -0700 - - Don't assume all packets have time stamps. - - Pcap-ng files might have Simple Packet Blocks, which don't have time - stamps, and some other file formats might not have time stamps as well. - - Only check the time stamp if we have one, and don't use "the start time - stamp is unset" as an indication that we've just read the first packet, - use "the count of packets we've read is 1" as an indication that we've - just read the first packet. - - Change-Id: I097c54867655efb5c343fb880a113b3583736bbd - Reviewed-on: https://code.wireshark.org/review/1757 - Reviewed-by: Guy Harris - -commit 8ce793c -Author: Guy Harris -Date: Fri May 23 11:10:05 2014 -0700 - - file_seek() sets the error variable; no need to set it ourselves. - - Change-Id: I637326841e6db562b0896e77c86c4ebf9c3b0561 - Reviewed-on: https://code.wireshark.org/review/1756 - Reviewed-by: Guy Harris - -commit 7f6f5fc -Author: Guy Harris -Date: Fri May 23 11:07:31 2014 -0700 - - Fix comment. - - Change-Id: Ifa526ff6a9f685a0956e1b2e49f35fecfd290cb0 - Reviewed-on: https://code.wireshark.org/review/1755 - Reviewed-by: Guy Harris - -commit ae1ec15 -Author: Guy Harris -Date: Fri May 23 11:02:40 2014 -0700 - - Get rid of extra trailing blank lines. - - Change-Id: I2cb1fdc3bc27c0075cc1e4910dc32088d2695bff - Reviewed-on: https://code.wireshark.org/review/1754 - Reviewed-by: Guy Harris - -commit 1a9336b -Author: Guy Harris -Date: Fri May 23 10:59:16 2014 -0700 - - Fix a comment. - - Change-Id: I91a5c52939a516807431494a4120aecc5b0dba41 - Reviewed-on: https://code.wireshark.org/review/1753 - Reviewed-by: Guy Harris - -commit f8d7255 -Author: Guy Harris -Date: Fri May 23 10:55:30 2014 -0700 - - Get rid of extra trailing blank lines. - - Change-Id: I161bdbf08b35bfbfa1a19fc4facc5b72ef2b0390 - Reviewed-on: https://code.wireshark.org/review/1752 - Reviewed-by: Guy Harris - -commit a267f16 -Author: Guy Harris -Date: Fri May 23 10:53:13 2014 -0700 - - Get rid of trailing blank lines. - - Change-Id: I53c560557d70e2a1cb78de37aad17d92a714ce2a - Reviewed-on: https://code.wireshark.org/review/1751 - Reviewed-by: Guy Harris - -commit f6f5985 -Author: Guy Harris -Date: Fri May 23 10:51:56 2014 -0700 - - Fix the type of i4b_read_rec() to reflect what it actually returns. - - Change-Id: Iafd4996a724418460043abda455a237a539c7925 - Reviewed-on: https://code.wireshark.org/review/1750 - Reviewed-by: Guy Harris - -commit bbfdfa4 -Author: Guy Harris -Date: Fri May 23 10:47:44 2014 -0700 - - Remove trailing blank lines. - - Change-Id: I62171eb8686fc31af901367182186ccd79098fe2 - Reviewed-on: https://code.wireshark.org/review/1749 - Reviewed-by: Guy Harris - -commit 5896e2c -Author: Bill Meier -Date: Fri May 23 11:42:49 2014 -0400 - - Improve handling of short MQTT PDUs. - - This is a "good-enough" fix for now until a more comprehensive fix - is committed to handle the case of the (variable size) PDU - length field being split across TCPO segments. - - Change-Id: I57e8f5e9d7a9855fac320e8843b82a273ffb7cc5 - Reviewed-on: https://code.wireshark.org/review/1748 - Reviewed-by: Bill Meier - -commit 0eafcb9 -Author: Alexis La Goutte -Date: Fri May 23 16:44:09 2014 +0200 - - Fix -Wdocumentation - - epan/packet.h:369:11: error: parameter 'returns' not found in the function declaration [-Werror,-Wdocumentation] - - Change-Id: Ieedd203c4e952ae0ac17273311163d25ab2da066 - Reviewed-on: https://code.wireshark.org/review/1746 - Reviewed-by: Anders Broman - -commit 1c5e92d -Author: Pascal Quantin -Date: Fri May 23 16:03:03 2014 +0200 - - SIP: remove leading spaces/tabs between security parameters - - Change-Id: Icf15d18a16937e48d6b96749e8fa7c931916b491 - Reviewed-on: https://code.wireshark.org/review/1743 - Reviewed-by: Anders Broman - -commit 16d7dca -Author: Pascal Quantin -Date: Fri May 23 17:06:16 2014 +0200 - - SIP: parse ports definition in security mechanism - - Change-Id: Iaef57f01b903b66ec55275d77f80f4e81a8130dc - Reviewed-on: https://code.wireshark.org/review/1747 - Reviewed-by: Anders Broman - -commit de29a8d -Author: Alexis La Goutte -Date: Fri May 23 16:10:24 2014 +0200 - - LISP : error: declaration of 'address' shadows a global declaration [-Werror=shadow] - - Change-Id: I3f490ec40ae3241e9836e0914d43424ff9565fb5 - Reviewed-on: https://code.wireshark.org/review/1744 - Reviewed-by: Alexis La Goutte - -commit c94987d -Author: Lorand Jakab -Date: Fri May 23 17:34:57 2014 +0300 - - Dissect Nonce Locator LCAF - - Change-Id: I23f05cf3a0bc43baac4c4c31f5ce0dc0dffcade1 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1745 - Reviewed-by: Alexis La Goutte - -commit 8393390 -Author: Lorand Jakab -Date: Fri May 23 16:06:38 2014 +0300 - - Dissect AS Number LCAF - - Change-Id: I03c839a23c037a4d7da63d74e5407f0470301697 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1742 - Reviewed-by: Anders Broman - -commit eb3cdb9 -Author: Guy Martin -Date: Mon May 19 11:14:44 2014 +0200 - - Zero out pinfo->src and dst before adding a frag. - - If an mp2t packet contains one full subpacket and the fragment of - another one, it happens that the first subpacket will set src or dst to - an ethernet or IP address. Adding the fragment of the second subpacket - will then use this information for calculating the hash in the fragment - table. However, later fragments in other mp2t packets will not have - these info and reassembly will fail. - - Change-Id: Ic52763017cb854851b6686654c2d8a1624305d65 - Reviewed-on: https://code.wireshark.org/review/1692 - Reviewed-by: Anders Broman - -commit a344c97 -Author: Guy Harris -Date: Fri May 23 10:50:02 2014 +0000 - - Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records." - - This reverts commit c0c480d08c175eed4524ea9e73ec86298f468cf4. - - A better way to do this is to have the record type be part of struct wtap_pkthdr; that keeps the metadata for the record together and requires fewer API changes. That is in-progress. - - Change-Id: Ic558f163a48e2c6d0df7f55e81a35a5e24b53bc6 - Reviewed-on: https://code.wireshark.org/review/1741 - Reviewed-by: Guy Harris - -commit 716fdc8 -Author: Guy Harris -Date: Fri May 23 10:48:46 2014 +0000 - - Revert "Fix some white space issues." - - This reverts commit 2456b22cd36b08fc2816d5a730918af3d7a9d480. - - Next step: revert my other change. - - Change-Id: I7a2302c527c8a85ce9f37d6e4f68c1e2d0adb741 - Reviewed-on: https://code.wireshark.org/review/1740 - Reviewed-by: Guy Harris - -commit ca97ba0 -Author: Alexis La Goutte -Date: Thu May 22 19:23:22 2014 +0200 - - Update comment about -Wunreachable-code and -Wdocumentation - - Change-Id: I5b942bdacc5f4a9ecfa084dbff479eba6582b0df - Reviewed-on: https://code.wireshark.org/review/1726 - Reviewed-by: Anders Broman - -commit 1f26536 -Author: Evan Huus -Date: Sun May 18 22:17:30 2014 -0400 - - Add jumbo-allocation support to wmem fast block - - As it turns out, we do occasionally need it. - - Bug:10115 - Change-Id: Ifec79e4d2470bbc09f15674534d01418a6571a0d - Reviewed-on: https://code.wireshark.org/review/1688 - Reviewed-by: Evan Huus - -commit 7a706d6 -Author: Evan Huus -Date: Thu May 22 23:34:24 2014 -0400 - - Add cast to please mac buildbot - - Change-Id: Ifffcd79732f0eeaad9f618cb5b8e98217fae32da - Reviewed-on: https://code.wireshark.org/review/1738 - Reviewed-by: Evan Huus - -commit 2456b22 -Author: Guy Harris -Date: Thu May 22 20:05:20 2014 -0700 - - Fix some white space issues. - - Change-Id: I3b4f57c2d1ceffeea1770494fe19a0eee8717a76 - Reviewed-on: https://code.wireshark.org/review/1737 - Reviewed-by: Guy Harris - -commit c0c480d -Author: Guy Harris -Date: Thu May 22 20:01:31 2014 -0700 - - Allow wtap_read() and wtap_seek_read() to return non-packet records. - - This is the first step towards implementing the mechanisms requestd in - bug 8590; currently, we don't return any records other than packet - records from libwiretap, and just ignore non-packet records in the rest - of Wireshark, but this at least gets the ball rolling. - - Change-Id: I34a45b54dd361f69fdad1a758d8ca4f42d67d574 - Reviewed-on: https://code.wireshark.org/review/1736 - Reviewed-by: Guy Harris - -commit 6287efb -Author: Michael Mann -Date: Thu May 22 22:54:28 2014 -0400 - - tvb parameter should not be NULL as the lengths are nonzero. - - Change-Id: If085a9fc69bbbf28a7c801930a664c412a4a5b7a - Reviewed-on: https://code.wireshark.org/review/1734 - Reviewed-by: Michael Mann - -commit b48a215 -Author: Guy Harris -Date: Thu May 22 14:53:30 2014 -0700 - - Don't use sizeof(guintN) for sizes of data in packets. - - Either - - 1) sizeof(guintN) = N/8, in which case it's redundant - - or - - 2) sizeof(guintN) != N/8, in which case it's wrong. - - This also keeps us from having to throw casts at complaints about - shortening 64-bit values. - - Change-Id: I33911acfc54c0f3f21b73026a100a82b1ee2c35e - Reviewed-on: https://code.wireshark.org/review/1731 - Reviewed-by: Guy Harris - -commit c4ca41e -Author: Alexis La Goutte -Date: Thu May 22 22:09:27 2014 +0200 - - RADIUS: Remove double space before type (t=...) - - Change-Id: I536a359e7c808b3ace8387e30117f307c0a66e8b - Reviewed-on: https://code.wireshark.org/review/1729 - Reviewed-by: Anders Broman - -commit b762dd0 -Author: Pascal Quantin -Date: Thu May 22 21:05:54 2014 +0200 - - GSM SIM: fix a typo and update obsolete API calls - - Change-Id: Iccd51dde155e9aaed23eb753c27ae29c8cee94cd - Reviewed-on: https://code.wireshark.org/review/1725 - Reviewed-by: Pascal Quantin - -commit a60c661 -Author: ruengeler -Date: Thu May 22 13:46:36 2014 +0200 - - Call dissect_ip_tcp_options to save the window scale. - - Change-Id: I411b16cdb3bc128cb49218080179c43e13f96e99 - Reviewed-on: https://code.wireshark.org/review/1723 - Reviewed-by: Michael Mann - -commit e1ab96c -Author: AndersBroman -Date: Thu May 22 17:47:30 2014 +0200 - - Missed update of one dissector_try_heuristic() when merging. - ssed# asn1/s1ap/s1ap.diff - - Change-Id: I4bb473860bf116138fa82791aa0f4a952164476a - Reviewed-on: https://code.wireshark.org/review/1724 - Reviewed-by: Anders Broman - -commit 177c655 -Author: Owen Kirby -Date: Thu Apr 17 23:33:42 2014 -0400 - - Tighten heuristic checks for IEEE 802.15.4 protocols, and add Decode-As by PANID for when we still get it wrong. - - Change-Id: Icc2b274d2478a9426da881998bbbbfb3bf34ec4a - Reviewed-on: https://code.wireshark.org/review/1167 - Reviewed-by: Anders Broman - -commit 19c1989 -Author: Alexis La Goutte -Date: Thu May 22 10:40:55 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: Ie97c65c1a995881eb400a44f17a493494f97d9dd - Reviewed-on: https://code.wireshark.org/review/1722 - Reviewed-by: Anders Broman - -commit e92ee35 -Author: Alexis La Goutte -Date: Thu May 22 10:28:13 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I2c7ed98e28a5149562d61f8005629f351a31c11b - Reviewed-on: https://code.wireshark.org/review/1721 - Reviewed-by: Anders Broman - -commit db4abb6 -Author: Anish Bhatt -Date: Wed May 21 21:46:03 2014 -0700 - - LLDP Cleanup : 802.3 TLV - - Change-Id: Iac1740e7e1895388de3ef3c103ef6e60cc688d9e - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1720 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit adb3f70 -Author: Roman Volkov -Date: Thu May 22 00:38:54 2014 +0300 - - Wrong length of Modulation Type and Modulation System fields in Satellite Delivery Descriptor - - According EN300468 in Satellite Delivery Descriptor 'Modulation System' field has 1 bit length. 'Modulation Type' has 2 bits length. - But in my Wireshark 'Modulation System' is 2 bit long and 'Modulation Type' is 1 bit long. - - bug: 10119 - Change-Id: I762145418bbfc9c0621ee7ca1a07d35afb6d7d92 - Reviewed-on: https://code.wireshark.org/review/1718 - Reviewed-by: Michael Mann - -commit 0cb180a -Author: Joerg Mayer -Date: Thu May 22 01:01:14 2014 +0200 - - Print the values in the BSS Load Element in human readable format as well. - - Change-Id: Ie20c340e06b970602a94c601be4c629ccae56e7c - Reviewed-on: https://code.wireshark.org/review/1719 - Reviewed-by: Jörg Mayer - -commit 011a330 -Author: Mark Weel -Date: Wed May 21 15:21:50 2014 +0200 - - DIS: implement IFF PDU - - Change-Id: Ica5029ab31077f95cabde22ad7df42ced769a3d0 - Reviewed-on: https://code.wireshark.org/review/1714 - Reviewed-by: Anders Broman - -commit 2cfda31 -Author: AndersBroman -Date: Tue May 20 12:54:20 2014 +0200 - - Change the signature of dissector_try_heuristic() to return hdtbl_entry - which can be used to call the found heuristic dissector on the next pass. - - Introduce call_heur_dissector_direct() to be used to call a heuristic - dissector which accepted the frame on the first pass. - - Change-Id: I524edd717b7d92b510bd60acfeea686d5f2b4582 - Reviewed-on: https://code.wireshark.org/review/1697 - Reviewed-by: Pascal Quantin - Reviewed-by: Anders Broman - -commit bb01c7a -Author: Gerald Combs -Date: Wed May 21 10:17:49 2014 -0700 - - Remove extra parentheses. - - Fix the clang warning - - epan/wmem/wmem_allocator_simple.c:49:27: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] - if ((allocator->count == allocator->size)) { - ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~ - - We might want to add -Wno-parentheses-equality to the compiler flag - list but I'm not sure if doing so would hide valid problems. - - Change-Id: Id59b55af1411f13309fbec77870f869e04a6f49f - Reviewed-on: https://code.wireshark.org/review/1717 - Reviewed-by: Gerald Combs - -commit a150988 -Author: Lorand Jakab -Date: Wed May 21 20:07:19 2014 +0300 - - Dissect Multicast Group Membership Information LCAF - - Bug: 10126 - Change-Id: I81d643978d663d6905070d3cd7e751286c316fcd - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1716 - Reviewed-by: Alexis La Goutte - -commit 3a60f8d -Author: Lorand Jakab -Date: Wed May 21 16:58:19 2014 +0300 - - LISP: Add support for MAC address AFI - - Change-Id: I105ba5a9623d482c912c94d2c21a1c02d869db56 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1715 - Reviewed-by: Alexis La Goutte - -commit 87573a6 -Author: Lorand Jakab -Date: Wed May 21 12:19:46 2014 +0300 - - Dissect Replication List Entries LCAF - - Bug: 10124 - Change-Id: Ided4fff8259bbf1b5cb4b5209be6e3931ab09fe5 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1711 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 93630b5 -Author: Lorand Jakab -Date: Wed May 21 13:41:26 2014 +0300 - - Add value to correct tree in Key/Value LCAF - - Change-Id: Icd4ae54bff25e30406c70739c6c799db2484255b - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1713 - Reviewed-by: Alexis La Goutte - -commit fa3eecf -Author: Lorand Jakab -Date: Wed May 21 12:52:15 2014 +0300 - - Add MAC address family numbers (RFC 7042) - - See http://tools.ietf.org/html/rfc7042#section-5.2 for details - - Change-Id: I6002bef860b67e21058a66489eb16df88ba0ddf0 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1712 - Reviewed-by: Alexis La Goutte - -commit a1e6b10 -Author: Evan Huus -Date: Sat May 17 10:49:54 2014 -0400 - - Fix lua directory tests. - - The underlying directory iterator is not guaranteed to return directories in the - same order according to the glib documentation, so don't rely on the directory - order being the same when testing it. - https://developer.gnome.org/glib/2.37/glib-File-Utilities.html#g-dir-read-name - - Bug:10009 - Change-Id: I4b1078e1f3981921b1e83c4f77b4bc30a5d21b46 - Reviewed-on: https://code.wireshark.org/review/1671 - Reviewed-by: Evan Huus - -commit 0ac1779 -Author: Evan Huus -Date: Tue May 20 23:01:49 2014 -0400 - - Add cast to satisfy buildbot - - Change-Id: Ib0f66fb6e4a577da7381a75789b08a0d0371ddd2 - Reviewed-on: https://code.wireshark.org/review/1709 - Reviewed-by: Evan Huus - -commit 5d8c3cc -Author: Lorand Jakab -Date: Tue May 20 23:22:08 2014 +0300 - - Dissect Source/Destination 2-Tuple Lookups LCAF - - Change-Id: I0e8595ab5cf5385a7fda636a1804b0788f9eb869 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1707 - Reviewed-by: Michael Mann - -commit 2b0ad54 -Author: Alexis La Goutte -Date: Tue May 20 22:47:08 2014 +0200 - - Fix indent (use tabs) - - Change-Id: Ie23faaeeab61c684d57c4ff7b3c1b4ff95906dbe - Reviewed-on: https://code.wireshark.org/review/1706 - Reviewed-by: Michael Mann - -commit 438d1f8 -Author: Alexis La Goutte -Date: Tue May 20 23:00:12 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I9bccb246817ee442fbb7c216e9a2599c791a54b2 - Reviewed-on: https://code.wireshark.org/review/1708 - Reviewed-by: Pascal Quantin - -commit 572e76b -Author: Peter Lemenkov -Date: Wed May 14 16:03:09 2014 +0400 - - Don't panic in case of mediaproxy-ng/rtpengine extension - - Change-Id: Id0441ec3e68b594051930623c17f45e806b79616 - Signed-off-by: Peter Lemenkov - Reviewed-on: https://code.wireshark.org/review/1633 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit 33fc6e6 -Author: Guy Martin -Date: Mon May 19 11:14:08 2014 +0200 - - Fix the SET_ADDRESS_HF() macro. - - Change-Id: I01ac342f791b578be0aab80ce8fe07a97ba5ed50 - Reviewed-on: https://code.wireshark.org/review/1691 - Reviewed-by: Anders Broman - -commit 57e380a -Author: Alexis La Goutte -Date: Tue May 20 18:54:17 2014 +0200 - - SSL/TLS: Add Padding Extension (20) - - http://tools.ietf.org/html/draft-agl-tls-padding-03 - - Change-Id: I181718edf5b5f297aaf2e247524dfce069c90cce - Reviewed-on: https://code.wireshark.org/review/1703 - Reviewed-by: Anders Broman - -commit 7e4b8a1 -Author: Anish Bhatt -Date: Tue May 20 11:12:55 2014 -0700 - - Fix error in dcbx feature TLV dissection. Willing and Error bits were flipped - - Change-Id: Ia6d727909816b86c48232685adca653700f071d9 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1705 - Reviewed-by: Alexis La Goutte - -commit c7cea8f -Author: Lorand Jakab -Date: Tue May 20 19:58:12 2014 +0300 - - Update ELP LCAF dissection to new draft revision - - There was a change in the ELP LCAF packet format between - draft-ietf-lisp-lcaf revisions -03 and -04 reversing the flags and AFI - fields, to be more consistent with other LCAF types. - - http://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-lisp-lcaf-04.txt - - Change-Id: I2c572050f413696f2d388969e7db24238783bd56 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1704 - Reviewed-by: Alexis La Goutte - -commit e9f5dcf -Author: Lorand Jakab -Date: Tue May 20 16:13:00 2014 +0300 - - Dissect Key/Value Address Pair LCAF - - Change-Id: Ic1640a823816c5cd225c573147ff9b6b8c88879e - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1702 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit 88ff6c0 -Author: Alexis La Goutte -Date: Tue May 20 14:14:26 2014 +0200 - - PCP: Remove whitespace before ( - - Change-Id: I199895718311867be4c589137074c18ac4d45eea - Reviewed-on: https://code.wireshark.org/review/1701 - Reviewed-by: Anders Broman - -commit 98991c3 -Author: Alexis La Goutte -Date: Tue May 20 13:52:25 2014 +0200 - - PCP: Discovering NAT64 IPv6 Prefixes Using the Port Control Protocol (RFC7225) - - Change-Id: Ib404c3db8c13ebb0a2e1f6d9f767a183896f869f - Reviewed-on: https://code.wireshark.org/review/1700 - Reviewed-by: Anders Broman - -commit 9c08654 -Author: Alexis La Goutte -Date: Tue May 20 13:25:55 2014 +0200 - - PCP: Add Description Option for the Port Control Protocol (RFC 7220) - - Change-Id: I2931b14855981e71d1135a8ff7cc3b494a2a7572 - Reviewed-on: https://code.wireshark.org/review/1699 - Reviewed-by: Anders Broman - -commit 12d297e -Author: Alexis La Goutte -Date: Tue May 20 14:11:14 2014 +0200 - - PCP : Enhance display of Option... - * Display reserved using FT_BYTES - * Set option code in option subtree - - Change-Id: Ie6cf32ed260ddccceaa9f617f0a74982c95f08f5 - Reviewed-on: https://code.wireshark.org/review/1698 - Reviewed-by: Anders Broman - -commit eef176d -Author: Mark Weel -Date: Mon May 19 16:10:50 2014 +0200 - - DIS: update enumerations to SISO-REF-010-00v20-0 - - Change-Id: I99cd075bef5b8d3f2546032cc6ce9774bcf8efc1 - Reviewed-on: https://code.wireshark.org/review/1695 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit 868fa65 -Author: Sean O. Stalley -Date: Mon May 19 13:03:28 2014 -0700 - - Remove incorrect _U_ flag in dissect_mausb signature - - Removes _U_ flag for data field in dissect_mausb(), - since tcp_dissect_pdus(), uses the data field. - - Change-Id: Iccb5aae1aa203f98484666763410c4a555413ac0 - Reviewed-on: https://code.wireshark.org/review/1696 - Reviewed-by: Anders Broman - -commit 78ba6e4 -Author: Guy Martin -Date: Mon May 19 11:17:20 2014 +0200 - - Fix warning about the adaptation field control for docsis packet. The specs actually say that it should be set to 1. - - Change-Id: I136b48c6284c09798ee8e88f012a20e2cb16cd5e - Reviewed-on: https://code.wireshark.org/review/1693 - Reviewed-by: Alexis La Goutte - -commit 69623c9 -Author: Guy Martin -Date: Mon May 19 11:13:41 2014 +0200 - - Increase frag_id for self contained subpackets in mp2t packets. This fix length calculation on second pass. - - Change-Id: I6224657c0765fa9696829844b4819f6ab0a3d3f4 - Reviewed-on: https://code.wireshark.org/review/1690 - Reviewed-by: Alexis La Goutte - -commit 0adac83 -Author: Martin Kaiser -Date: Mon May 5 17:21:22 2014 +0200 - - convert SEK and SIV to their binary form only once when a new key/iv is - set, don't do the same conversion for each apdu - - Change-Id: I6b19a0b4e138cd9d333b7ab95d6a8ee3eb516293 - Reviewed-on: https://code.wireshark.org/review/1694 - Reviewed-by: Martin Kaiser - -commit 4222091 -Author: Martin Kaiser -Date: Wed May 14 23:58:08 2014 +0200 - - change the satellite frequency into a float (freq in GHz) - and make it filterable - - Change-Id: I0644e5c69ff58301c00ea3d37e80f25b856168e4 - Reviewed-on: https://code.wireshark.org/review/1689 - Reviewed-by: Martin Kaiser - -commit d7bd2ec -Author: Jakub Zawadzki -Date: Sun May 18 09:56:20 2014 +0200 - - Add new proto_tree_add_format_text() function - - There are lot of text dissectors which want just to add escaped (not filtrable) text, - add new function proto_tree_add_format_text() which just do this in optimized way. - - Change-Id: Ia0e189b620cc0a5b74cfdaef1ad4571d766bb2ab - Reviewed-on: https://code.wireshark.org/review/1678 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - -commit e6d6183 -Author: Peter Wu -Date: Sun May 18 00:07:28 2014 +0200 - - ip: display calculated checksum - - This patch adds a new "ip.checksum_calculated" field that can be used - for display in a column. - - Based on d7c4bde2799084aee717dbaa04d7fd4be06cd989 ("tcp: display - calculated checksum"). - - Change-Id: Ide5eb6640d51ded88b1df309092a0a3aaf482b03 - Reviewed-on: https://code.wireshark.org/review/1676 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 12d9fb7 -Author: Peter Wu -Date: Sat May 17 22:02:21 2014 +0200 - - udp: display calculated checksum - - This patch adds a new "udp.checksum_calculated" field that can be used - for display in a column or tshark. - - Based on d7c4bde2799084aee717dbaa04d7fd4be06cd989 ("tcp: display - calculated checksum"). - - Change-Id: Iefcfd8395adeff7a3ac58a1bfff1a3c97976aa56 - Reviewed-on: https://code.wireshark.org/review/1675 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit e5353bf -Author: Michael Mann -Date: Sun May 18 14:21:31 2014 -0400 - - Use g_ alloced memory (instead of emem) when printing fields. emem shouldn't be used for GUI functions anyway. - - emem was exposed because of its memory limits trying to output PDML for a very large byte field in a capture file. - - When converting from proto_construct_match_selected_string to fvalue_to_string_repr remember proto_construct_match_selected_string includes fieldname + value, not just value - - bug:10081 - Change-Id: I4fc6ea7fd1f63cff410207c8b30562771af40ada - Reviewed-on: https://code.wireshark.org/review/1578 - Reviewed-by: Evan Huus - -commit f75f47b -Author: Alexis La Goutte -Date: Sun May 18 23:31:57 2014 +0200 - - MySQL: fix soft-deprecated APIs - - tvb_length -> tvb_reported_length - tvb_get_string -> tvb_get_string_enc - - Change-Id: I98d46b5603e0d840d17968f6c81b33d9bdbb9dea - Reviewed-on: https://code.wireshark.org/review/1687 - Reviewed-by: Michael Mann - -commit ca6441e -Author: Alexis La Goutte -Date: Sun May 18 23:25:42 2014 +0200 - - MySQL: add new (extended) Capability flags - - http://dev.mysql.com/doc/internals/en/capability-flags.html - - Change-Id: I0aef20fef5346bd24d610444fdbc89cbe720c3c4 - Reviewed-on: https://code.wireshark.org/review/1686 - Reviewed-by: Michael Mann - -commit faeb050 -Author: Alexis La Goutte -Date: Sun May 18 21:35:28 2014 +0200 - - Mysql : add new flag for server status flags - - http://dev.mysql.com/doc/internals/en/status-flags.html - - Change-Id: Ic08e2aa449eeb6963c5ebf7e65b5bf39e9da76d9 - Reviewed-on: https://code.wireshark.org/review/1685 - Reviewed-by: Michael Mann - -commit fe05383 -Author: Alexis La Goutte -Date: Sun May 18 21:20:24 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I9bf53014d90857b7d71efbb09b5ceb708b3df6ca - Reviewed-on: https://code.wireshark.org/review/1683 - Reviewed-by: Michael Mann - -commit 5235dc6 -Author: AndersBroman -Date: Sun May 18 19:32:19 2014 +0200 - - Only call ep_tcp_port_to_display/ep_udp_port_to_display once for sorce and - destination ports. - - Change-Id: I490a716b7991d0d7dfcaecd722a267c77af2e776 - Reviewed-on: https://code.wireshark.org/review/1682 - Reviewed-by: Alexis La Goutte - Reviewed-by: Michael Mann - -commit 5701cea -Author: Joerg Mayer -Date: Sun May 18 21:34:13 2014 +0200 - - - Modify Cisco Compatible Extentions MFP dissection - - Add Cisco Compatible Extensions DTPC dissection - - Change-Id: I3dc7075865c0041ee964d9260339028d0adf17e0 - Reviewed-on: https://code.wireshark.org/review/1684 - Reviewed-by: Jörg Mayer - -commit 9705c9b -Author: Gerald Combs -Date: Sun May 18 08:04:32 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-05-18] - - Change-Id: Ia3d139ee0f02588ccc8aa1c83768ae51bd832d15 - Reviewed-on: https://code.wireshark.org/review/1679 - Reviewed-by: Alexis La Goutte - -commit 2d0507e -Author: Guy Harris -Date: Sat May 17 15:28:30 2014 -0700 - - Use gsize rather than int, to avoid some complaints about shortening. - - Change-Id: Ic673525a05cd106677226a4063af825d0f22c97c - Reviewed-on: https://code.wireshark.org/review/1677 - Reviewed-by: Guy Harris - -commit ea95c83 -Author: Jakub Zawadzki -Date: Wed May 14 01:56:23 2014 +0200 - - Introduce col_add_lstr(), use it instead of slower col_add_fstr. - - We have callgrind benchmarks which shows that col_add_fstr() takes - 5% of Ir count cause of formatting done in g_vsnprintf(). - - New col_add_lstr() can be used in few dissectors without much ugliness, - and it should be a little faster. - - Change-Id: Ifddd951063dfd3a27c2a7da4dafce9b242c0472c - Reviewed-on: https://code.wireshark.org/review/1629 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 2408297 -Author: Peter Wu -Date: Sat May 17 17:49:08 2014 +0200 - - lua: fix buffer underrun - - A line containing just "\n" will cause a buffer underrun. - - Test: - tshark -r test/captures/sipmsg.log -X lua_script:test/lua/acme_file.lua -w /dev/null - - Caught by ASAN. - - Change-Id: Idf38f1af2b211101b3929ee3fbd83c54c99c1e21 - Reviewed-on: https://code.wireshark.org/review/1673 - Reviewed-by: Evan Huus - -commit cea149a -Author: Peter Wu -Date: Sat May 17 17:19:42 2014 +0200 - - wiretap: fix regression, missing initialization - - wtap_dump_open() allocates an empty wtap_dumper struct such that - interface_data is not initialized. Fix this by adding the member back. - - Regression from 3aee917058fb46b2e86d750766001c4db214fc78 ("wiretap: - remove unused code, drop number_of_interfaces"). - - Bug: 10113 - Change-Id: Ia6259bf50b25d5e7aa837b0fb7396b07d5d3c72c - Reviewed-on: https://code.wireshark.org/review/1672 - Reviewed-by: Evan Huus - -commit 3aee917 -Author: Peter Wu -Date: Thu May 15 23:39:12 2014 +0200 - - wiretap: remove unused code, drop number_of_interfaces - - While investigating an ASAN issue (fixed in - commit dcdd076ab0965c346efe90051678ba790eaf7a02), I got greatly confused - by three different types having the same "interface_data" field name: - - * pcapng_t *pn stores an array of interface_data_t objects. - * wtap *wth stores an array of wtapng_if_descr_t objects. - * pcapng_dump_t should store an array of interface_data_t objects. - - pcapng_dump_t and friends are unused since - commit c7f1a431d23e17a15777652b1252e139f182b0e6, so drop it. - - To fix the confusion, rename the interface_data_t type to - interface_info_t type and use the local variable "iface_info" - everywhere. Rename interface_data of pcapng_t to "interfaces" and - add a comment what this exactly means (interfaces listed in the capture - file). - - Drop the number_of_interfaces field for interfaces as the array - length is already available from GArray. Now interface_data is always - initialized for wth (which also gets copied to idb). - - s/int/guint/g and replace cast at some places. - - There are no regressions for the in-tree test suite. - - Change-Id: I2d5985c9f1e43f8230dbb4a73bd1e243c4858170 - Reviewed-on: https://code.wireshark.org/review/1656 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - Reviewed-by: Michael Mann - -commit 9fe221a -Author: Evan Huus -Date: Sat May 17 08:23:52 2014 -0400 - - Fix newly optimized strdup_vprintf. - - As Jakub pointed out, our +1/-1 logic for null terminators wasn't quite right. - Also be sure to re-copy the va_list parameter if we need to re-use it, as - otherwise things break oddly. - - Change-Id: Ibeaa95af602f565791e9378a6cfce434f13025eb - Reviewed-on: https://code.wireshark.org/review/1670 - Reviewed-by: Evan Huus - -commit 72a6a8c -Author: Jakub Zawadzki -Date: Sat May 17 13:06:01 2014 +0200 - - Fixes after wmem_strdup_vprintf() optimization - - - g_vsnprintf()[1] buffer size can includes space for terminating NUL, - this simplifies code, and fix problems with string truncation - - - g_vsnprintf() returns number of bytes without terminating NUL, so we - need to do + 1 - - - second g_vsnprintf() call use already consumed 'ap2' va_arg, which - makes wmem_strdup_vprintf() doesn't work/ crash for FORMATTED string length > 80 - - [1] https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-vsnprintf - - Change-Id: I0ebb7f452e3e89c9b55f8ac889166f02e8a7c982 - Reviewed-on: https://code.wireshark.org/review/1667 - Reviewed-by: Michael Mann - -commit 25ba4a2 -Author: Evan Huus -Date: Sat May 17 08:05:35 2014 -0400 - - Guard closing capture window with ifdef. - - That variable is only defined if we HAVE_LIBPCAP. Should fix OSX10.5 buildbot. - - Change-Id: I0bafc48955ef4af3c0b8d9d7a35b1e8b27577d31 - Reviewed-on: https://code.wireshark.org/review/1669 - Reviewed-by: Evan Huus - -commit 8129c2d -Author: Evan Huus -Date: Sat May 17 08:02:45 2014 -0400 - - Add casts to fix OSX 10.6 buildbot - - Change-Id: Ice852356201ba222290d2705d9f5526ce242b031 - Reviewed-on: https://code.wireshark.org/review/1668 - Reviewed-by: Evan Huus - -commit 89a72f3 -Author: Chun-Yeow Yeoh -Date: Fri May 16 16:52:51 2014 +0800 - - Add SAE authentication algorithm in 802.11 - - Signed-off-by: Chun-Yeow Yeoh - - Change-Id: If3500dda55aed45bbecd0261191ce1ec6cfbdbca - Reviewed-on: https://code.wireshark.org/review/1661 - Reviewed-by: Evan Huus - Reviewed-by: Yeoh Chun-Yeow - Reviewed-by: Anders Broman - -commit a42df48 -Author: AndersBroman -Date: Fri May 16 14:07:54 2014 +0200 - - Use a pre allocated buffer in wmem_strdup_vprintf() reduces the function - cost by more than half. - - Change-Id: I6ad2ae407325d2091ffb60919cb3ed74f78f39fa - Reviewed-on: https://code.wireshark.org/review/1662 - Reviewed-by: Anders Broman - -commit ba3c0d7 -Author: Martin Mathieson -Date: Fri May 16 17:19:17 2014 +0100 - - Show EMM and ESM causes in the Info column - - Change-Id: I2e3be18e997d6be0b250fbd8e664779d0d2a8228 - Reviewed-on: https://code.wireshark.org/review/1666 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 0a24908 -Author: Gerald Combs -Date: Fri May 16 09:21:57 2014 -0700 - - Build with GTK+ 2.24.23. - - Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460 - Reviewed-on: https://code.wireshark.org/review/1665 - Reviewed-by: Gerald Combs - Tested-by: Gerald Combs - -commit 33750ab -Author: Alexis La Goutte -Date: Fri May 16 15:11:11 2014 +0200 - - IP Protocol : Update description of IP Protocol - - From Boaz - - In IANA the two IPv4 protocols are defined: - - 35 IDPR Inter-Domain Policy Routing Protocol - 45 IDRP Inter-Domain Routing Protocol - http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml - - However, in Wireshark, they are named: - - { IP_PROTO_IDPR, "Interdomain routing" }, /* 35 IDPR Inter-Domain Policy Routing Protocol [Martha_Steenstrup] */ - { IP_PROTO_IDRP, "IDRP" }, /* 45 IDRP Inter-Domain Routing Protocol [Sue_Hares] */ - - Which is somewhat confusing. - - I think IDPR should be named "Inter-Domain Policy Routing". - And IDRP should be named "Inter-Domain Routing Protocol". - - Change-Id: I69b34ea8d9b3169fd779357710edb44cfb5cb2b3 - Reviewed-on: https://code.wireshark.org/review/1664 - Reviewed-by: Anders Broman - -commit c3513b4 -Author: Alexis La Goutte -Date: Fri May 16 14:59:32 2014 +0200 - - Add modelines info - - Change-Id: Ia37dd9c79e70b839063e131c532ae2b724293600 - Reviewed-on: https://code.wireshark.org/review/1663 - Reviewed-by: Anders Broman - -commit c24ede3 -Author: Alexis La Goutte -Date: Fri May 16 08:48:40 2014 +0200 - - DNS: fix soft-deprecated APIs - - tvb_length -> tvb_reported_length - tvb_get_string -> tvb_get_string_enc - - Change-Id: Ia511f0e9d3f8ae3d7a1a965431016336ec47188d - Reviewed-on: https://code.wireshark.org/review/1660 - Reviewed-by: Anders Broman - -commit 6989feb -Author: Alexis La Goutte -Date: Fri May 16 08:37:38 2014 +0200 - - DNS: Use acronyms from RFC7218 for DANE / TLSA - - http://tools.ietf.org/html/rfc7218 - - Change-Id: Icd276c6cb4680aa53b081c239cb8eb2d8fc109c6 - Reviewed-on: https://code.wireshark.org/review/1659 - Reviewed-by: Anders Broman - -commit 59eb8cf -Author: Michael Mann -Date: Thu May 15 18:23:26 2014 -0400 - - Make (almost) all fields filterable and use "normal" dissection functions to do it. - - Removed the additional "parseFields" layer as it was unnecessary and IMO ends up creating more work for a developer if they want to add additional filterable fields. That layer also hid the (large) number of unfilterable fields that were in the dissector that would normally be caught by counting the number of proto_tree_add_text function calls. - - Change-Id: I6f9607938c2386de40bdd3dae652614f07dda31e - Reviewed-on: https://code.wireshark.org/review/1653 - Reviewed-by: Peter Ross - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit aa922b0 -Author: Evan Huus -Date: Thu May 15 19:59:52 2014 -0400 - - Try to fix stack-buffer-overflow caught by ASAN - - Use wmem_array_append rather than wmem_array_append_one to make sure the pointer - types match up. _append_one automatically takes the address of its argument, - which causes problems if that argument is already a pointer. - - Thanks to Alexis for catching this. - - Change-Id: Ie702bb2c776f9fcf31bd64073c756edd75d888e8 - Reviewed-on: https://code.wireshark.org/review/1657 - Reviewed-by: Michael Mann - -commit 7ba7612 -Author: Alexis La Goutte -Date: Thu May 15 18:21:38 2014 +0200 - - STUN dissector: fix (soft) warning about tvb_length - - Change-Id: I2b6c4e44d406585204b805ae3efa53c31e7d2574 - Reviewed-on: https://code.wireshark.org/review/1655 - Reviewed-by: Anders Broman - -commit 37fd797 -Author: Alexis La Goutte -Date: Thu May 15 18:19:36 2014 +0200 - - STUN dissector: fix hf name (stun_... => hf_stun_....) - - Change-Id: I0a4a12cc18a03824827a3bb57b7e58a8f1bd6ba8 - Reviewed-on: https://code.wireshark.org/review/1654 - Reviewed-by: Anders Broman - -commit 773c02d -Author: Masayuki Takemura -Date: Thu May 15 22:37:37 2014 +0900 - - diameter_3gpp: Dissect Feature-List flags in Gx message - - With this patch, wireshark dissects the Feature-List flags field in Gx message - and displays the name and value of each of Feature bit. - - Change-Id: I18af8a133ae7db4da5a126a81521c474d1553719 - Reference: 3GPP TS 29.212 V11.7.0, Section 5.4.1. - Reviewed-on: https://code.wireshark.org/review/1652 - Reviewed-by: Anders Broman - -commit 53eeff6 -Author: ruengeler -Date: Thu May 15 13:38:37 2014 +0200 - - Do not leave the Options Interfaces Dialog open, when the Main Window is closed. - - Change-Id: Ifd4fb88ceff24561131fad1d72531889e323f5ac - Reviewed-on: https://code.wireshark.org/review/1651 - Reviewed-by: Anders Broman - -commit 45da41d -Author: Guy Harris -Date: Wed May 14 21:16:18 2014 -0700 - - Fix declaration to match definition. - - Change-Id: I9fcfddb34b2a22c3e2cf8f8fc9671eed2e8aef43 - Reviewed-on: https://code.wireshark.org/review/1649 - Reviewed-by: Guy Harris - -commit 84fcadc -Author: Guy Harris -Date: Wed May 14 20:23:09 2014 -0700 - - Get rid of some uses of tvb_get_ptr(). - - Change-Id: I85232f984f273c9a6ceccd12df5b77a4d131596c - Reviewed-on: https://code.wireshark.org/review/1648 - Reviewed-by: Guy Harris - -commit 09bf170 -Author: Guy Harris -Date: Wed May 14 20:15:03 2014 -0700 - - Get rid of some uses of tvb_get_ptr(). - - Introduce a new tvb_ipxnet_to_string() routine to help that. - - Change-Id: Icb27f7cdd6e6e7de67e765715e450063d7de6072 - Reviewed-on: https://code.wireshark.org/review/1647 - Reviewed-by: Guy Harris - -commit 1bfe396 -Author: Guy Harris -Date: Wed May 14 20:01:35 2014 -0700 - - Get rid of some uses of tvb_get_ptr(). - - Change-Id: Ib49575e5d92419e0860bf92810a7ac69f30e9699 - Reviewed-on: https://code.wireshark.org/review/1646 - Reviewed-by: Guy Harris - -commit b8f0e8c -Author: Guy Harris -Date: Wed May 14 19:30:07 2014 -0700 - - Eliminate some calls to tvb_get_ptr(). - - Change-Id: I1c5e10467d68ed7372dfaa9109b350238418ffc1 - Reviewed-on: https://code.wireshark.org/review/1645 - Reviewed-by: Guy Harris - -commit d7f1ac3 -Author: Evan Huus -Date: Wed May 14 15:59:24 2014 -0400 - - wmem documentation updates - - Change-Id: Ief20460ed8ec1b4bd1286cc2a5490d9aeefdf98f - Reviewed-on: https://code.wireshark.org/review/1643 - Reviewed-by: Evan Huus - -commit 9c07e97 -Author: AndersBroman -Date: Thu May 8 15:36:37 2014 +0200 - - Add an expert info for GT with no digits. - - Change-Id: I3595af1cae77fb07be942289b4a53c9edbd768fb - Reviewed-on: https://code.wireshark.org/review/1561 - Reviewed-by: Evan Huus - -commit 99e92ac -Author: Balint Reczey -Date: Wed May 14 14:26:32 2014 +0200 - - Drop unused voip_bg.xpm - - Change-Id: I1130d9dbfb0aaf9b1de460cd26e136514b9b80b2 - Reviewed-on: https://code.wireshark.org/review/1642 - Reviewed-by: Evan Huus - -commit bc15fad -Author: Pascal Quantin -Date: Wed May 14 18:38:30 2014 +0200 - - AMQP: always display its name in protocol column, whatever the protocol version - - Bug: 10101 - Change-Id: I41105b250384bd44c37c0707ad41c9d76700bc75 - Reviewed-on: https://code.wireshark.org/review/1641 - Reviewed-by: Alexis La Goutte - -commit a1b9393 -Author: Evan Huus -Date: Wed May 14 13:00:37 2014 -0400 - - Revert "Don't throw for offset at end of TVB with len -1." - - This reverts commit fe195c0c978b4b92dc5a77daa6449a7f1314243d. - - Conflicts: - epan/tvbuff.c - - Change-Id: I1af618d0bd1e6211281b6d67c0ad197cfa513a0c - Reviewed-on: https://code.wireshark.org/review/1639 - Reviewed-by: Evan Huus - -commit d7c4bde -Author: Peter Wu -Date: Tue May 13 21:45:48 2014 +0200 - - tcp: display calculated checksum - - While debugging a network issue, I found incorrect TCP checksums. These - are shown in the packet details, but are not available as column. This - patch adds the "tcp.checksum_calculated" field which is only available - if a checksum can be calculated (i.e., checksumming is enabled and the - full segment is available). - - The fields are added separately for each checksum case to make it appear - before "Checksum Bad/Good" and to avoid calculating the expected field - value for the "good" cases. - - Change-Id: I36af7894d526382ef636c5fa51e74871212b2909 - Reviewed-on: https://code.wireshark.org/review/1627 - Reviewed-by: Pascal Quantin - Reviewed-by: Alexis La Goutte - -commit aa5d912 -Author: Bill Meier -Date: Wed May 14 11:41:20 2014 -0400 - - Add a comment indicating that 'PLATFORM' is apparently set only for X64. - - Change-Id: I5248c421e53a4347789c076433af004697a1b682 - Reviewed-on: https://code.wireshark.org/review/1637 - Reviewed-by: Anders Broman - -commit fbf3391 -Author: AndersBroman -Date: Wed May 14 17:35:17 2014 +0200 - - - curr_layer_num got wrong for STUN. - - Change depreciated API. - - Change-Id: I6f83f45d2d007d42efc9d81cbaa58c50e67373f1 - Reviewed-on: https://code.wireshark.org/review/1636 - Reviewed-by: Anders Broman - -commit beb119f -Author: Evan Huus -Date: Sun May 11 20:33:58 2014 -0400 - - Don't use -1 as length in frame dissector. - - Additional belated followup to gfe195c0c9 per conversation on -dev about the use - of -1 and when we should throw exceptions. See also g867a1827e7. - - Should (in theory) permit reverting gfe195c0c9. - - Bug:9999 - Bug:10030 - Change-Id: I56e5f4e5dc12fe82268243d0b113cfc9ff5fdd17 - Reviewed-on: https://code.wireshark.org/review/1603 - Reviewed-by: Anders Broman - -commit b2055d7 -Author: Mark Weel -Date: Wed May 14 16:36:58 2014 +0200 - - Update enums to SISO_REF_010-00v20-0 Annex A, section A.1 and A.2 - - Change-Id: Ic4099145d84541297d72b018b21f88b4a120b138 - Reviewed-on: https://code.wireshark.org/review/1634 - Reviewed-by: Anders Broman - -commit 836530e -Author: AndersBroman -Date: Wed May 14 12:35:30 2014 +0200 - - - Replace tvb_length_remaining -> tvb_captured_length_remaining, - - Use length_remaining in tvb_find_line_end() rather than -1 it should - give a faster code path. - - Change-Id: Ia6c289f1701add48429b25152db8a8e5cea9e053 - Reviewed-on: https://code.wireshark.org/review/1632 - Reviewed-by: Anders Broman - -commit 2828bf7 -Author: ruengeler -Date: Wed May 14 12:07:49 2014 +0200 - - The filter string can only be valid, if an interface is selected. - - Change-Id: I578f6b46d5e2631c6315eb0a8b6141ba93ee21bb - Reviewed-on: https://code.wireshark.org/review/1631 - Reviewed-by: Anders Broman - -commit dcdd076 -Author: Guy Harris -Date: Tue May 13 19:24:41 2014 -0700 - - pcapng->interface_data is an array of interface_data_t. - - Change-Id: Ida44a8820948d509e74ab8475979e8695abb4288 - Reviewed-on: https://code.wireshark.org/review/1630 - Reviewed-by: Guy Harris - -commit 2c00d66 -Author: Alexis La Goutte -Date: Wed Apr 23 19:59:03 2014 +0200 - - Use pre-scan command line parameters with double while(opt=getopt...) - - Don't need launch "Qt" for some console only parameters (-h -v ...) - - Based on GTK+ code - - Change-Id: I1a810e394088959aefbbb39fb88836591a8b2367 - Reviewed-on: https://code.wireshark.org/review/1311 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit 218b8c9 -Author: Alexis La Goutte -Date: Tue May 13 17:49:24 2014 +0200 - - HTTP2 enhance display when priority flag is set - * Add bitmask and fix length for exclusive flag - * Add missing bitmask for stream dependency - * Add fielder with calcultated weight value (weight+1, see spec for more information) - - Change-Id: I7a6e97be068a80caa7355f593d9497c431c681ed - Reviewed-on: https://code.wireshark.org/review/1625 - Reviewed-by: Anders Broman - -commit 3157bf6 -Author: AndersBroman -Date: Tue May 13 14:44:47 2014 +0200 - - isprint() -> g_ascii_isprint() - - Change-Id: Ia586ef8ce500d5fc7578c52014206fa7a7eaea41 - Reviewed-on: https://code.wireshark.org/review/1624 - Reviewed-by: Anders Broman - -commit f7819de -Author: AndersBroman -Date: Tue May 13 18:00:25 2014 +0200 - - In ascii_xx_inplace use g_ascii_isupper/g_ascii_islower directly, it - *should* be slightly more efficient. - - Change-Id: I3081e2e25f241cdb07fa46011f50709fd560fb1c - Reviewed-on: https://code.wireshark.org/review/1626 - Reviewed-by: Anders Broman - -commit cd8188d -Author: AndersBroman -Date: Tue May 13 10:28:09 2014 +0200 - - Reduce the number of calls to tvb_reported_lenght_remaining(). - - Change-Id: I717572d403b38a33ccd5e390ace3742f3d296250 - Reviewed-on: https://code.wireshark.org/review/1622 - Reviewed-by: Anders Broman - -commit f964740 -Author: Alexis La Goutte -Date: Mon May 12 09:00:52 2014 +0200 - - Enhance HTTP2 dissector - * Add missing padding for CONTINUATION frame - * Add filter for generated padding length - * add unused flags - - Change-Id: I98ff759595d3018f11b6d3ec9ea298e92e032d73 - Reviewed-on: https://code.wireshark.org/review/1604 - Reviewed-by: Daniel Stenberg - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit c32fb05 -Author: Alexis La Goutte -Date: Tue May 13 09:27:44 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: Ieac2f4a288f6ed084f2ea83ad409e217168065b2 - Reviewed-on: https://code.wireshark.org/review/1621 - Reviewed-by: Anders Broman - -commit fb1e251 -Author: Anish Bhatt -Date: Mon May 12 22:38:33 2014 -0700 - - LLDP cleanup : Management Address TLV - - Change-Id: I324fdd0482a9740f24e74688bd17d768fc37f60c - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1620 - Reviewed-by: Anders Broman - -commit 67bc394 -Author: Pascal Quantin -Date: Tue May 13 07:10:01 2014 +0200 - - IPsec: fix implicit conversion of pointer warning - - Change-Id: Id1b62e2a7ea525cf2d421e41d9f344d24b56506d - Reviewed-on: https://code.wireshark.org/review/1619 - Reviewed-by: Pascal Quantin - -commit 44191fc -Author: Evan Huus -Date: Sun May 11 18:25:23 2014 -0400 - - Dumber "simple" wmem allocator. - - Instead of maintaining a hash table, just alloc a really big array of pointers. - This is theoretically bad since it means frees and reallocs become O(n), but in - practice it makes the capture from bug 10098 run about 20% faster under - valgrind. This makes sense, since the workload is heavily dominated by - allocations, and most frees/reallocs are recently allocated (so they will be - found quickly at the beginning of the scan). - - Bug:10098 - Change-Id: I7097ad0653d3fb5f4f723cc84046cbc4450e3494 - Reviewed-on: https://code.wireshark.org/review/1602 - Reviewed-by: Anders Broman - -commit f1c2406 -Author: Martin Mathieson -Date: Mon May 12 22:30:14 2014 +0100 - - Allow 16 SAs to be added, but allocate on heap to avoid growing stack - - Change-Id: I68a4437c35c6e1e629cace06cfea07ae1ec45066 - Reviewed-on: https://code.wireshark.org/review/1616 - Reviewed-by: Anders Broman - -commit 2981ae4 -Author: Gerald Combs -Date: Mon May 12 15:16:23 2014 -0700 - - Add default paths for the Qt online installer for Windows. - - Change-Id: I55d1ad6e4cc14aa5f02597d2afc8512018181543 - Reviewed-on: https://code.wireshark.org/review/1618 - Reviewed-by: Gerald Combs - -commit 89e61b9 -Author: AndersBroman -Date: Mon May 12 18:27:06 2014 +0200 - - Save the result of tvb_reported_length_remaining() and use it to reduce the number of calls to tvb_reported_length_remaining(). - - Change-Id: I6c110d7d995e4c771bbeea9013d867c46ca96778 - Reviewed-on: https://code.wireshark.org/review/1613 - Reviewed-by: Pascal Quantin - Reviewed-by: Anders Broman - -commit d7befa8 -Author: Martin Mathieson -Date: Mon May 12 22:22:49 2014 +0100 - - Fix copy-and-paste error with cause value_strings, and change indentation to match generated code - - Change-Id: I629f010f2430c5765c1adb41c57e6ea26d92b049 - Reviewed-on: https://code.wireshark.org/review/1615 - Reviewed-by: Martin Mathieson - -commit a22b912 -Author: Sean O. Stalley -Date: Wed May 7 11:08:31 2014 -0700 - - Added dissection of EPHandleDelete Req & Resp packets - - Added support for dissecting Media Agnostic USB EPHandleDelete - Req & Resp packets. - - Change-Id: I225a38291c3f47065755c01b336ef75c719e5d58 - Reviewed-on: https://code.wireshark.org/review/1546 - Reviewed-by: Pascal Quantin - -commit 9803122 -Author: Gerald Combs -Date: Mon May 12 09:57:44 2014 -0700 - - Ignore SIGPIPE on systems that have it. - - According to the GTK+ docs, gtk_init calls "signal(SIGPIPE, SIG_IGN)" at - startup. Replicate that behavior here, otherwise we tend to terminate - unexpectedly. - - Change-Id: Ia017402755d647e6050af40deacef6765eea8694 - Reviewed-on: https://code.wireshark.org/review/1614 - Reviewed-by: Gerald Combs - Tested-by: Gerald Combs - -commit 483e459 -Author: Bill Meier -Date: Mon May 12 11:17:18 2014 -0400 - - Do some cleanup related to deprecated function names and revised function return values): - - - tvb_length_remaining() ==> tvb_captured_length_remaining(); - - tvb_ensure_length_remaining() ==> tvb_ensure_captured_length_remaining(); - - tvb_(captured|reported)_length_remaining() now return 0 instead of -1 if error - and thus MAX(0, ...) is no longer required; - - Rename variable: length_remaining ==> captured_length_remaining; - - tabs ==> spaces (to match editor modelines). - - Change-Id: I93b947a0a4cc52ccd2ad21c914abf4c4218b59e6 - Reviewed-on: https://code.wireshark.org/review/1610 - Reviewed-by: Bill Meier - -commit d1d5caa -Author: Pascal Quantin -Date: Sun May 11 22:49:03 2014 +0200 - - Fix tshark -z follow,tcp stats regression when TCP stream index is > 0 - - With tshark stats are being configured before the file gets loaded and the number of TCP streams are computed - - Bug: 9541 - Change-Id: I42c2891124f1781b05967d5f071ad40df2d6d9f5 - Reviewed-on: https://code.wireshark.org/review/1598 - Reviewed-by: Evan Huus - Reviewed-by: Pascal Quantin - -commit 9554b2f -Author: Michael Mann -Date: Sun May 11 21:28:15 2014 -0400 - - Condense DIS dissector to a single file. - - This doesn't appears to be "autogenerated", and it certainly isn't the biggest dissector even after the merge. This avoid file pollution, makes less non-static variables/functions and makes the check* scripts job easier. - - Change-Id: If94857e4a3e602c3d45201b1aebbf466ba3e1dd1 - Reviewed-on: https://code.wireshark.org/review/1597 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - -commit d73400a -Author: Evan Huus -Date: Sun May 11 17:55:20 2014 -0400 - - Minor optimization to packet-frame.c - - When printing the protocol list item (which happens for every packet when using - tshark -T) the resulting string is almost guaranteed to be longer than the - default 16 characters. By allocating a bigger buffer right away we avoid some - potentially-expensive reallocs as the string grows. - - Change-Id: Iaa35840f66975f03d8f92bbea26979df48bbc887 - Reviewed-on: https://code.wireshark.org/review/1601 - Reviewed-by: Michael Mann - -commit ff466a9 -Author: Evan Huus -Date: Sat May 10 23:54:37 2014 -0400 - - Increase time permitted when fuzzing with valgrind. - - The capture on bug 10098 times out but I don't see any culprits for bad loops or - anything - I think the capture is just too big. I'd prefer somebody else take a - look at it to verify I'm not missing anything before submitting this. - - Bug:10098 - Change-Id: I2cc43fd6ac9afaa345e7d31184483a9732fd6bf0 - Reviewed-on: https://code.wireshark.org/review/1583 - Reviewed-by: Gerald Combs - Reviewed-by: Evan Huus - -commit 03f75dd -Author: Joerg Mayer -Date: Sun May 11 21:27:06 2014 +0200 - - It is possible to check out a source tree that is not co-located with - the .git repository. First attempts to support that setup. - - Change-Id: Ie1560c372e23e58fb0e310f681388b5e1a65ba5b - Reviewed-on: https://code.wireshark.org/review/1596 - Reviewed-by: Jörg Mayer - -commit 7a010fa -Author: Joerg Mayer -Date: Sun May 11 21:16:39 2014 +0200 - - NEWS got updated again. This shows two inconsistencies how - Gerald's and my machine generate this file: - - Line width seems to be different - - We use different time zones. - Is there a way to make at least the first point consistent? - - Change-Id: I1f7ac0318eccc2fc5af94bfb8dc1f4e7410d4bcc - Reviewed-on: https://code.wireshark.org/review/1595 - Reviewed-by: Jörg Mayer - -commit 98f608c -Author: Pascal Quantin -Date: Sun May 11 15:07:25 2014 +0200 - - Identify client/server by their IP address and port number in follow streams dialog box - - This allows to properly identify hosts that use the same port number - - Change-Id: I93bf5b53e4df1d339fb06b372b90f88fce6785a0 - Reviewed-on: https://code.wireshark.org/review/1588 - Reviewed-by: Alexis La Goutte - -commit 44d83c2 -Author: Gerald Combs -Date: Sun May 11 09:47:09 2014 -0700 - - Don't build update-sminmpec by default when using CMake. - - Change-Id: Iccce783eeef23a90ca23900cf18e2d3d2620c767 - Reviewed-on: https://code.wireshark.org/review/1592 - Reviewed-by: Gerald Combs - -commit 4af23b0 -Author: Pascal Quantin -Date: Sat May 10 18:15:25 2014 +0200 - - Fix display of unidirectional follow TCP/UDP streams - - It was broken since 48285bb16b0a5655a47a8a59c34bc98e6bf4cb75 - While we are at it, display the streams in the same order as Qt version - - Change-Id: I12df1c033dd51b7a162adca3fd36b31af5c074a1 - Reviewed-on: https://code.wireshark.org/review/1587 - Reviewed-by: Pascal Quantin - -commit df2dc92 -Author: Peter Ross -Date: Sat May 10 11:35:41 2014 -0400 - - packet-dis: SISO-J Link 16 PDU dissector (SISO-STD-002) - - Change-Id: Id2ed7b7786705ad5fa345b0d1904cec508d3161e - Reviewed-on: https://code.wireshark.org/review/1552 - Reviewed-by: Michael Mann - -commit e2eea89 -Author: Pascal Quantin -Date: Sat May 10 17:02:24 2014 +0200 - - Small fixes to Follow Streams dialog box: - - get the right IPv6 client address - - display the right client to server string for UDP/SSL in Qt port - - Change-Id: I399cc38b8a32321198deccdd8e2ecd05b54e14db - Reviewed-on: https://code.wireshark.org/review/1586 - Reviewed-by: Alexis La Goutte - Reviewed-by: Pascal Quantin - -commit 5d98ab7 -Author: Evan Huus -Date: Sat May 10 23:30:48 2014 -0400 - - Simplify IPv4 address hashing - - Rather than allocate 4 bytes and use g_int_*, use GUINT_TO_POINTER and - g_direct_*. Should save some time/memory. - - Change-Id: Ie03d234703f68bb76131c5ddf17953d23bb54a0d - Reviewed-on: https://code.wireshark.org/review/1582 - Reviewed-by: Evan Huus - -commit 4ca79e9 -Author: Evan Huus -Date: Sat May 10 23:11:11 2014 -0400 - - Remove some dead emem code. - - Odds and ends that are no longer used anywhere in wireshark's codebase. It's - slowly going away. - - Also internalize some code (remove header prototypes and make static) some - functions that are only called internally to emem now. - - Change-Id: Ic1686a0f73c9ecaa333bc7b44a5a67a6a0369884 - Reviewed-on: https://code.wireshark.org/review/1581 - Reviewed-by: Evan Huus - -commit 8e37416 -Author: Evan Huus -Date: Sat May 10 22:28:41 2014 -0400 - - Fix leaking heuristic dissector names. - - I believe we started taking copies of these names for lua purposes, but we need - to free them afterwards. This accounts for about half the leaked blocks (though - only a tiny fraction of the memory) valgrind reported on a recent run. - - Change-Id: I74a656716cbf169905476f6c3e2cbcb0bd5ac0bc - Reviewed-on: https://code.wireshark.org/review/1580 - Reviewed-by: Evan Huus - -commit 2f023ea -Author: Gerald Combs -Date: Sun May 11 08:04:39 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-05-11] - - Change-Id: I877ce2410f90860e9da2144748f51b111235393f - Reviewed-on: https://code.wireshark.org/review/1589 - Reviewed-by: Evan Huus - -commit 06657ca -Author: Peter Ross -Date: Sun May 11 22:02:19 2014 +1000 - - packet-dis: fix typos - - Change-Id: I9a9cd3a03e174014e6ac677ff8f4e686de003d6e - Reviewed-on: https://code.wireshark.org/review/1585 - Reviewed-by: Pascal Quantin - -commit dc8357d -Author: Peter Ross -Date: Sun May 11 22:01:19 2014 +1000 - - packet-link16: fix typos - - Change-Id: I57d1a2dc1f3a078eb18c5799ca3bc0277eb1b2f9 - Reviewed-on: https://code.wireshark.org/review/1584 - Reviewed-by: Pascal Quantin - -commit d13e139 -Author: Michael Mann -Date: Sat May 10 22:07:27 2014 -0400 - - Interpret DHCPv6 option 18 as a byte array. RFC 3315, section 22.18 strongly suggests that any other such interpretation is inappropriate: - - The Interface-ID SHOULD be considered an opaque value, with policies - based on exact match only; that is, the Interface-ID SHOULD NOT be - internally parsed by the server. - - This reverts the "Cable Lab specific" functionality added in SVN rev 32928, git rev a541950ca80207eb50ad0cb7cee29a384e76d2b0. - - bug:9877 - Change-Id: Id4a8cbd01ab3cd6d5a0a44aa2066ea395190f51a - Reviewed-on: https://code.wireshark.org/review/1579 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit 43bb76a -Author: Marko Hrastovec -Date: Thu May 8 15:23:48 2014 +0200 - - Function to calculate twos complement is quicker and hopefully better understandable. - - Change-Id: I1948eeaf5fa5aa4a5ccd0f81be894f655907a4dc - Reviewed-on: https://code.wireshark.org/review/1570 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit dac0a0c -Author: Peter Ross -Date: Sat May 10 08:46:47 2014 -0400 - - packet-link16: Link 16 message dissector (MIL-STD-6016) - - Described in: - Robertson, W., and Ross, P., Extending the Wireshark Network Protocol Analyser - to Decode Link 16 Tactical Data Link Messages, Defence Science and Technology - Organisation, January 2014. DSTO-TN-1257. - - Change-Id: Ie4b1228ef112e56b3ab975d0c9254fa468b90cc2 - Reviewed-on: https://code.wireshark.org/review/1551 - Reviewed-by: Michael Mann - -commit 877942c -Author: Evan Huus -Date: Fri May 9 15:16:14 2014 +0000 - - Revert "Use g_ alloced memory (instead of emem) when printing fields. emem shouldn't be used for GUI functions." - - It's causing a few different test failures - I've tracked down at least one of them, but the others are weirder and will require more digging. - - This reverts commit 9edba650d11776fa1d5aefe4820890898380c1c2. - - Change-Id: I897f8cf1cfbb2a189b2054e5002f59757befa47f - Reviewed-on: https://code.wireshark.org/review/1575 - Reviewed-by: Evan Huus - -commit 532c3bc -Author: Evan Huus -Date: Fri May 9 09:42:12 2014 -0400 - - Initialize int_seid to 0 in btavdtp dissector - - Fixes uninitialized read in fuzzed capture. - - While I'm there, reorder the fields to reduce alignment-padding and shrink the - size of the sep_entry_t struct slightly. - - Bug:10095 - Change-Id: I3ace279e97874dbcfeb36f947c4c3428bd83e490 - Reviewed-on: https://code.wireshark.org/review/1574 - Reviewed-by: Evan Huus - -commit cfe3bfd -Author: AndersBroman -Date: Fri May 9 14:11:05 2014 +0200 - - Add -Q for QtShark and change the dumpcap command to use number of - packets. - - Change-Id: Ia4dc03e3722379d41804758feeafb655f26376e9 - Reviewed-on: https://code.wireshark.org/review/1573 - Reviewed-by: Anders Broman - -commit 3f247a5 -Author: Gerald Combs -Date: Mon May 5 11:50:24 2014 -0700 - - Be less aggressive about rebuilding sminmpec.c. - - Instead of forcing developers to generate sminmpec.c (which will have - different results depending on the presence or absence of a working - Internet connection) add sminmpec.c back to the repository. I'll add - it to the weekly update-numbers script so that it will be updated at - the same time as manuf, services, enterprise-numbers, and usb.c. - - Change the Autotools, CMake, and Nmake sminmpec.c target name to - "update-sminmpec". - - Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers - and sminmpec.c while we're here. - - Tested with an in-tree Autotools build and an out-of-tree CMake build. - - Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026 - Reviewed-on: https://code.wireshark.org/review/1516 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit e5cfd9e -Author: Guy Harris -Date: Fri May 9 00:50:51 2014 -0700 - - Squelch compiler warnings. - - Some are legitimate warnings - get_node_field_value() now returns a - value that the callers are expected to g_free(), so we'd better not - return a string constant. - - Change-Id: I937254316119044691c1d9a3da8c9615763e2e5a - Reviewed-on: https://code.wireshark.org/review/1571 - Reviewed-by: Guy Harris - -commit a1b1c8b -Author: Guy Harris -Date: Fri May 9 05:18:49 2014 +0000 - - Revert "Refactor Wiretap" - - This reverts commit 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a. - - This isn't building, and looks as if it requires significant work to fix. - - Change-Id: I622b1bb243e353e874883a302ab419532b7601f2 - Reviewed-on: https://code.wireshark.org/review/1568 - Reviewed-by: Guy Harris - -commit a651f3e -Author: Guy Harris -Date: Fri May 9 05:20:20 2014 +0000 - - Revert "Try to fix the build boot by changing the signature of catapult_dct2000_dump() to the declared one." - - This reverts commit f5a0d7e89753622bb11a6e27292c459a87ca9c67. - - There's a lot more work needed to fix this change; that's not the only broken file. I'm going to be reverting the whole thing. - - Change-Id: I8e9bb3902f7e398ccb71c66711869c3dd338271c - Reviewed-on: https://code.wireshark.org/review/1569 - Reviewed-by: Guy Harris - -commit 9edba65 -Author: Michael Mann -Date: Thu May 8 22:33:29 2014 -0400 - - Use g_ alloced memory (instead of emem) when printing fields. emem shouldn't be used for GUI functions. - - emem was exposed because of its memory limits trying to output PDML for a very large byte field in a capture file. - - bug:10081 - Change-Id: I6346dfdfb5f6381e16761a99291c4be7851185d9 - Reviewed-on: https://code.wireshark.org/review/1566 - Reviewed-by: Anders Broman - -commit f5a0d7e -Author: AndersBroman -Date: Fri May 9 06:27:25 2014 +0200 - - Try to fix the build boot by changing the signature of - catapult_dct2000_dump() to the declared one. - - Change-Id: Ib9b38fb35ace1e858e8105a54a192c044899b69a - Reviewed-on: https://code.wireshark.org/review/1567 - Reviewed-by: Anders Broman - -commit 1abeb27 -Author: Michael Mann -Date: Thu May 8 22:59:19 2014 -0400 - - Refactor Wiretap - - Start of refactoring Wiretap and breaking structures down into "generally useful fields for dissection" and "capture specific". Since this in intended as a "base" for Wiretap and Filetap, the "wft" prefix is used for "common" functionality. - - The "architectural" changes can be found in cfile.h, wtap.h, wtap-int.h and (new file) wftap-int.h. Most of the other (painstaking) changes were really just the result of compiling those new architecture changes. - - bug:9607 - Change-Id: Ife858a61760d7a8a03be073546c0e7e582cab2ae - Reviewed-on: https://code.wireshark.org/review/1485 - Reviewed-by: Michael Mann - -commit aa3a968 -Author: AndersBroman -Date: Thu May 8 21:32:36 2014 +0200 - - Profiling show that g_log() takes a lot of CPU even when logging isn't - active. - - Change-Id: I242f8e98a77861c0174e432c7026964babae7299 - Reviewed-on: https://code.wireshark.org/review/1565 - Reviewed-by: Anders Broman - -commit 379c9f2 -Author: AndersBroman -Date: Thu May 8 21:25:13 2014 +0200 - - Add a command option for dumpcap. - - Change-Id: Ic9a4b35f5a6245e0100f93c890622674e44413c6 - Reviewed-on: https://code.wireshark.org/review/1564 - Reviewed-by: Anders Broman - -commit d0cf941 -Author: Alexis La Goutte -Date: Thu May 8 17:29:36 2014 +0200 - - Fix a whitespace after IKE_AUTH - - Change-Id: Id58da1f546ee5dff72cbc1bc012095ad0b9a9be5 - Reviewed-on: https://code.wireshark.org/review/1562 - Reviewed-by: Pascal Quantin - -commit a8456cc -Author: Pascal Quantin -Date: Thu May 8 17:37:00 2014 +0200 - - MAC LTE: add a comment explaining why g_hash_table_lookup_extended is used - - Change-Id: I9d7310359d5972c603396a802abc2a82b46fe57e - Reviewed-on: https://code.wireshark.org/review/1563 - Reviewed-by: Pascal Quantin - -commit e46d144 -Author: Anish Bhatt -Date: Mon May 5 17:30:03 2014 -0700 - - Small fix to how number of traffic classes is displayed for ETS. - Used proto_tree_add_uint_format_valu instead of append_text - - Change-Id: I6d3d6049655c0573b66249ce93ea850c15b1cb7b - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1522 - Reviewed-by: Evan Huus - -commit 8070155 -Author: Martin Mathieson -Date: Thu May 8 14:47:51 2014 +0100 - - Remove trailing whitespace - - Change-Id: Idf8f9aba4e020a278e7b779de13ecdbcfcc39776 - Reviewed-on: https://code.wireshark.org/review/1560 - Reviewed-by: Martin Mathieson - -commit 75bbbc2 -Author: Martin Mathieson -Date: Thu May 8 11:19:29 2014 +0100 - - Prettify a little, by showing ike2 flag values in flag root, and showing MID and flags in Info column - - Change-Id: I70884c933b3d82dfb7168352c5bed925f7e89e11 - Reviewed-on: https://code.wireshark.org/review/1554 - Reviewed-by: Martin Mathieson - -commit a7ac739 -Author: Pascal Quantin -Date: Thu May 8 14:48:47 2014 +0200 - - MAC LTE: fix copy/paste error - - Change-Id: I59fd7745d454357d3eeaf48ed8700581a8aa0018 - Reviewed-on: https://code.wireshark.org/review/1556 - Reviewed-by: Evan Huus - -commit f058946 -Author: Peter Ross -Date: Wed Oct 16 10:00:03 2013 +1100 - - packet-dis: correct 'Terminal Primary Mode' and 'Sync State' enumeration values - - SISO-STD-002 Standard for Link 16 Simulations, June 2006: - http://www.sisostds.org/DigitalLibrary.aspx?Command=Core_Download&EntryId=30265 - - Change-Id: Ic06c5f63b2da605cc3e3b14d001c81f87b98cdb4 - Reviewed-on: https://code.wireshark.org/review/1553 - Reviewed-by: Michael Mann - -commit 54be3ea -Author: Pascal Quantin -Date: Thu May 8 12:38:34 2014 +0200 - - TCAP: set a fence on info column after calling sub dissector - - Bug: 10091 - Change-Id: I7af57345e31209fb4dd02cdab7960c44c69dc0a5 - Reviewed-on: https://code.wireshark.org/review/1555 - Reviewed-by: Anders Broman - -commit 4eaf1c8 -Author: Pascal Quantin -Date: Thu May 8 00:47:37 2014 +0200 - - MAC LTE: get extended BSR sizes configuration from RRC - - Change-Id: I09afa7c17be5e0ed902a2c2f5ea9989df3380615 - Reviewed-on: https://code.wireshark.org/review/1550 - Reviewed-by: Anders Broman - -commit 8352880 -Author: Evan Huus -Date: Wed May 7 16:24:28 2014 -0400 - - Recognize kafka's ConsumerMetadata message type - - actual dissection still TODO - - Change-Id: I58e54ca117a9ccd5d6af34d18f9277afd009aa95 - Reviewed-on: https://code.wireshark.org/review/1547 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - -commit 078daeb -Author: Michael Mann -Date: Sun May 4 17:20:34 2014 -0400 - - Populate heuristic extension list during initialization and not during each call to heuristic_uses_extension. - - Change-Id: I7e484de65c49060793a91cc11cb211effa2006db - Reviewed-on: https://code.wireshark.org/review/1494 - Reviewed-by: Michael Mann - -commit 18ee622 -Author: Jaap Keuter -Date: Thu May 8 00:20:03 2014 +0200 - - Add handling of TEXT and HTML types. - - Change-Id: Ife125be2c5043cc6cc1b879714671d9973c8214b - Reviewed-on: https://code.wireshark.org/review/1549 - Reviewed-by: Michael Mann - -commit f3b6316 -Author: Evan Huus -Date: Tue May 6 21:45:16 2014 -0400 - - Use a strong hash function for ethernet addresses. - - The capture for bug 10078 caused the buildbot to time out; callgrind revealed an - enourmous amount of time being spent looking up ethernet addresses. The previous - code cast each address (6 bytes) to a guint64 (8 bytes) then used the built-in - g_int64_hash. Unfortunately, g_int64_hash is an *awful* hash function - it - produces a 4-byte hash by simply discarding the upper 4 bytes of its input. - - For the capture file in question this strategy (which effectively ignores the - upper two bytes of each ethernet address) produced an astounding number of - collisions, leading to the terrible running-time. - - Use wmem_strong_hash directly on the 6-byte address instead, which saves us a - bunch of useless casting and bit-twiddling and produces a much better hash - distribution. This shaves 20% off the time to tshark-with-tree the capture file - in question *despite* a substantially more expensive hash function - (wmem_strong_hash is not exactly fast compared to g_int64_hash). - - Bug:10078 - Change-Id: I8e81cbc478e6394ec3a8efe39eec08f680a55609 - Reviewed-on: https://code.wireshark.org/review/1543 - Reviewed-by: Anders Broman - -commit b07195a -Author: AndersBroman -Date: Wed May 7 07:49:23 2014 +0200 - - Fix a typo. - - Change-Id: I17171157350f985506ef8498c88814e319396bd6 - Reviewed-on: https://code.wireshark.org/review/1545 - Reviewed-by: Anders Broman - -commit 3430987 -Author: Jeff Morriss -Date: Tue May 6 17:12:13 2014 -0400 - - Error out if someone passes the address of a pointer to a *_string to VALS() or RVALS(). - - Change-Id: I85021b1cba151c16bf0a2d30169cf3dec77780f5 - Reviewed-on: https://code.wireshark.org/review/1540 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 24ca06f -Author: AndersBroman -Date: Wed May 7 07:34:03 2014 +0200 - - Make it pass the new check in checkapi - "Error out if someone passes the address of a pointer to a *_string to - VALS() or RVALS()." - - Change-Id: I1b5b9bbf512f8fdfaab5febea28db2c51d49c48c - Reviewed-on: https://code.wireshark.org/review/1544 - Reviewed-by: Anders Broman - -commit 9b78301 -Author: Anish Bhatt -Date: Tue May 6 02:27:39 2014 -0700 - - Further LLDP dissection cleanup - - Change-Id: I75f4ed401f63e993a2aefa1c289fd48fa00b46e2 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1528 - Reviewed-by: Anders Broman - -commit 45b6780 -Author: Alexis La Goutte -Date: Fri May 2 12:36:53 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I8727e74d0818f759f3c58c6f156b0b4e36eb7218 - Reviewed-on: https://code.wireshark.org/review/1465 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 8c167e1 -Author: Alexis La Goutte -Date: Tue May 6 21:11:02 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I3c54712108978d1bafe2b5da96e6a7d3d41948b5 - Reviewed-on: https://code.wireshark.org/review/1535 - Reviewed-by: Evan Huus - -commit 6011d2e -Author: Jeff Morriss -Date: Tue May 6 17:53:28 2014 -0400 - - "Reserved" is not a valid 'fieldconvert' value for an hf. - - Fixes (for real this time, I swear!) the fuzz failure reported in - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10079 - - Bug: 10079 - Change-Id: I2a73ef32d704fc9ecc71fd983fc09cf4f9194b2e - Reviewed-on: https://code.wireshark.org/review/1542 - Reviewed-by: Sean Onufer Stalley - Reviewed-by: Jeff Morriss - -commit 398c81a -Author: Pascal Quantin -Date: Tue May 6 23:41:26 2014 +0200 - - PDCP LTE: add identification of ZUC based security algorithms - - Change-Id: I63a66bc5822ac04f1a2bccd3a15adac30b65e397 - Reviewed-on: https://code.wireshark.org/review/1541 - Reviewed-by: Pascal Quantin - -commit 2e16091 -Author: Jeff Morriss -Date: Tue May 6 17:15:56 2014 -0400 - - Don't pass the address of a pointer to a *_string to VALS() or RVALS(). - - This is a followup to Ifc8d6895cc33ad1f00386a3e59926322bd501125; the MQ sample - captures I have don't seg-fault on this but the code was stillw wrong. - - Change-Id: Ic689c06836b823a15217281d67b33580fd8e9823 - Reviewed-on: https://code.wireshark.org/review/1539 - Reviewed-by: Pascal Quantin - -commit ec5ba07 -Author: Evan Huus -Date: Tue May 6 10:19:02 2014 -0400 - - Tweak ber_choice flow control. - - There appear to be a couple of bugs in the flow control of this function (which - is very confusing), at least one of which is leading to a buffer overrun. See - the bug comments for more details and guesses of what the correct thing to do - is. - - Bug:9579 - Change-Id: Ibd3077792c7689a715ea53e8bf8c7a561c67389f - Reviewed-on: https://code.wireshark.org/review/1530 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit d3a1cde -Author: Sean O. Stalley -Date: Tue May 6 12:30:51 2014 -0700 - - fix dissect_usb_endpoint_descriptor - - dissect_usb_endpoint_descriptor uses usb_trans_info, but the signature - contains a _U_ macro. - - Change-Id: I87fe6d91d5f8cf15926bf2dfd6381a256cd0785d - Reviewed-on: https://code.wireshark.org/review/1537 - Reviewed-by: Pascal Quantin - -commit ef24d48 -Author: Jeff Morriss -Date: Tue May 6 15:51:57 2014 -0400 - - VALS() doesn't take the address of a (pointer to a) value_string, it takes - a pointer to a value_string. - - Fixes the fuzz failure reported in - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10079 - - Bug: 10079 - Change-Id: Ifc8d6895cc33ad1f00386a3e59926322bd501125 - Reviewed-on: https://code.wireshark.org/review/1538 - Reviewed-by: Anders Broman - -commit 9a51c1e -Author: Sean O. Stalley -Date: Tue May 6 12:12:09 2014 -0700 - - Added check for MAUSB length being multiple of a DWORD. - - MAUSB Packets should always be sent in DWORDs. This means that the - only valid values for the length field are multiples of 4. - This patch adds an expert info check to flag length fields that are - multiples of 4. - - Change-Id: Ifb793f82aed4c9fb09a12f6ea97087733b58d14a - Reviewed-on: https://code.wireshark.org/review/1536 - Reviewed-by: Pascal Quantin - -commit d73fc0b -Author: Alexis La Goutte -Date: Tue May 6 21:10:21 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: Ib4bbf1fa048cde14baf10bd31342b3c75e10b544 - Reviewed-on: https://code.wireshark.org/review/1534 - Reviewed-by: Anders Broman - -commit c0fbe0d -Author: Evan Huus -Date: Tue May 6 14:26:18 2014 -0400 - - Update kafka dissector closer to latest spec - - Some new error values, some message types that have been "undocumented" as - internal-only, etc. - - Change-Id: Iff15dd67b188c9e2745964d4916b22e0bea4243d - Reviewed-on: https://code.wireshark.org/review/1533 - Reviewed-by: Anders Broman - -commit 3851e09 -Author: Evan Huus -Date: Tue May 6 12:03:22 2014 -0400 - - Fix macro parens to avoid unexpected behaviour - - Based on Icfe1e5477043dd695fd9b02b677ef29ac3fa8866 but rebased and simplified. - - Change-Id: I9b7266e2fdcb58f38115250d785637cd585c69e0 - Reviewed-on: https://code.wireshark.org/review/1532 - Reviewed-by: Evan Huus - -commit 910ab7b -Author: Alexis La Goutte -Date: Mon Mar 24 11:10:48 2014 +0100 - - Enhance Microsoft NLB dissection - - Rewrite from Microsoft Network Monitor dissector - - Based from NPL dissector - https://nmparsers.codeplex.com/SourceControl/latest#Develop_Branch/NPL/Windows/nlb.npl - - No yet support type Reliable Protocol (no found pcap with this pcap) - - Change-Id: Ic5aa68798a629f9e0ad15337b192a1fe180ae62c - Reviewed-on: https://code.wireshark.org/review/1464 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 037fb82 -Author: David Ameiss -Date: Tue May 6 09:18:29 2014 -0500 - - Minor changes to LBM dissectors: - (1) Display sequence numbers in both decimal and hex - (2) Fix an inconsistency in field naming between LBT-RU and LBT-RM. - - bug:9718 - Change-Id: I967062d6aa00ea9a3db51db94e56d37e68e642d3 - Reviewed-on: https://code.wireshark.org/review/1531 - Reviewed-by: Evan Huus - -commit 4e82d2e -Author: Peter Wu -Date: Tue May 6 15:45:41 2014 +0200 - - sigcomp: Add buffer check to STATE-ACCESS - - Two conditions were not checked, state_length == 0 && state_begin != 0 - and the boundaries of the state buffer. The former is not a big deal, - but the second issue causes a buffer overrun (detected by ASAN). - - The buffer size is supposed to be stored in the state buffer, that was - not the case for the initial two SIP SDP and Presence state buffers. - Fix a typo for presence_buf zero-ing while at it. - - Bug: 9601 - Change-Id: I41dde83185da60b670cca010ecc7b2a2aaaedeb9 - Reviewed-on: https://code.wireshark.org/review/1529 - Reviewed-by: Anders Broman - -commit a915de5 -Author: Anish Bhatt -Date: Tue May 6 00:45:42 2014 -0700 - - Fix build failures caused by lldp cleanup - - Change-Id: I4d4aeb71720f02e4a6f4a8e5f803fd63dc7aed81 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1524 - Reviewed-by: Anders Broman - -commit da00889 -Author: AndersBroman -Date: Tue May 6 09:55:59 2014 +0200 - - Add a cast to make MSVC happy. - - Change-Id: Iee901ae56c796007821c1754056c61954e8a342f - Reviewed-on: https://code.wireshark.org/review/1526 - Reviewed-by: Anders Broman - -commit 72662c2 -Author: AndersBroman -Date: Tue May 6 09:47:08 2014 +0200 - - Try to fix - packet-mysql.c(1446) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - - Change-Id: Ie0b2e916e0d15287f5a3ededc404b678b45600d8 - Reviewed-on: https://code.wireshark.org/review/1525 - Reviewed-by: Anders Broman - -commit a4a851c -Author: Jess Balint -Date: Sat Apr 5 14:44:26 2014 -0400 - - MySQL protocol dissector: Add support for sessiontracking in MySQL 5.7.4. Bug 9948. - - Change-Id: Ia451bfff571c4da280ccf76b1d5ac9dfcfead78c - Signed-off-by: Alexis La Goutte - Reviewed-on: https://code.wireshark.org/review/916 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit ecc6b8d -Author: Jakub Zawadzki -Date: Mon May 5 22:22:29 2014 +0200 - - Move common part of col_append_fstr, col_append_sep_fstr to seperate fnction. - - From the comments I think it was intended - but there were no G_VA_COPY macro in glib (?). - - Change-Id: Ic1e1d4a5ac9e5b8f27f25487416c0ededeed2093 - Reviewed-on: https://code.wireshark.org/review/1518 - Reviewed-by: Anders Broman - -commit 209f82a -Author: Anish Bhatt -Date: Mon May 5 00:49:54 2014 -0700 - - Cleanup LLDP dissection, convert add_text to tree items. - Just started on this, more changes incoming - - Change-Id: Idc88442f382cea1f29f05edb991b920488cfc113 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1502 - Reviewed-by: Anders Broman - -commit be3a153 -Author: Jakub Zawadzki -Date: Mon May 5 21:53:01 2014 +0200 - - tcp: move & optimize printing tcp flags to seperate routine. - - The formatting routine is quite simple so it can be replaced with - g_stpcpy() and still keeping it clean. - - Change-Id: Ifbab1dc1140ee271d39bbbfb7586cfda6ded5c54 - Reviewed-on: https://code.wireshark.org/review/1517 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit f764765 -Author: Evan Huus -Date: Mon May 5 22:25:27 2014 -0400 - - Increase the work used to time wmem allocators - - It appears that on some platforms the timer underlying g_test_timer() is - relatively low-precision, so the small amount of work that we were previously - doing was not enough for the timer to provide a useful value. - - Bumping the amount of work should provide more meaningful values, and the whole - timing step still takes only a few seconds. - - Change-Id: Idce1386eaa33add845d9a2758b0beb72bbf370d6 - Reviewed-on: https://code.wireshark.org/review/1523 - Reviewed-by: Evan Huus - -commit 542b4e6 -Author: Pascal Quantin -Date: Mon May 5 22:32:33 2014 +0200 - - MAC/RLC/PDCP LTE: replace obsolete APIs - - Change-Id: I5368cc7b1986c6a87cb70a3fd3cb5e589d73f870 - Reviewed-on: https://code.wireshark.org/review/1520 - Reviewed-by: Martin Mathieson - -commit eecc135 -Author: Sean O. Stalley -Date: Mon May 5 13:26:23 2014 -0700 - - Added parentheses to macros to prevent unexpected behavior - - Masks for padding now have an additional parenthesis to ensure - proper operator precedence. - - Per the request of Evan Huus; See comment in Change-Id: - I3ad4e1beb891f9c2835adff320095e7e738241eb, Patch Set 10. - - Change-Id: Ic8878f870b58cd272675b4d6c3658a029bb67984 - Reviewed-on: https://code.wireshark.org/review/1519 - Reviewed-by: Alexis La Goutte - -commit 2975593 -Author: Guy Harris -Date: Mon May 5 11:22:25 2014 -0700 - - libnl is a Linux-specific library; don't offer libnl support except on Linux. - - Change-Id: I79a98d1f9b3559fe76feed1038d673dd3424409c - Reviewed-on: https://code.wireshark.org/review/1515 - Reviewed-by: Guy Harris - -commit e35ccba -Author: Alexis La Goutte -Date: Mon May 5 18:12:32 2014 +0200 - - Add RFC6463 (Runtime Local Mobility Anchor (LMA) Assignment Support - for Proxy Mobile IPv6) MIP6 Mobile Option - - Change-Id: I650cb33fcf083bd8826a702cb975295518012292 - Reviewed-on: https://code.wireshark.org/review/1511 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 2aa66aa -Author: Alexis La Goutte -Date: Fri May 2 16:15:06 2014 +0200 - - SSH Dissector : Remove ssh_proto_tree_add_item (No longer needed) - - Change-Id: I6d227ad7a4ddfab9d2cf18a3148700a6bd6dd321 - Reviewed-on: https://code.wireshark.org/review/1512 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit 09a9c86 -Author: AndersBroman -Date: Mon May 5 17:37:12 2014 +0200 - - Add the possibillity to add a string to the termination id. - - Change-Id: I3b48b28273a8c1a1558045d2a4ab5104160840de - Reviewed-on: https://code.wireshark.org/review/1510 - Reviewed-by: Anders Broman - -commit 326202f -Author: Evan Huus -Date: Mon May 5 11:25:25 2014 -0400 - - Solaris doesn't like anonymous unions - - so give it a name - - Change-Id: Iaf9a6f8cb58a565673f53696f7e5d1698e6eae0f - Reviewed-on: https://code.wireshark.org/review/1509 - Reviewed-by: Evan Huus - -commit 33586a0 -Author: Alexis La Goutte -Date: Mon May 5 13:33:59 2014 +0200 - - OpenFlow 1.4 OXM field OXM_OF_IPV6_ND_SLL incorrectly dissected (128 bits read instead of 48) - - Dissection of OXM_OF_IPV6_ND_SLL triggers "malformed packet" comment in packet list since it makes dissecting of further OXM fields impossible. - - It is possible that similar issue will be with OXM_OF_IPV6_ND_TLL since its dissecting is basically the same. - - Issue found by Viktor - Closed-bug:10011 - - Change-Id: I21b85cc0572ffdb8bb8b73cfae0db1d72219fe4b - Reviewed-on: https://code.wireshark.org/review/1505 - Reviewed-by: Anders Broman - -commit ce282a7 -Author: Alexis La Goutte -Date: Mon May 5 13:33:59 2014 +0200 - - OpenFlow 1.3 OXM field OXM_OF_IPV6_ND_SLL incorrectly dissected (128 bits read instead of 48) - - Dissection of OXM_OF_IPV6_ND_SLL triggers "malformed packet" comment in packet list since it makes dissecting of further OXM fields impossible. - - It is possible that similar issue will be with OXM_OF_IPV6_ND_TLL since its dissecting is basically the same. - - Issue found by Viktor - Closed-bug:10011 - - Change-Id: I13893710ad4028669e454c6f8485f719b62bcaab - Reviewed-on: https://code.wireshark.org/review/1504 - Reviewed-by: Anders Broman - -commit 0523c2d -Author: Evan Huus -Date: Mon May 5 10:49:03 2014 -0400 - - Fix build with older compilers - - The struct literal syntax {0} does not appear to be universally supported - use - memset instead. - - Change-Id: If70d475cf3d7a582c43dcc879cefebc9aef0a99e - Reviewed-on: https://code.wireshark.org/review/1508 - Reviewed-by: Evan Huus - -commit a1ddde9 -Author: Jan Seda -Date: Thu May 1 17:23:07 2014 +0200 - - SSH dissector: fix MAC length calculation for recent OpenSSH features - - Also, show the packet length part of the encrypted packet. The length may - be encrypted (typical) or not (-etm modes and GCM mode). When not - encrypted, show as a number. - - Bug:10066 - Change-Id: I8c3a943b1b527b326b662e71f07ac6157684d5d9 - Reviewed-on: https://code.wireshark.org/review/1462 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit ac99cfd -Author: Sean O. Stalley -Date: Wed Feb 5 16:03:15 2014 -0800 - - Media Agnostic USB Packet Dissector - - This dissector dissects MA USB Packets. It is capable of dissecting - Media Agnostic packets both in a TCP stream as well as packets sent - over SNAP (referred to in spec as "Raw Ethernet" mode). - - Change-Id: I3ad4e1beb891f9c2835adff320095e7e738241eb - Signed-off-by: Sean O. Stalley - Reviewed-on: https://code.wireshark.org/review/1252 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 9361938 -Author: Evan Huus -Date: Mon May 5 09:03:46 2014 -0400 - - Fix dead assignment found by clang in test code - - Change-Id: Ie78769bfd8034f6c2ee7d9e26a209d650cedb98d - Reviewed-on: https://code.wireshark.org/review/1507 - Reviewed-by: Alexis La Goutte - -commit a0b76c9 -Author: Alexis La Goutte -Date: Mon May 5 14:03:25 2014 +0200 - - Allow IPv6 Mobility Option Service Selection with option length = 1 - - According to RFC 5149 (http://tools.ietf.org/html/rfc5149#section-3), the Service Selection mobility option length must be between 1 and 255. - - Discovered while working on Pcap.Net, http://pcapdot.net. - Found by Boaz - - Change-Id: I6d9e9eba8c45b5a6c38523182069ab0f236d85bb - Closed-bug:10045 - Reviewed-on: https://code.wireshark.org/review/1506 - Reviewed-by: Michael Mann - -commit 402bbcb -Author: Evan Huus -Date: Mon May 5 07:30:43 2014 -0400 - - Reduce wmem fast-block fuzz rounds even further - - Follow-up to g19e650f43adf23b0aa92821bff0cc389643944f6 since the fuzz-bot is - still failing. - - Change-Id: I2d05a861b0edf50ce734b682e6e3e33729bf6771 - Reviewed-on: https://code.wireshark.org/review/1503 - Reviewed-by: Evan Huus - -commit 491a321 -Author: Alexis La Goutte -Date: Mon May 5 08:44:27 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I35ed4c0ecc28dee57d7a4cac8ddbf43d16b39677 - Reviewed-on: https://code.wireshark.org/review/1501 - Reviewed-by: Anders Broman - -commit 56b8c9e -Author: Alexis La Goutte -Date: Mon May 5 08:42:33 2014 +0200 - - Fix indent (use tab) and modelines - - Change-Id: Ibff9e0564f2786e8a51b8884724c322725fdf147 - Reviewed-on: https://code.wireshark.org/review/1500 - Reviewed-by: Anders Broman - -commit 16dfe11 -Author: Evan Huus -Date: Mon May 5 00:06:51 2014 -0400 - - Several tweaks to fast block allocator - - - manually inline wmem_block_fast_add_to_block_list, it was only two lines and - only called twice, so the function boilerplate was outweighing the abstraction - - - change free_all to release all but one block to the OS immediately, making gc - a no-op; the alloc logic doesn't reuse later blocks anyways, so this was - effectively a leak - - Change-Id: I033fbb2f3d87e58c7346cba10f2c710eaaa49e9f - Reviewed-on: https://code.wireshark.org/review/1499 - Reviewed-by: Anders Broman - -commit bf3fbb3 -Author: Michael Mann -Date: Sun May 4 09:12:46 2014 -0400 - - Add dissector for 3GPP2 A21/S102 protocol. - - Change-Id: I611c217e1eec47da7427c0317ed9416b4c52411a - Reviewed-on: https://code.wireshark.org/review/1487 - Reviewed-by: Anders Broman - -commit 984e522 -Author: Jakub Zawadzki -Date: Sun May 4 23:06:54 2014 +0200 - - Fix possible buffer overflow in col_append_sep_fstr() - - After appending separator it might happen that len > max_len, in such case - g_vsnprintf() will overflow the col_buf buffer. - - Change-Id: Ic5ff49d30e30509e835165c4cc7e72e31f92fd5f - Reviewed-on: https://code.wireshark.org/review/1493 - Reviewed-by: Evan Huus - -commit f13bbf2 -Author: Jakub Zawadzki -Date: Sun May 4 23:55:18 2014 +0200 - - Fast block allocator: make wmem_block_fast_hdr_t single linked list. - - Double linked list was required by jumbo allocation. - No support for jumbo -> no need for double linked list -> have only 'next' pointer in header. - - Change-Id: I48a0f468ebba9db3a63548d8e7307b6424c759ed - Reviewed-on: https://code.wireshark.org/review/1495 - Reviewed-by: Evan Huus - -commit 8f2f727 -Author: Guy Harris -Date: Sun May 4 20:11:45 2014 -0700 - - Not finding a non-required package is *NOT* an error! - - If you think not finding a package that the user specifies should be - used should be an error, please fix bug 10074 first - not finding a - package that the user *didn't* specify should be used or shouldn't be - used should not be an error. - - Change-Id: I62aba4309e227352e114f2d291aaa74dba78840f - Reviewed-on: https://code.wireshark.org/review/1498 - Reviewed-by: Guy Harris - -commit 0b0c98a -Author: Guy Harris -Date: Sun May 4 20:06:43 2014 -0700 - - set() *undefines* the variable; a value must be specified. - - When setting the XXX_REQUIRED variables, set them to TRUE. - - Change-Id: I1591ffe221e15d65cb64516a45e9dc8461051373 - Reviewed-on: https://code.wireshark.org/review/1497 - Reviewed-by: Guy Harris - -commit 19e650f -Author: Evan Huus -Date: Sun May 4 18:23:08 2014 -0400 - - Fuzz fewer iterations of the fast block allocator - - I believe the XP buildbot failures are simply running out of memory, so - hopefully reducing the number of iterations should be enough to let it finish - reliably. - - Change-Id: I40af789d528c2623e95f153529205b5e617c6e02 - Reviewed-on: https://code.wireshark.org/review/1496 - Reviewed-by: Evan Huus - -commit 6c7ab45 -Author: Pascal Quantin -Date: Sun May 4 22:24:33 2014 +0200 - - MAC LTE: fix compilation error - - error: assignment discards 'const' qualifier from pointer target type [-Werror] - - also add the missing definition of hf_mac_lte_bsr_size_median - - Change-Id: I31e172a16b4afd59ba8cf5a9b281bbeaf15b6c56 - Reviewed-on: https://code.wireshark.org/review/1492 - Reviewed-by: Pascal Quantin - -commit 1d1730f -Author: AndersBroman -Date: Sun May 4 21:20:54 2014 +0200 - - Update some soft-deprecated APIs. - - Change-Id: I0e255e72dd4cd9a94a4f92af409c4b34c0a266ed - Reviewed-on: https://code.wireshark.org/review/1491 - Reviewed-by: Anders Broman - -commit e7a51d7 -Author: Gerald Combs -Date: Sun May 4 08:04:30 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-05-04] - - Change-Id: Idd150c8d2a7f4e5368ca80c35ae920fb40944f1d - Reviewed-on: https://code.wireshark.org/review/1488 - Reviewed-by: Gerald Combs - -commit bdfe17f -Author: David Ameiss -Date: Tue Apr 8 17:13:45 2014 -0500 - - GUI modules for LBM aka 29West dissectors. - - bug:9718 - Change-Id: I05330d8a2475ad0d238723d444f3d98bdbd7be39 - Reviewed-on: https://code.wireshark.org/review/1041 - Reviewed-by: Michael Mann - -commit 9606ec5 -Author: Michael Mann -Date: Sat May 3 21:11:31 2014 -0400 - - Remove enabling HAVE_SNOW3G by default - - Change-Id: Ie1af436b763ec762a41af0bdfc1f3ec6adea2bc1 - Reviewed-on: https://code.wireshark.org/review/1486 - Reviewed-by: Michael Mann - -commit 1ddce8b -Author: Martin Mathieson -Date: Sat May 3 22:31:02 2014 +0100 - - Have RRC tell MAC about RAPID ranges so it can show for RAPIDs seen - - Change-Id: Ie9adbe3015c63e53997068053b6f8ec224a5bf82 - Reviewed-on: https://code.wireshark.org/review/1474 - Reviewed-by: Martin Mathieson - -commit 32e3e41 -Author: Martin Mathieson -Date: Sat May 3 22:36:56 2014 +0100 - - Update TODO comments - - Change-Id: I4ea940be5b65c041bdd330bfc2bdbe9a00360d00 - Reviewed-on: https://code.wireshark.org/review/1475 - Reviewed-by: Martin Mathieson - -commit a394d44 -Author: Alexis La Goutte -Date: Fri May 2 17:24:08 2014 +0200 - - LLDP: Remove packet-lldp.h - - Change-Id: If6d1fd1b7961f975447db43f616e016f70ca5cb8 - Reviewed-on: https://code.wireshark.org/review/1473 - Reviewed-by: Evan Huus - -commit 59a4a85 -Author: Alexis La Goutte -Date: Fri May 2 16:40:04 2014 +0200 - - ECP dissector Remove packet-lldp.h depends - * Fix indent (use tabs) - * Use VDP function for end VTPDU - - Change-Id: I93216ac5b304dc3ba78cbe830e5d12589c138eb5 - Reviewed-on: https://code.wireshark.org/review/1472 - Reviewed-by: Evan Huus - -commit b7d6055 -Author: Alexis La Goutte -Date: Fri May 2 16:41:53 2014 +0200 - - Move value string of LLDP OUI to epan/oui.h - - Change-Id: I3d9ddbae60631c958880574e7e441a931db3492d - Reviewed-on: https://code.wireshark.org/review/1471 - Reviewed-by: Evan Huus - -commit 5f23901 -Author: Jakub Zawadzki -Date: Tue Apr 29 08:57:40 2014 +0200 - - wmem: add new simple block allocator, use it in packet-scope. - - For packet-scope allocation, there's no need to support realloc(), free() - cause memory will be garbage collected after packet dissection. - - (and this allocator is much faster than full block allocator). - - Change-Id: I73fdf708c3077f48f55bdcc71f4fa859e4ac2335 - Reviewed-on: https://code.wireshark.org/review/1428 - Reviewed-by: Anders Broman - -commit fa84054 -Author: Alexis La Goutte -Date: Thu May 1 19:04:13 2014 +0200 - - Enhance display of SPDY packet (Remove some information from column) - - Fix also tvb_length / tvb_length_remaining soft warning - - Change-Id: I3fd8f3a842fa84273b84ae36317e2c3fbdca076d - Reviewed-on: https://code.wireshark.org/review/1461 - Reviewed-by: Anders Broman - -commit 13e8983 -Author: Alexis La Goutte -Date: Fri May 2 16:19:08 2014 +0200 - - Add modelines info - - Change-Id: I35bed12af5e0a2da9daf2fb5b6dfdfe05377549e - Reviewed-on: https://code.wireshark.org/review/1470 - Reviewed-by: Anders Broman - -commit c27ad66 -Author: Alexis La Goutte -Date: Fri May 2 16:18:49 2014 +0200 - - Add modelines info - - Change-Id: I82f841e0ee9e00c69894d8c4c67f581278c87546 - Reviewed-on: https://code.wireshark.org/review/1469 - Reviewed-by: Anders Broman - -commit abc3879 -Author: Evan Huus -Date: Fri May 2 10:09:13 2014 -0400 - - Reintroduce wmem_allocator_force_new - - We now have to call wmem_init in order to randomly seed the values for wmem_map. - This means we can no longer rely on the lack of override, so we have to force - the right allocator type when testing/timing the allocators themselves. - - Change-Id: I005034465b0a98f19876899b96ef65b3e4b1d759 - Reviewed-on: https://code.wireshark.org/review/1468 - Reviewed-by: Anders Broman - -commit f181756 -Author: Evan Huus -Date: Fri May 2 09:53:33 2014 -0400 - - Optimize wmem_strbuf_grow. - - As suggested by Anders, in the case of repeated calls to wmem_strbuf_append_c - (and other functions which append very little data) the growth check was a - substantial portion of the over-all running time. By short-circuiting the check - in the case where growth isn't needed (as opposed to letting it fall-through - naturally) we shave ~25% off the cost of such repeated calls in my benchmarks. - - The function (wmem_strbuf_grow) is inline, so the compiler should be able to - optimize each caller individually for the short-circuit. - - Change-Id: I76419020f4d8fa675906eb77798969b6c61c7732 - Reviewed-on: https://code.wireshark.org/review/1467 - Reviewed-by: Anders Broman - -commit 34fa169 -Author: Marcel Essig -Date: Fri Apr 25 08:16:12 2014 +0200 - - Add a new Dissector for HiSLIP - - Change-Id: I87aaf4c8093ee8013a661aa8af81dba63eaa7086 - Signed-off-by: Alexis La Goutte - Reviewed-on: https://code.wireshark.org/review/1337 - -commit 2b2d8a9 -Author: Alexis La Goutte -Date: Fri May 2 14:31:23 2014 +0200 - - Fix Dereference of null pointer found by Clang analyzer - - Also add modeline info and use _U_ only when it is needed (for pinfo) - - Change-Id: I71349d6451e1d8304fad04781e5ee226a1a4c729 - Reviewed-on: https://code.wireshark.org/review/1466 - Reviewed-by: Anders Broman - -commit b5120cd -Author: Anish Bhatt -Date: Wed Apr 30 17:21:14 2014 -0700 - - Add support for Logical Link Down TLV. - TLV is 1 octet long, and only MSB holds info with 7 unused bits - - Change-Id: Ic1f5ce1b774bb7439cd2a23bc9bfb44f7dc25888 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1450 - Reviewed-by: Alexis La Goutte - -commit 4d55a12 -Author: Pascal Quantin -Date: Thu May 1 19:38:21 2014 +0200 - - MBIM: dissect MBIM_SET_STK_PAC and MBIM_STK_PAC_INFO messages - - Change-Id: Ib58dece7ce7278e292d88f68368c238695c32394 - Reviewed-on: https://code.wireshark.org/review/1463 - Reviewed-by: Pascal Quantin - -commit a42b04e -Author: Bill Meier -Date: Thu May 1 10:58:22 2014 -0400 - - Remove 'include win32.mak' from certain nmake files when not needed. - - Change-Id: I05a505d884abb5fd7fca87bb89af29e3e4502b74 - Reviewed-on: https://code.wireshark.org/review/1460 - Reviewed-by: Bill Meier - -commit 5410fab -Author: Bill Meier -Date: Thu May 1 10:56:27 2014 -0400 - - Add a comment re certain variables beibg defined in win32.mak. - - Change-Id: I9246a1786a5bf8c48744378f25a66f6881caed81 - Reviewed-on: https://code.wireshark.org/review/1459 - Reviewed-by: Bill Meier - -commit b31381d -Author: Bill Meier -Date: Thu May 1 10:54:27 2014 -0400 - - Add a comment re VS2013EE requiring that win32.mak needs to be separately obtained. - - Change-Id: I53413f7bdde50149fd923bbe35c995145d5139f2 - Reviewed-on: https://code.wireshark.org/review/1458 - Reviewed-by: Bill Meier - -commit 6a80524 -Author: Michael Mann -Date: Fri Apr 25 20:01:35 2014 -0400 - - Cleanup SPDY dissector. - - Address Evan's missed comments from https://code.wireshark.org/review/767/ - - From Alexis La Goutte - Fix unused variable (pinfo) and fix crash (wrong variable in while) - - Change-Id: I1b134585f4d522d3e808069f606beb4aae0488fa - Reviewed-on: https://code.wireshark.org/review/1164 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit dedc090 -Author: Alexis La Goutte -Date: Thu May 1 14:34:19 2014 +0200 - - Fix -Wunreachable-code found by Clang - - Change-Id: I895194655ff674fff5e84fa93b3f9a00a0f70e27 - Reviewed-on: https://code.wireshark.org/review/1457 - Reviewed-by: Anders Broman - -commit d3d4fb9 -Author: Alexis La Goutte -Date: Mon Apr 28 08:59:17 2014 +0200 - - Add OSPF Authentication Trailer (RFC6506) - - Change-Id: Ie5c536a6977e35acc12222af3c48d29740cd57f2 - Closed-bug:9941 - Reviewed-on: https://code.wireshark.org/review/1440 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Michael Mann - -commit 523fbe2 -Author: Alexis La Goutte -Date: Thu May 1 14:29:52 2014 +0200 - - Unreachable code in ui/gtk/main.c - - Unreachable code due to conflicting defines: checking for GTKOSXAPPLICATION inside _WIN32 - - Found by Edwin - - Closed-bug: 10065 - Change-Id: I074fa14069e859b3fc4b7f50c443a67e7f0e954b - Reviewed-on: https://code.wireshark.org/review/1456 - Reviewed-by: Anders Broman - -commit 583a47c -Author: Alexis La Goutte -Date: Thu May 1 14:25:33 2014 +0200 - - Fix Dereference of null pointer found by Clang analyzer - - packet-teamspeak2.c:456:21: warning: Access to field 'fragmented' results in a dereference of a null pointer (loaded from variable 'frag') - - Change-Id: Ie253991f8d664c4594254bcd4569883614aafe2f - Reviewed-on: https://code.wireshark.org/review/1455 - Reviewed-by: Anders Broman - -commit 601dc73 -Author: Alexis La Goutte -Date: Thu May 1 14:19:35 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I8ab25b1a3326ade46408ebd2e14cf841191c57d9 - Reviewed-on: https://code.wireshark.org/review/1454 - Reviewed-by: Anders Broman - -commit 39b533e -Author: Alexis La Goutte -Date: Thu May 1 14:14:35 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: Id38f366c04edcf3326b323fc851a6644a942d79d - Reviewed-on: https://code.wireshark.org/review/1453 - Reviewed-by: Anders Broman - -commit fbd3c93 -Author: Michał Orynicz -Date: Mon Apr 28 15:52:15 2014 +0200 - - Fix procedure of finding packages - - Before this change the code using make package was just showing - a string ${PACKAGE_VAR}_FOUND instead of showing if the - ${PACKAGE_VAR}_FOUND variable was set true by find_package function. - Now the user will be informed about which packages were not found - and an error will be raised, as packages sought are the ones that - are selected for the build. - - This change also ads fixes to some improper PACKAGE_VAR - variables that prevented find_package from finding - proper packages. - - Change-Id: Ic20bc50ace65bab385059a7430909f95367520a3 - Reviewed-on: https://code.wireshark.org/review/1410 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit 2f960b7 -Author: Niels de Vos -Date: Mon Apr 28 15:54:05 2014 +0200 - - gluster: add support for GlusterD v3 procedures - - The GlusterD Management protocol has been updated to version 3. All procedures are implemented with this change. - - This change also takes care of converting values passed in a dictionary - to real and displayable GUIDs. - - Change-Id: I93808eda393745aa9ab3b986a6b7997f6f80df50 - Reported-by: Vikhyat Umrao - Signed-off-by: Niels de Vos - Reviewed-on: https://code.wireshark.org/review/1411 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Pascal Quantin - -commit 60c580d -Author: Pascal Quantin -Date: Thu May 1 13:31:56 2014 +0200 - - AT: do not always prepend "/" to protocol name - - Change-Id: Ice043e0355ea4d9112b377398079c94e66e35cc8 - Reviewed-on: https://code.wireshark.org/review/1452 - Reviewed-by: Pascal Quantin - -commit 6e21a4b -Author: AndersBroman -Date: Thu May 1 11:10:22 2014 +0200 - - Try to fix warning C4244: '-=' : conversion from '__int64' to 'int', - possible loss of data - - Change-Id: I8cf74090e507f21eebfb40d72a3630d9f9bb0390 - Reviewed-on: https://code.wireshark.org/review/1451 - Reviewed-by: Anders Broman - -commit a53cd45 -Author: Sean O. Stalley -Date: Wed Apr 30 16:56:50 2014 -0700 - - Fixed typo in docbook (usuall to usually) - - Change-Id: I1aad1d6487cb6acd52bb851c08d9c4965bbb9f55 - Reviewed-on: https://code.wireshark.org/review/1449 - Reviewed-by: Evan Huus - -commit 4be5e4d -Author: Jakub Zawadzki -Date: Wed Apr 30 23:46:18 2014 +0200 - - Document to_str-int.h functions. - - Change argument name of hex_to_str_back pad->len it seems to sounds better. - Make uint_to_str_back_len() value uint32, to be sure about required buffer size. - - Change-Id: I48fd560683c5c0845cbb60813887a18328ec01e6 - Reviewed-on: https://code.wireshark.org/review/1448 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit b3bb951 -Author: Jakub Zawadzki -Date: Wed Apr 30 21:39:54 2014 +0200 - - Optimize display_signed_time() - remove g_snprintf - - When tshark is printing columns (default) display_signed_time() is called for every frame. - Current implemention is using g_snprintf() which makes this function costly when there is lot frames. - - Change-Id: I109c8699d38bfbd05475d457ae4173e937c6812d - Reviewed-on: https://code.wireshark.org/review/1447 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 5dfd543 -Author: Evan Huus -Date: Wed Apr 30 13:34:21 2014 -0400 - - Fix uninitialized struct in SMB2 - - Bug:10056 - Change-Id: I6c7d3900208ee058ca9505e8d9f673ce4f4801cb - Reviewed-on: https://code.wireshark.org/review/1446 - Reviewed-by: Evan Huus - -commit ca1f87e -Author: Bill Meier -Date: Wed Apr 30 13:25:12 2014 -0400 - - Add '#include "packet-ipsec.h'; Do some cleanup. - - Cleanup: - - #include & only when needed; - - Add editor modelines; - - Convert tabs to spaces; - - Use a consistent indentation (2 spaces). - - Change-Id: I5ef67b5c6aff99bf5dc1655b20760f862cd14d7f - Reviewed-on: https://code.wireshark.org/review/1445 - Reviewed-by: Bill Meier - -commit 002cefc -Author: Gerald Combs -Date: Sun Apr 27 13:26:17 2014 -0700 - - make-sminmpec.pl fixups. - - Enforce a minimum number of entries and do our work in the epan - directory. - - Change-Id: I69cc6ae3255b23706a2e67db890a9718e10568b2 - Reviewed-on: https://code.wireshark.org/review/1398 - Reviewed-by: Gerald Combs - -commit 45f381d -Author: Pascal Quantin -Date: Wed Apr 30 16:45:47 2014 +0200 - - IPsec: fix compilation when building without libgcrypt - - Change-Id: If525fb27ec607201efceb3ab9207305c3a4953dc - Reviewed-on: https://code.wireshark.org/review/1439 - Reviewed-by: Pascal Quantin - -commit abe7f7d -Author: Evan Huus -Date: Wed Apr 30 00:02:40 2014 -0400 - - Cleanup libz streams in SPDY dissector - - Fixes major memory leak. - - Bug:10062 - Change-Id: Ife70f12b8697a7873860c702ee0c740f98d98821 - Reviewed-on: https://code.wireshark.org/review/1435 - Reviewed-by: Evan Huus - -commit 9cdba46 -Author: Alexis La Goutte -Date: Wed Apr 30 09:15:26 2014 +0200 - - Fix indent (Use Tab) - - Change-Id: I811fb3db41a31d2334eb80f1821beea109bfa0d9 - Reviewed-on: https://code.wireshark.org/review/1437 - Reviewed-by: Anders Broman - -commit 3116cf4 -Author: Pascal Quantin -Date: Tue Apr 29 21:33:59 2014 +0200 - - MBIM: use hash map instead of red/black tree for UUID extension table - - Change-Id: Iaab9ff66e94bfe38fc875ad312b8e795b80814f4 - Reviewed-on: https://code.wireshark.org/review/1438 - Reviewed-by: Pascal Quantin - -commit 035f6f2 -Author: Alexis La Goutte -Date: Wed Apr 30 08:26:13 2014 +0200 - - Try to make Mac OS X Buildbot Happy - - packet-ipsec.c:1905: warning: implicit conversion shortens 64-bit value into a 32-bit value - - Change-Id: Ic293e6b297f8f52aef7a102ab5ca0e0e98b9d7a7 - Reviewed-on: https://code.wireshark.org/review/1436 - Reviewed-by: Anders Broman - -commit 266e0a9 -Author: Martin Mathieson -Date: Mon Apr 28 22:29:53 2014 +0100 - - Add an API for programmatically adding ESP SAs (most likely from a private - dissector). - - Also, speed up ESP decryption in several ways: - - store gcrypt_cipher_hd in the SA struct, rather than continually - open, setkey and close for each PDU - - don't convert the key string from ascii to hex each time - do it upon - during update callback and keep - - do the decryption in-place, avoiding the need to allocate, memcpy and - free a separate buffer for encrypted data - - when matching addresses, avoid doing a strlen until after we check - whether or not we're matching against "*" - - Change-Id: Ibb66663ec21326351abc761be78a0d57f7797fa5 - Reviewed-on: https://code.wireshark.org/review/1421 - Reviewed-by: Anders Broman - -commit faec751 -Author: Bill Meier -Date: Tue Apr 29 23:25:15 2014 -0400 - - SVN --> GIT in a few places. Fixes Bug #10060. - - Change-Id: I5dcf7699e295dcdbd1e870af5ec68b010a63bf6f - Reviewed-on: https://code.wireshark.org/review/1434 - Reviewed-by: Bill Meier - -commit 133d4de -Author: Gerald Combs -Date: Tue Apr 29 15:51:15 2014 -0400 - - Fix cast for older versions of GLib. - - The version of GLib on the 32-bit OS X builder defines - - Unfortunately this results in a cast warning when u is a guint16. Newer - versions of GLib cast to gulong so do that. - - Change-Id: I2d7e56ef9e5164789ee3a59115cb0f4a76155880 - Reviewed-on: https://code.wireshark.org/review/1433 - Reviewed-by: Gerald Combs - -commit dfb92df -Author: Peter Wu -Date: Tue Apr 29 15:47:09 2014 +0200 - - Fix crash when switching profiles - - rescan_packets() starts a new dissection session by free'ing the - previous state and creating a new one. A reference to the old session - was not updated though. - - This is the only place where epan is overwritten. After init, col_init - will at some point initialize cf->cinfo.epan with a cf->epan. - - Bug: 9463 - Change-Id: I8cf4e0823328f44a0dccfeeec1594f9929829d2d - Reviewed-on: https://code.wireshark.org/review/1430 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit b60ccf6 -Author: Gerald Combs -Date: Tue Apr 29 11:29:26 2014 -0400 - - Fix an extraneous parentheses warning. - - "if (G_UNLIKELY(...))" triggers an extraneous parentheses warning when - compiling with XCode's clang-500.2.75. From looking at the macro - definition we *should* be able to get rid of the outer parentheses - everywhere. - - Change-Id: I710e1cc391e1167c1243c4ddb032f2831f0a9498 - Reviewed-on: https://code.wireshark.org/review/1432 - Reviewed-by: Gerald Combs - -commit e185ad6 -Author: Evan Huus -Date: Tue Apr 29 11:31:20 2014 -0400 - - Add casts to satisfy buildbot - - I'm really not sure why it's complaining about a cast *up* from a guint16 to a - guint... - - Change-Id: Ie24ae0ea2361b54ed255773a0fc86250a240b55a - Reviewed-on: https://code.wireshark.org/review/1431 - Reviewed-by: Evan Huus - -commit 371b17e -Author: AndersBroman -Date: Tue Apr 29 12:45:21 2014 +0200 - - Make id a guint to try to please OSX buildbot. - - Change-Id: Ia97aa45ff0fc52fb21d2e864d1ca328646de547b - Reviewed-on: https://code.wireshark.org/review/1429 - Reviewed-by: Anders Broman - -commit b2af5b0 -Author: Pascal Quantin -Date: Mon Apr 28 23:21:05 2014 +0200 - - Convert a few dissectors with simple request/response tracking from red/black tree to hash map - Update the readme file accordingly - - Change-Id: I056d1ab1f77df641b83fa9b3618b6c25d66e1a83 - Reviewed-on: https://code.wireshark.org/review/1420 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 8f2e234 -Author: Anish Bhatt -Date: Mon Apr 28 22:47:44 2014 -0700 - - Add support for Congestion Notification TLVs (802.1Qau) - - I don't have sample captures for this, but the TLV layout is pretty simple and only contains two 1 octet bitmaps - - Change-Id: Ibd7db7f40187904bbbf348c2cb89a5494cd46aab - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1427 - Reviewed-by: Anders Broman - -commit 14017dc -Author: Graham Bloice -Date: Sat Apr 26 23:18:19 2014 +0100 - - Set CMake defaults for Windows build to: - Use GTK2 as per nmake. - Not to build the dumpabi executables. - - Change-Id: Ia28cf1a80b81e10595f4af5bbd46da3b3675faf5 - Reviewed-on: https://code.wireshark.org/review/1376 - Reviewed-by: Graham Bloice - Tested-by: Graham Bloice - Reviewed-by: Anders Broman - -commit 8d4db3e -Author: Mike Gerschefske -Date: Mon Apr 28 19:31:57 2014 -0700 - - Updated items in dissect_ospf_v2_lsa to use filterable item fields - - Change-Id: I226c6fd3d5aef9d3881416fba9c6259e6170357c - Reviewed-on: https://code.wireshark.org/review/1426 - Reviewed-by: Anders Broman - -commit 8dc7d16 -Author: Peter Wu -Date: Tue Apr 29 00:44:46 2014 +0200 - - prefs: prevent double-free on changing prefs - - Prevent double-free when changing profiles. After switching from the - default profile to a profile without a preferences file, - saved_at_version will be freed, but a new version will not be inserted - (because the prefs file is empty). On a subsequent switch to another - profile, the saved_at_version field is freed again leading to a crash. - - Bug: 9463 - Change-Id: Ia9e0936e32603b4676a37dc428bda40c264a6eaa - Reviewed-on: https://code.wireshark.org/review/1425 - Reviewed-by: Anders Broman - -commit e8cb623 -Author: Peter Wu -Date: Tue Apr 29 00:06:02 2014 +0200 - - prefs: spelling fix, simplify code - - Found spelling error "a another". All those dynamic allocations and - magic numbers are horrible and unnecessary. Simplify the gtk code - rewording the message and merging strings. - - Simplify the version code by using fscanf to take care of matching - the first line of a preference file. - - Change-Id: I1e75803aacaa494ba5005791bcbd023e0807aaaa - Reviewed-on: https://code.wireshark.org/review/1424 - Reviewed-by: Anders Broman - -commit b086b78 -Author: Peter Wu -Date: Tue Apr 29 00:25:23 2014 +0200 - - gtk: fix glib assert for dialogs without cancel - - Dialogs with only "Save" and "Don't save" buttons do not have a default - cancel action. Check for the existence of an OK button before - registering one. - - This fixes three warnings when trying to trying to overwrite preferences - with unknown keys. - - Change-Id: Ie583c40d3db8405d94b8d77710a7fb6556eac89d - Reviewed-on: https://code.wireshark.org/review/1423 - Reviewed-by: Anders Broman - -commit 65700bd -Author: Michael Mann -Date: Mon Apr 28 19:42:42 2014 -0400 - - Make a dissector table out of IPv6 Next header. - - This cleans up the implementation of the extension header, but also allows Decode As functionality for Next Header fields. This allows "old" SHIM6 IP protocol number (not IANA registered) to still be dissected. - - bug:9995 - Change-Id: I6f29a1f7db144478c5b6416d27da2c9c5a7a1de1 - Reviewed-on: https://code.wireshark.org/review/1378 - Reviewed-by: Michael Mann - -commit ec20545 -Author: Anish Bhatt -Date: Mon Apr 28 15:18:04 2014 -0700 - - Fix checkAPIs warnings in packet-lldp.c. repoted_length() used instead of captured_length() as is seems more logical - - Change-Id: I02860d5c45e3fd794d9f99e2d382bc02ae886b36 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1422 - Reviewed-by: Evan Huus - -commit eadaa0c -Author: Anish Bhatt -Date: Mon Apr 28 13:55:32 2014 -0700 - - This block of defines was always changed when I was retabbing my additions, this change fixes the tabs - - Change-Id: I10e260a68cadf18d1aca10c7f037d45d311b6477 - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1418 - Reviewed-by: Evan Huus - -commit e9d4f82 -Author: Alexis La Goutte -Date: Mon Apr 28 12:00:18 2014 +0200 - - HTTP2: with HTTP2 draft-1x, now upgrade use h2-XX or h2c-XX for upgrade HTTP1 Protocol (with XX number of draft) - - Change-Id: I7b6394e1a84db34e34b4a05245414b81a62292af - Partial-Bug:10054 - Reviewed-on: https://code.wireshark.org/review/1409 - Reviewed-by: Evan Huus - -commit 0708e09 -Author: Martin Mathieson -Date: Mon Apr 28 16:38:14 2014 +0100 - - Update SR and DRX tracking when see UL CRC error'd frame, and add an - option to add generated items corresponding to the middle of - BSR ranges (suitable for plotting/stats). - - Change-Id: I73b4e82ea5fb869d93d9666b9f8c9a10562db365 - Reviewed-on: https://code.wireshark.org/review/1419 - Reviewed-by: Martin Mathieson - -commit 72fc075 -Author: Evan Huus -Date: Mon Apr 28 12:11:35 2014 -0400 - - Fix potential invalid-reads in catapult files - - As caught by CppCheck, the conditions checking that n is in bounds should - occur *before* the conditions using n as an index so that if n is out of bounds - we don't try and use it anyways. - - Change-Id: I107c983153aa12203f8c88b14e1addd3807d6b6e - Reviewed-on: https://code.wireshark.org/review/1415 - Reviewed-by: Michael Mann - -commit 3765e99 -Author: Anish Bhatt -Date: Mon Apr 28 13:40:27 2014 -0700 - - With the use of tvb_reported_length_remaining(), there is no need to calculate consumedLen anymore - - Change-Id: I8f4c32012061d3bff5e4efb80dfce8d82f7400df - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1417 - Reviewed-by: Anders Broman - -commit b512fed -Author: Alexis La Goutte -Date: Mon Apr 28 17:47:02 2014 +0200 - - Fix Dereference of null pointer found by Clang analyzer - - Change-Id: Icc25714cd923fcb514541f28ca19c7728dc1be55 - Reviewed-on: https://code.wireshark.org/review/1412 - Reviewed-by: Evan Huus - -commit 6465047 -Author: Alexis La Goutte -Date: Wed Apr 9 09:52:03 2014 +0200 - - Make filterable OSPF Header... - - * Remove if(tree) - * use proto_tree_add_item - * Enhance checksum display - ... - - Change-Id: I66062ecbe7f0c8170fbe9c4a2d7654d62a87c18b - Reviewed-on: https://code.wireshark.org/review/1414 - Reviewed-by: Michael Mann - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 989f4ff -Author: Jeff Morriss -Date: Mon Apr 28 12:08:16 2014 -0400 - - Fix up indentation. - - Change-Id: I9c217cfb0246c763ec7084bb928440d8aab88f99 - Reviewed-on: https://code.wireshark.org/review/1416 - Reviewed-by: Anders Broman - -commit 388859a -Author: Philip Rosenberg-Watt -Date: Fri Apr 11 19:12:35 2014 -0600 - - DPoE OAM message decoding as per CableLabs spec. - - Priority given to messages tested in DPoE 1.0 ATP. - - Change-Id: I6ba3f1a8ca018f2231ad60f2f347ac57f1f93a00 - Reviewed-on: https://code.wireshark.org/review/1076 - Reviewed-by: Evan Huus - -commit ab87070 -Author: Jeff Morriss -Date: Mon Apr 28 11:50:22 2014 -0400 - - Fix Restoration-Priority's AVP code. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10057 - - Bug: 10057 - Change-Id: I88bb6825006b038065f8edff61066557445f1dc6 - Reviewed-on: https://code.wireshark.org/review/1413 - Reviewed-by: Anders Broman - -commit cd68b47 -Author: Philip Rosenberg-Watt -Date: Tue Apr 22 14:16:40 2014 -0600 - - Add dissector for LINKTYPE_EPON - - See IEEE Standard 802.3-2012 Section 5, Clause 65 and CableLabs DPoE - Security and Certificate Specification 1.0, Section 6. - - Currently dissects 1G mode. 10G mode will be added when hardware is - available. - - Change-Id: I6232af9bf6807644ef66a120d97e5fa5927988fe - Reviewed-on: https://code.wireshark.org/review/1284 - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 484b183 -Author: Pascal Quantin -Date: Mon Apr 28 10:58:34 2014 +0200 - - MBIM: make the backward compatibility function static - - Change-Id: I51bbdf9c0dbb80a8350ec7762e588ca3182dce63 - Reviewed-on: https://code.wireshark.org/review/1408 - Reviewed-by: Pascal Quantin - -commit a203bbb -Author: Alexis La Goutte -Date: Mon Apr 28 10:33:13 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I349a5aa7248979aa32eda9f853fd660dc01bdd08 - Reviewed-on: https://code.wireshark.org/review/1407 - Reviewed-by: Alexis La Goutte - -commit 581cdce -Author: Anish Bhatt -Date: Sun Apr 27 18:02:07 2014 -0700 - - Add Support for IEEE DCBx (8021az) - - Sample captures attached at https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10055 - - Closed-bug:10055 - Change-Id: Ib10e8d2a8aecdcf488eb174ed76a259433528f4a - Signed-off-by: Anish Bhatt - Reviewed-on: https://code.wireshark.org/review/1403 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 7aebb0c -Author: Lorand Jakab -Date: Mon Apr 28 09:14:47 2014 +0300 - - Fix issues reported by clang-analyzer - - Change-Id: Iefb52c674be99af167eef7b2eba249607c1dfefd - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1406 - Reviewed-by: Anders Broman - -commit e240c4e -Author: Mike Gerschefske -Date: Sun Apr 27 19:02:54 2014 -0700 - - Updated ospf link state router messages to use proto_tree_add_item instead of proto_tree_add_text. - - Change-Id: Icb04aaa68e7e8b79116a6ac48d1897eb387aab3e - Reviewed-on: https://code.wireshark.org/review/1404 - Reviewed-by: Anders Broman - -commit 1a7e5c9 -Author: Evan Huus -Date: Sun Apr 27 23:16:19 2014 -0400 - - tvb_reported_length_remaining() returns gint - - not size_t, which was giving 64/32 conversion errors on some platforms - - Change-Id: Idf81dc98f8921a92840731d742d6e46a40e1387f - Reviewed-on: https://code.wireshark.org/review/1405 - Reviewed-by: Evan Huus - -commit 0cfd4eb -Author: Michael Mann -Date: Sun Apr 27 20:08:33 2014 -0400 - - Add support for DCBX cee/cin protocol - - CEE Spec here : http://www.ieee802.org/1/files/public/docs2008/az-wadekar-dcbx-capability-exchange-discovery-protocol-1108-v1.01.pdf - - From a wireshark POV, CIN is the same as CEE with a different OUI subtype, and one less supported TLV. - - bug:10039 - Change-Id: I5aa4f1be2ecc43ecad6e86633231e6e39695af6e - Reviewed-on: https://code.wireshark.org/review/1330 - Reviewed-by: Michael Mann - -commit 0a3f725 -Author: Martin Mathieson -Date: Sun Apr 27 23:11:51 2014 +0100 - - Change preference default to use RRC-signalled value for SN field length of DRBs. - - Change-Id: Ibc56c901938f490f1fb0fede7e2fe0fbfc659250 - Reviewed-on: https://code.wireshark.org/review/1402 - Reviewed-by: Martin Mathieson - -commit 98ed927 -Author: Michael Mann -Date: Sun Apr 27 17:54:32 2014 -0400 - - Fix rare case of wmem map being O(n) - - For 'x' equal to 0, HASH() macro also returns 0 which makes wmem map O(n). - When random generator will return 0 just use 1. - - Change-Id: If484091352a719aea27135a705d37ff4c184a13b - Reviewed-on: https://code.wireshark.org/review/1387 - Reviewed-by: Michael Mann - -commit 4272cb8 -Author: Evan Huus -Date: Sun Apr 27 17:52:05 2014 -0400 - - Revert part of g757db64e484b009c3 - - It was intended to change the DTLS decryption test, but changed the SSL test - file instead, which led to the SSL test mysteriously failing. The SSL capture - really is http, so that's the right protocol, and the port is the standard 443, - not 4433 (which was perhaps a typo?). - - Change-Id: I84448c2326d2a4301a4bba9607f8ba90a495531d - Reviewed-on: https://code.wireshark.org/review/1401 - Reviewed-by: Evan Huus - -commit 3b1903c -Author: Pascal Quantin -Date: Sun Apr 27 23:39:52 2014 +0200 - - MBIM: fix compilation with GLib versions < 2.22.0 - - Change-Id: I27e794347dc0988f0f34798cb62f08a11a217176 - Reviewed-on: https://code.wireshark.org/review/1400 - Reviewed-by: Pascal Quantin - -commit 5d2e945 -Author: Alexis La Goutte -Date: Sun Apr 27 21:48:34 2014 +0200 - - Fix Dereference of null pointer found by Clang analyzer - - packet-gvcp.c:2101:7: warning: Access to field 'req_frame' results in a dereference of a null pointer (loaded from variable 'gvcp_trans') - - Change-Id: If39453f9f2ade551fd8c7e369fd60325c16df24b - Reviewed-on: https://code.wireshark.org/review/1393 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Michael Mann - -commit 7ddf2b4 -Author: Pascal Quantin -Date: Sun Apr 27 22:26:04 2014 +0200 - - MBIM: use wmem hash map functions for request/response tracking - - Change-Id: Ie550b0ef2b57827f610c4c6a83ff14868e853125 - Reviewed-on: https://code.wireshark.org/review/1399 - Reviewed-by: Pascal Quantin - -commit 5ce5d06 -Author: Michael Mann -Date: Sun Apr 27 16:52:31 2014 -0400 - - swIPe IP Security Protocol - - bug:9996 - Change-Id: I7c7ab7dfa81e44d6bf9affe7bfb0cd9f0a221adf - Reviewed-on: https://code.wireshark.org/review/1379 - Reviewed-by: Alexis La Goutte - -commit c35870b -Author: Daniel Stenberg -Date: Fri Apr 25 16:29:10 2014 +0200 - - packet-http2: updated to http2 draft-12 - - From Alexis La Goutte - Fix warning found by pre-commit - - Partial-Bug: 10054 - Change-Id: I976884a240a55bb2287a802d72668a2c845179c0 - Reviewed-on: https://code.wireshark.org/review/1295 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit b57fc91 -Author: Alexis La Goutte -Date: Sun Apr 27 22:07:07 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I75aa99b020c92e7caf7efebe34cd1af3763cf592 - Reviewed-on: https://code.wireshark.org/review/1397 - Reviewed-by: Alexis La Goutte - -commit 298633e -Author: Alexis La Goutte -Date: Sun Apr 27 21:53:32 2014 +0200 - - Add Modelines info - - Change-Id: Ib6e1c68e47f2c66d444ac26d1d48f5ef3e14b949 - Reviewed-on: https://code.wireshark.org/review/1396 - Reviewed-by: Alexis La Goutte - -commit ea729ed -Author: Alexis La Goutte -Date: Sun Apr 27 21:53:21 2014 +0200 - - Add Modelines info - - Change-Id: I8ce92fcd103a18fad2ea4c0b873914af38d48155 - Reviewed-on: https://code.wireshark.org/review/1395 - Reviewed-by: Alexis La Goutte - -commit 574a3ef -Author: Alexis La Goutte -Date: Sun Apr 27 21:51:47 2014 +0200 - - Add Modelines info - - Change-Id: I978198266523a0b1f0ba9d4ed6848664a6fa3637 - Reviewed-on: https://code.wireshark.org/review/1394 - Reviewed-by: Alexis La Goutte - -commit e0b15f5 -Author: Alexis La Goutte -Date: Sun Apr 27 21:40:57 2014 +0200 - - Fix warning found by -Wunused-const-variable (Clang 3.5) - - packet-gvcp.c:493:27: error: unused variable 'linkconfiguration_class' [-Werror,-Wunused-const-variable] - - Change-Id: Id31ced029af9700f47230df4afa5c0a4aaecf6d3 - Reviewed-on: https://code.wireshark.org/review/1392 - Reviewed-by: Alexis La Goutte - -commit af2eebe -Author: Jakub Zawadzki -Date: Sun Apr 27 21:28:08 2014 +0200 - - Reorder fields in http_conv_t to save some memory. - - On amd64 before patch: sizeof(http_conv_t) == 88, after: 72 bytes. - - Change-Id: I2863f1c7223a904dadfbe68dc41bc61fc2cc378a - Reviewed-on: https://code.wireshark.org/review/1388 - Reviewed-by: Alexis La Goutte - -commit dec179e -Author: Alexis La Goutte -Date: Sun Apr 27 21:28:42 2014 +0200 - - Try to fix Mac OS X buildbot - packet-http.c:2629: warning: implicit conversion shortens 64-bit value into a 32-bit value - - Change-Id: I6a423639a53c24431fcfd79e0a235f2885ea86c2 - Reviewed-on: https://code.wireshark.org/review/1389 - Reviewed-by: Alexis La Goutte - -commit 878f341 -Author: Peter Wu -Date: Tue Apr 22 23:03:57 2014 +0200 - - prefs: fix ASAN error due to invalid indirection - - For pref_current, indirection of pref->varp.string will cause a read of - size 8. This will cause a global buffer overflow error for all smaller - types, for example lbmc_use_heuristic_subdissectors (size 4). - - Reproduce: compile Wireshark with -fsanitize=address, open Preferences - and select OK or Apply. Result: ASAN crash. - - To fix this, only indirect a pointer if the storage size is known, a - void pointer stores the address of the constant value (pref_default, - pref_stashed) or the address to the value (pref_current). Note that - pointers of different types are of equal size, I could take - valp.pref_(anything). - - While at it, remove superfluous 'break' keywords where a 'return' - keyword is present. - - Change-Id: I05a69e8f14a1ecb4e5d2a0c0f0b71ed3f0a41d70 - Reviewed-on: https://code.wireshark.org/review/1286 - Reviewed-by: Evan Huus - Reviewed-by: Michael Mann - -commit 5600ae1 -Author: Peter Wu -Date: Sun Apr 27 10:39:23 2014 +0200 - - http: Fix src/dest mapping for proxied connections - - Using value_is_in_range is making quite some assumptions, namely (1) the - proxy server is always run on a registered HTTP port, and (2) the - source (client) port is always not HTTP. The former is quite a strong - assertion which fails to hold when using a custom port (8008) that got - detected through heuristics. - - Fix this by recording the source address and port pair for the server - and then check this against the current packet. - - This fixes detection of a SSL conversation where two conversations got - detected instead of one. Example: 8008 is proxy, 443 is target server. - Now the proxied conversation got detected as 443 --> "client port" - (server to client, ok) and 443 --> 8008 (client to server, not ok, - should be "client port" --> 443). - - bug:7717 - Change-Id: I05113ec2aca6c9296184759a8a62eb32cbfcbb4f - Reviewed-on: https://code.wireshark.org/review/1380 - Reviewed-by: Michael Mann - Reviewed-by: Alexis La Goutte - -commit 338269f -Author: Hauke Mehrtens -Date: Sat Dec 7 00:55:08 2013 +0100 - - ssl/dtls: add keyfile support to dtls - - This moves the keyfile and psk options from the ssl code into ssl-utils - and then uses them also for dtls. - - This is the last missing part for bug 9499 from my side. - - Change-Id: Ie2fe5bc565eabe1e6ce62498c985b8a36e913b0f - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/1369 - Reviewed-by: Peter Wu - Reviewed-by: Michael Mann - -commit 162a8c7 -Author: Peter Wu -Date: Thu Apr 17 18:33:02 2014 +0200 - - http: Display a list of cookies - - For long cookies, the label "[truncated] Cookie: foo=v..." is not really - helpful. Add a new subtree to display individual cookies, this makes - copying values much easier. - - A new "http.cookie_pair" field was added instead of re-using - "http.cookie". This has the advantage that `tshark -Tfields -e - http.cookie` does not end up with duplicates. At the same time, one can - match against individual cookie values. - - I also considered to limit the number of cookies to be split, but as - there is no limit on the number of headers, I decided not to be - restrictive for cookies either. - - Change-Id: I98d9522867811278ade3e04aab02e517f997928b - Reviewed-on: https://code.wireshark.org/review/1186 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - Reviewed-by: Michael Mann - -commit 7b40120 -Author: Gerald Combs -Date: Sun Apr 27 08:05:26 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-04-27] - - Change-Id: I0745df4a0a0447abf7ab4c7555d9d195ac40eb78 - Reviewed-on: https://code.wireshark.org/review/1384 - Reviewed-by: Gerald Combs - -commit ff854bc -Author: Stefan Doehla -Date: Sun Apr 27 14:21:28 2014 +0200 - - SAP: fix dissection of Originating Source address - - Regression introduced in commit c131f9a0745f6307a5c910d8486eb9a37a05935c - - Bug: 10029 - Change-Id: Ia99ca36216dd26e41f926cc67e52827e665c40eb - Reviewed-on: https://code.wireshark.org/review/1383 - Reviewed-by: Pascal Quantin - -commit f8e8c85 -Author: Michael Mann -Date: Sun Apr 27 08:25:41 2014 -0400 - - Limit the start of HTTP request/response to a printable character. - - From Martin Mathieson. - - In a profiled run with FTP traffic, the HTTP dissector looking for the end of a line of data (which was binary) was taking around 3% of runtime. - - bug:8822 - Change-Id: I2617d1e49030bd5ad85b0e818c48c01dc6fae075 - Reviewed-on: https://code.wireshark.org/review/1373 - Reviewed-by: Michael Mann - -commit b588511 -Author: Pascal Quantin -Date: Sun Apr 27 14:10:05 2014 +0200 - - T38: fix access to uninitialised variables - - Bug: 10050 - Change-Id: I7bc2d1b99bcb1241705a2561d9360a006fb9cb47 - Reviewed-on: https://code.wireshark.org/review/1382 - Reviewed-by: Pascal Quantin - -commit 7929d9a -Author: Pascal Quantin -Date: Sun Apr 27 12:27:25 2014 +0200 - - SSL: fix compilation without GnuTLS and Gcrypt - - Change-Id: Ic783f9ac2b7abcbace67ce48239b0506ac237267 - Reviewed-on: https://code.wireshark.org/review/1381 - Reviewed-by: Pascal Quantin - -commit 616d4c9 -Author: Martin Mathieson -Date: Sat Apr 26 23:26:32 2014 +0100 - - Change preferences - always want to try to decrypt signalling PDUs - - Change-Id: Ib34f12b5f8dd276612aed2fe0192c94e847858f2 - Reviewed-on: https://code.wireshark.org/review/1377 - Reviewed-by: Martin Mathieson - -commit c6d41f9 -Author: Evan Huus -Date: Sat Apr 26 17:43:24 2014 -0400 - - Have DTLS just dissect the test capture as data - - Follow-up to g757db64e484b009c33b67b5fa38e109d7b8f5e78 which changed the filter - being tested but didn't change the target protocol, so the test was still - failing because it was still trying to use HTTP. - - Change-Id: I6675cfad3bba63f7a536eb7ae82e4b25132d108e - Reviewed-on: https://code.wireshark.org/review/1375 - Reviewed-by: Evan Huus - -commit 1ba06e6 -Author: Guy Harris -Date: Sat Apr 26 10:49:22 2014 -0700 - - Fix FSF address. - - Change-Id: Ic79fcf7e1bebb9821d9d9db43c2a4f4291beb706 - Reviewed-on: https://code.wireshark.org/review/1374 - Reviewed-by: Guy Harris - -commit 3b76de7 -Author: Hauke Mehrtens -Date: Sat Apr 26 11:40:49 2014 +0200 - - dtls: run dissector for decryption also on server hello extensions - - The dissector only ran through the server hello extensions for the tree - and not in the ssl decryption pass. This resulted in - ssl_dissect_hnd_hello_ext() being always called with ssl == NULL. For - SSL this was also called with ssl != NULL. - - Change-Id: I22f7b1089731124b3ca1a2b8515f307c4a021b7f - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/1370 - Reviewed-by: Evan Huus - -commit 720f504 -Author: Peter Wu -Date: Sat Apr 26 13:02:40 2014 +0200 - - ssl: support any address/port combi for priv key - - Both "any port" and "any address" are supported separatedly, but not the - combination of both. This also has the effect that the combination of - any address with the special keyword "start_tls" did not work. - - Fix this by checking for a private key with the combination of any - address and port. - - Change-Id: Icb49d6728f032a05007dcb7ac73ec0528778441a - Reviewed-on: https://code.wireshark.org/review/1368 - Reviewed-by: Evan Huus - -commit 4250dfd -Author: Peter Wu -Date: Sat Apr 26 00:20:07 2014 +0200 - - ssl: return early if no private keys are found - - There is no need to check for private keys if there are none. In - addition, print the number of keys for debugging purposes. - - Change-Id: Idc9d650e0bf087c0f647dba4e5bd4920b4f6e228 - Reviewed-on: https://code.wireshark.org/review/1367 - Reviewed-by: Evan Huus - -commit 7805e5a -Author: Peter Wu -Date: Sat Apr 26 00:14:15 2014 +0200 - - ssl: Reduce chance of hash-collisions SSL private keys - - The wildcard address contains all zeroes, resulting in the same hash - for 0.0.0.0 and ::. Not really problematic, but it does not sound - great either. - - Change-Id: I099128973a1bd8bb5c88d0abcab3ea4ecc3a96c9 - Reviewed-on: https://code.wireshark.org/review/1366 - Reviewed-by: Evan Huus - -commit c7cbdb4 -Author: Peter Wu -Date: Sat Apr 26 00:12:12 2014 +0200 - - Change ssl_find_private_key to void - - No caller checks its return value (which is always 0). - - Change-Id: I18461ee6e5d369722c8c2b2ea1e409423aa5d631 - Reviewed-on: https://code.wireshark.org/review/1365 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - -commit 03cb700 -Author: Lasse Luttermann Poulsen -Date: Fri Apr 25 15:06:54 2014 +0200 - - Added fields used by HP MSM access points. - - Change-Id: I367c99bb351993f05161d683eb54f08e5852145f - Reviewed-on: https://code.wireshark.org/review/1347 - Reviewed-by: Michael Mann - -commit 742acca -Author: Lorand Jakab -Date: Fri Apr 25 19:38:04 2014 +0300 - - Dissect all details in NAT-T LCAF type... - - ... and remove last remaining proto_tree_add_text() calls! - - Change-Id: I22e5446a06c22ba1f30f342b21f7676641a7f2e7 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1352 - Reviewed-by: Michael Mann - -commit babe895 -Author: warren -Date: Sun Apr 20 02:58:33 2014 -0700 - - Updated gvcp dissector - - Change-Id: I49f6acecdbcdf171ba28af171f8067322cc5ecf1 - Reviewed-on: https://code.wireshark.org/review/1220 - Reviewed-by: Michael Mann - -commit 662e4bd -Author: Guy Harris -Date: Fri Apr 25 14:30:59 2014 -0700 - - wtap_read() and wtap_seek_read() handle caplen > len; don't do it here. - - Change-Id: Iac083abdbaaa4666124e5b296e6f8306ee90f32d - Reviewed-on: https://code.wireshark.org/review/1363 - Reviewed-by: Guy Harris - -commit 4f8c8c2 -Author: Guy Harris -Date: Fri Apr 25 14:25:47 2014 -0700 - - This doesn't have separate captured and actual length, either. - - Change-Id: I4605bde8a2951ea78d507bab6fcf004ebef6f38f - Reviewed-on: https://code.wireshark.org/review/1362 - Reviewed-by: Guy Harris - -commit 6335782 -Author: Guy Harris -Date: Fri Apr 25 14:16:18 2014 -0700 - - Put the common code for reading Logcat packets into a routine. - - Then have the read and seek-read routines both use that routine. - - Change-Id: I3d11df82644207d0ae59486231c91e1f044090ab - Reviewed-on: https://code.wireshark.org/review/1361 - Reviewed-by: Guy Harris - -commit 6ef0420 -Author: Guy Harris -Date: Fri Apr 25 13:12:51 2014 -0700 - - No need to set "line" when setting "firstline". - - "line" is used only in the main loop processing the lines. - - Change-Id: I370c6516867a9c972f9673b3362141f0f42d178a - Reviewed-on: https://code.wireshark.org/review/1360 - Reviewed-by: Guy Harris - -commit 0b1c5c3 -Author: Guy Harris -Date: Fri Apr 25 13:08:14 2014 -0700 - - Get rid of a (now-)redundant call to tvb_get_ptr(). - - Also, shuffle some comments around to make them better describe what's - happening. - - Change-Id: Ie4d71e7c64b68a7f02b4ec6cd2d8601a796a9867 - Reviewed-on: https://code.wireshark.org/review/1359 - Reviewed-by: Guy Harris - -commit ae666f6 -Author: Guy Harris -Date: Fri Apr 25 13:03:45 2014 -0700 - - Clean up code formatting a bit. - - Change-Id: I8f82630f59304149293680f742d490767b88179e - Reviewed-on: https://code.wireshark.org/review/1358 - Reviewed-by: Guy Harris - -commit f5165ba -Author: Martin Kaiser -Date: Thu Apr 24 12:30:40 2014 +0200 - - remove some more unnecessary initial values - - Change-Id: If2abfee444c7a4a163fef031d92b7757b5d23855 - Reviewed-on: https://code.wireshark.org/review/1355 - Reviewed-by: Martin Kaiser - -commit e417e8b -Author: Martin Kaiser -Date: Thu Apr 24 12:22:28 2014 +0200 - - remove unnecessary initial values - - Change-Id: I0950daa18c4234677d29101fac74f6f6bd977ef3 - Reviewed-on: https://code.wireshark.org/review/1354 - Reviewed-by: Martin Kaiser - -commit 6d6094e -Author: Guy Harris -Date: Fri Apr 25 10:44:11 2014 -0700 - - Don't fail if a pcap-NG PB or EPB has caplen > actual len. - - We don't fail for other file types; there's no point in failing for - pcap-NG. wtap_read() will ensure that caplen <= len. - - Make wtap_seek_read() ensure that caplen <= len as well. - - Fixes bug 10037. - - Change-Id: I41fbcf54341ea0429cef875442ea1f1377177a5f - Reviewed-on: https://code.wireshark.org/review/1353 - Reviewed-by: Guy Harris - -commit 83fe357 -Author: Peter Wu -Date: Fri Apr 25 12:10:57 2014 +0200 - - Fix reading keyfile for "any" IP address - - The same file pointer is used for both IPv4 and IPv6. - - Change-Id: I448ee10426882dcd5bcddf6b005ca1d07fe9572c - Reviewed-on: https://code.wireshark.org/review/1345 - Reviewed-by: Pascal Quantin - -commit 7435881 -Author: Peter Wu -Date: Fri Apr 25 12:10:06 2014 +0200 - - Revert back to emem due to UAT use - - Partially reverts "Convert SSL and TCP dissectors to wmem (with the - exception of UAT)." (960a461c8a54460db372968854f6280f9c48a41d). - - ssl_load_pkcs12 is called in UAT context via - ssldecrypt_uat_fld_password_chk_cb and ssl_parse_key_list (dtls/ssl). - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10038 - - Change-Id: I22220fd128b17e273c5ed572a83edbfb8261bda9 - Reviewed-on: https://code.wireshark.org/review/1344 - Reviewed-by: Pascal Quantin - -commit 182fd17 -Author: Michael Mann -Date: Fri Apr 25 11:10:15 2014 -0400 - - Fix fuzz failure. Bug 10041. - - Always need to initialize "firstline" when "line" is initialized. - - Bug:10041 - Change-Id: Iecee2e387e4a35f0d7126f8f14aa5bd34449a5d3 - Reviewed-on: https://code.wireshark.org/review/1351 - Reviewed-by: Michael Mann - -commit b136182 -Author: AndersBroman -Date: Fri Apr 25 14:29:20 2014 +0200 - - Make COMPUTE_OFFSET and COMPUTE_OFFSET_AND_REMAINING macros. - - Change-Id: I7a7b5869947499c2e0edb4de4bb462d8e8c19fc7 - Reviewed-on: https://code.wireshark.org/review/1346 - Reviewed-by: Anders Broman - -commit 7acaf85 -Author: Pascal Quantin -Date: Fri Apr 25 15:23:13 2014 +0200 - - Kerberos: ensure that private data elements are stored in separate variables - - Bug: 10028 - - Change-Id: I599cd5475d19b64c0d5b9d31d7054a3befc84af2 - Reviewed-on: https://code.wireshark.org/review/1348 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 1c024bc -Author: Lorand Jakab -Date: Fri Apr 25 16:37:17 2014 +0300 - - Dissect all details in ELP LCAF type... - - ... and remove more of the remaining proto_tree_add_text() calls. - - Change-Id: I0286af7fd6953b9276c15b3e7ce7d80c1bd39e8a - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1350 - Reviewed-by: Anders Broman - -commit a2a17cd -Author: AndersBroman -Date: Fri Apr 25 15:29:29 2014 +0200 - - Fold alloc_field_info() into proto_tree_add_pi(). - - Change-Id: Iba9c6133d686fdcf70645238f8bd312815d377b0 - Reviewed-on: https://code.wireshark.org/review/1349 - Reviewed-by: Anders Broman - -commit afbb1e7 -Author: Guy Harris -Date: Fri Apr 25 02:35:46 2014 -0700 - - Use 4-space indentation consistently in epan/charsets.c. - - Make the EBCDIC <-> ASCII translation tables const, while we're at it. - - Change-Id: I15a08f7329fd32f758cf36898fe4214ae8540462 - Reviewed-on: https://code.wireshark.org/review/1343 - Reviewed-by: Guy Harris - -commit 29eba53 -Author: Guy Harris -Date: Fri Apr 25 02:29:42 2014 -0700 - - Add a get_ebcdic_string() routine, similar to other get_XXX_string() routines. - - Use it in epan/tvbuff.c. - - Do some other cleanups while we're at it. - - Change-Id: I7aed37a568373b896aacfd23f986d445b58b77b7 - Reviewed-on: https://code.wireshark.org/review/1342 - Reviewed-by: Guy Harris - -commit 0d787af -Author: Guy Harris -Date: Fri Apr 25 01:43:24 2014 -0700 - - Another whitespace cleanup. - - Change-Id: I7c5c557730fb59244bc82c35fcf79c40991d4d99 - Reviewed-on: https://code.wireshark.org/review/1341 - Reviewed-by: Guy Harris - -commit e1bc641 -Author: Guy Harris -Date: Fri Apr 25 01:37:42 2014 -0700 - - Fix some white space. - - Change-Id: I9adec36251e27e71c530e64a472ab7562bd07fed - Reviewed-on: https://code.wireshark.org/review/1340 - Reviewed-by: Guy Harris - -commit 6a9c924 -Author: Guy Harris -Date: Fri Apr 25 01:31:08 2014 -0700 - - Move the XXX-to-UTF-8 loops to routines in epan/charsets.c. - - This moves a bunch of character set knowledge into epan/charsets.c. - - Change-Id: Ieb79dcaac9753c77703af756b666ad2ca9385d9e - Reviewed-on: https://code.wireshark.org/review/1339 - Reviewed-by: Guy Harris - -commit a4ff0bc -Author: AndersBroman -Date: Fri Apr 25 09:22:25 2014 +0200 - - Try to please the build boot. - - Change-Id: I304960a0d1c8e64947a7f35e90da279e43051aac - Reviewed-on: https://code.wireshark.org/review/1338 - Reviewed-by: Anders Broman - -commit 93a853f -Author: Lorand Jakab -Date: Fri Apr 25 08:29:04 2014 +0300 - - Fix encodings (found by fix-encoding-args.pl) - - Change-Id: I9bbdf61b6ac0b24dea4993f07b2608538ef220b2 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1336 - Reviewed-by: Anders Broman - -commit bd38b31 -Author: Stig Bjørlykke -Date: Wed Apr 23 10:50:27 2014 +0200 - - Support out-of-source checkapi - - Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) - from Makefile.am to allow out-of-source 'make checkapi'. - - Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 - Reviewed-on: https://code.wireshark.org/review/1294 - Reviewed-by: Anders Broman - -commit 748e0d4 -Author: Michael Mann -Date: Thu Apr 24 20:39:17 2014 -0400 - - Create the HTTP tree and set column info after we're assured it's HTTP. Otherwise a bogus tree is created when HTTP2 traffic is found. Also, COL_PROTOCOL and COL_INFO can be prematurely populated. - - Change-Id: I9f1c736baaeb86f9fab61601d79e79b4e3a16c38 - Reviewed-on: https://code.wireshark.org/review/1334 - Reviewed-by: Anders Broman - -commit 757db64 -Author: Michael Mann -Date: Thu Apr 24 20:37:34 2014 -0400 - - Don't use HTTP filter for DTLS decryption test as it's not really HTTP traffic (and a more discerning HTTP dissector will cause this to fail) - - Change-Id: I74ea78f541f87000d84c85794d04e9de46d477f2 - Reviewed-on: https://code.wireshark.org/review/1333 - Reviewed-by: Anders Broman - -commit 4bd8336 -Author: Jakub Zawadzki -Date: Thu Apr 24 21:56:43 2014 +0200 - - Move GSM guint8 to unicode conversion functions to charsets.c - - charsets.c is already place with huge number of conversion tables. - Also make gsm_default_alphabet gunichar2, all values fits in 2 bytes. - - Change-Id: Ia5ab6c176b4fec21ec76b06513c1d00794ba10ef - Reviewed-on: https://code.wireshark.org/review/1328 - Reviewed-by: Anders Broman - -commit 75cb267 -Author: Jakub Zawadzki -Date: Thu Apr 24 21:56:31 2014 +0200 - - Move mktime_utc() from tvbuff.c to wsutil/time_util.c - - Also do little cleanup in mktime_utc (one big #ifndef) - - Change-Id: I8f721ba76cad856cfef0a2d78e7f98686f8e4e3f - Reviewed-on: https://code.wireshark.org/review/1327 - Reviewed-by: Anders Broman - -commit 6ec7398 -Author: Michael Mann -Date: Thu Apr 24 16:01:14 2014 -0400 - - Cleanup "excess" from trying to support sequence of "native types". Last installment of bug 9532. - - Cleaned up wireshark_gen.py so that it no longer generates duplicate fields and greatly minimized the number of useless hf_ variables generated. - - Change-Id: I26b2ddb5b65fcde99787cc2771348aa1b37f919f - Reviewed-on: https://code.wireshark.org/review/1329 - Reviewed-by: Anders Broman - -commit 5d60236 -Author: Bill Meier -Date: Thu Apr 24 20:07:24 2014 -0400 - - Convert "4 space tabs" to spaces; - Add editor modelines. - - Change-Id: I360a557a1e9753c4ae7ab95213aa8d44000f7dfd - Reviewed-on: https://code.wireshark.org/review/1335 - Reviewed-by: Bill Meier - -commit e209668 -Author: AndersBroman -Date: Thu Apr 24 17:26:22 2014 +0200 - - Consistently use the macro PROTO_REGISTRAR_GET_NTH in proto.c - - Change-Id: Iecfdd9463bec7958e8ede764bf5e09f6c29ac895 - Reviewed-on: https://code.wireshark.org/review/1326 - Reviewed-by: Anders Broman - -commit 11d77da -Author: Lorand Jakab -Date: Thu Apr 24 12:54:09 2014 +0300 - - Improve Instance ID LCAF type handling - - Change-Id: I66b1f4746b67ff88c56c4127647c4baa2d504a93 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1325 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit 3f56993 -Author: AndersBroman -Date: Thu Apr 24 10:53:29 2014 +0200 - - Fix warning: declaration of 'address' shadows a global declaration. - - Change-Id: I0be594aca0e8fac3c55492f6c168b0b8c13e63e5 - Reviewed-on: https://code.wireshark.org/review/1324 - Reviewed-by: Anders Broman - -commit f37116a -Author: Lorand Jakab -Date: Thu Apr 24 11:03:20 2014 +0300 - - Add support for Geo Coordinates LCAF type - - Additionally, improve the way LCAF top-level tree item shows details - from the information gathered later, including for AFI List LCAF types. - For someone interested just in the summary from an LCAF type, this can - save one or two clicks opening subrees. - - Change-Id: I40ea05ddf922bcb2a2a934f5e791f87133ca32cc - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1323 - Reviewed-by: Anders Broman - -commit 560b5d9 -Author: Jaap Keuter -Date: Wed Apr 23 23:59:19 2014 +0200 - - Adding two well known OAM related multicast address ranges. - - Change-Id: I8fb840e7422b5fe7cd3072d8332de659598ebd3d - Reviewed-on: https://code.wireshark.org/review/1313 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit 7a68dc5 -Author: Alexis La Goutte -Date: Thu Apr 24 08:42:26 2014 +0200 - - Fix packet-ospf.c:1181:33: warning: code will never be executed [-Wunreachable-code] found by Clang with extra compiler flags - - Change-Id: I6a923d85cb5cc947a7e96c1845bde72059d92118 - Reviewed-on: https://code.wireshark.org/review/1322 - Reviewed-by: Anders Broman - -commit 75f4f9d -Author: Alexis La Goutte -Date: Thu Apr 24 08:33:39 2014 +0200 - - Fix packet-netlink-sock_diag.c:653:4: warning: code will never be executed [-Wunreachable-code] found by Clang with extra compiler flags - - Change-Id: Ie3917cee669cfe71f0967e132dd73145a55f0aad - Reviewed-on: https://code.wireshark.org/review/1321 - Reviewed-by: Anders Broman - -commit e45af41 -Author: Alexis La Goutte -Date: Thu Apr 24 08:31:51 2014 +0200 - - Fix packet-ospf.c:1181:33: warning: code will never be executed [-Wunreachable-code] found by Clang with extra compiler flags - - Change-Id: Ia08e01eee4b0829074f65d50c6ba51ef32dc64b9 - Reviewed-on: https://code.wireshark.org/review/1320 - Reviewed-by: Anders Broman - -commit 50ed98e -Author: Alexis La Goutte -Date: Thu Apr 24 08:29:19 2014 +0200 - - Fix warning: extra ‘;’ [-Wpedantic] - - Change-Id: Ib2f52d28dce0f64bf56ff0df7b4ed7d091670620 - Reviewed-on: https://code.wireshark.org/review/1319 - Reviewed-by: Alexis La Goutte - -commit bf2d8f9 -Author: Alexis La Goutte -Date: Thu Apr 24 08:27:26 2014 +0200 - - Fix Warning: Found soft-deprecated APIs in epan/dissectors/packet-lisp.c: tvb_length - - and also fix warning found by fix-encodings-args - - Change-Id: I20193d9f2700e8ede439dcc848390ff7672239b3 - Reviewed-on: https://code.wireshark.org/review/1318 - Reviewed-by: Alexis La Goutte - -commit 993adc8 -Author: Jakub Zawadzki -Date: Tue Apr 22 23:13:40 2014 +0200 - - Fix counting/ checking for leap years in mktime_utc() - - When HAVE_TIMEGM is undefined mktime_utc() might output one day shift (+86400s) - for (years <= 1967 or years >= 2100) && month >= 3 - - { .tm_mday = 1 .tm_mon = 2 .tm_year = 67 } - mktime_utc() = -89436590 // Thu Mar 2 00:00:00 UTC 1967 - gmtime() = -89596800 // Wed Mar 1 00:00:00 UTC 1967 - - { .tm_mday = 1 .tm_mon = 2 .tm_year = 200 } - mktime_utc() = 4107628800 // Tue Mar 2 00:00:00 UTC 2100 - gmtime() = 4107542400 // Mon Mar 1 00:00:00 UTC 2100 - - Change-Id: I1a544762fa5178c8798496d7dc30a2e767919149 - Reviewed-on: https://code.wireshark.org/review/1287 - Reviewed-by: Anders Broman - -commit 8759da8 -Author: Lorand Jakab -Date: Wed Apr 23 16:10:33 2014 +0300 - - Improve LCAF handling - - Also, remove some more proto_tree_add_text() occurrences. - - Change-Id: Ie46e16308b95f190229c22d06c5235ea3464394a - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1317 - Reviewed-by: Anders Broman - -commit bf1f30b -Author: Evan Huus -Date: Wed Apr 23 16:10:51 2014 -0400 - - JXTA: ask for one more segment, not one more byte - - Otherwise we end up doing reassembly of long messages one painful byte at a time - even when all of those bytes are in the same TCP payload. This results in - ridiculous memory usage. - - Change-Id: Ie28d5ade1fec54e6ebc225341582270651d7371c - Closes-Bug: 10018 - Reviewed-on: https://code.wireshark.org/review/1312 - Reviewed-by: Evan Huus - -commit fbc5226 -Author: Evan Huus -Date: Thu Apr 24 02:16:34 2014 +0000 - - Revert "Move kerberos to dirty list in CMake" - - it no longer has any warnings - - This reverts commit 30c9f421c024266d0fd6a9d981f28b83d8b363ba. - - Change-Id: I5cc71f905ffa4f00ffb44ad7d03b2684c2e44e38 - Reviewed-on: https://code.wireshark.org/review/1316 - Reviewed-by: Evan Huus - -commit 3b32885 -Author: Evan Huus -Date: Thu Apr 24 02:16:17 2014 +0000 - - Revert "Move kerberos to dirty dissector list" - - it no longer has any warnings - - This reverts commit 3ff57c86adb373eedaf0295ce20d4f1c4445921a. - - Change-Id: I655f4cf682eb6784340799c54d2f9a6cc5321812 - Reviewed-on: https://code.wireshark.org/review/1315 - Reviewed-by: Evan Huus - -commit 853e391 -Author: Pascal Quantin -Date: Thu Apr 24 00:07:18 2014 +0200 - - Kerberos: use dissect_kerberos_ADDR_TYPE (removes an unused function warning) - - Change-Id: I87d9c88d9db06c8f7dedd6e39152c39c13f8d32d - Reviewed-on: https://code.wireshark.org/review/1314 - Reviewed-by: Pascal Quantin - -commit 5ab53e6 -Author: Alexis La Goutte -Date: Wed Apr 23 19:22:21 2014 +0200 - - Fix typo in comment (parameterts => parameter) - - Change-Id: Ie1fefc27d249929f0f5108b0757768e7e23a9dbe - Reviewed-on: https://code.wireshark.org/review/1310 - Reviewed-by: Evan Huus - -commit 4eb4bae -Author: Stig Bjørlykke -Date: Wed Apr 23 15:39:10 2014 +0200 - - Add check for no kerberos keytab file. - - Avoid printf warnings when loading a capture with kerberos packets - when not having configured a keytab file. - - Change-Id: I0950daa18c42f4687d29101fac74f6f6bd6071b1 - Reviewed-on: https://code.wireshark.org/review/1300 - Reviewed-by: Evan Huus - -commit 30c9f42 -Author: Evan Huus -Date: Wed Apr 23 15:19:17 2014 -0400 - - Move kerberos to dirty list in CMake - - As pointed out by David Ameiss, I only did automake the first time round. - - Change-Id: Ie72ab5014d8f21d194d15af430c6c0a8a612f5f7 - Reviewed-on: https://code.wireshark.org/review/1309 - Reviewed-by: Evan Huus - -commit f62e8a0 -Author: Evan Huus -Date: Wed Apr 23 13:53:18 2014 -0400 - - Fix format warning. - - Change-Id: I6627af8d90299d599db779bde0061191fc514fb3 - Reviewed-on: https://code.wireshark.org/review/1307 - Reviewed-by: Evan Huus - -commit 3ff57c8 -Author: Evan Huus -Date: Wed Apr 23 13:50:59 2014 -0400 - - Move kerberos to dirty dissector list - - It currently generates some unused functions. - - Change-Id: I59e2ffefbf66975d35f2a89c2c49c3ab61f41a84 - Reviewed-on: https://code.wireshark.org/review/1306 - Reviewed-by: Evan Huus - -commit cd4d4ac -Author: Pascal Quantin -Date: Wed Apr 23 19:32:07 2014 +0200 - - MBIM: fix dissection of GSM SMS messages - - Change-Id: I07e753e50a42513daa704e56ee5c9b399a91fec9 - Reviewed-on: https://code.wireshark.org/review/1305 - Reviewed-by: Pascal Quantin - -commit 3b6789e -Author: Bill Meier -Date: Wed Apr 23 13:15:26 2014 -0400 - - packet-mqtt.c: Minor cleanup - - - Create/use an extended value string; - - Use ...add_text() instead of ..._add_string() for a packet details "header" line - (Removes a filter named "mqtt" (not the 'protocol' filter)); - - Fix what is (IMO) a slightly misleading display of "Connect Flags"; - - Remove two lines of duplicate code; - - Localize some variables; - - Remove some unneeded initializers; - - Set tab-stops, etc in editor mode-lines to 8; - - 'offset++' ==> 'offset += 1'; - - Do some minor whitespace changes. - - Change-Id: Ia891c6893643790dbb26510f060c4fb6dfe1fe3a - Reviewed-on: https://code.wireshark.org/review/1304 - Reviewed-by: Bill Meier - -commit fe195c0 -Author: Evan Huus -Date: Wed Apr 23 11:50:24 2014 -0400 - - Don't throw for offset at end of TVB with len -1. - - g867a1827e7dc88896ee27a107eb35c4b3973d270 introduced a change to cleanup/fix - handling of bounds checks for -1 length fields, but it ended up guaranteeing a - throw for 0-length tvbs, which isn't good; we ought to be able to add 0-length - FT_PROTOCOL items at the very least. - - Better names for the function than _cheat are welcome, but I want to shut up the - buildbot. - - Change-Id: I24610f947d03dac32766e2a0ffa0ff7bcc74c3e8 - Reviewed-on: https://code.wireshark.org/review/1303 - Reviewed-by: Evan Huus - -commit be13690 -Author: Michael Mann -Date: Wed Apr 23 11:39:40 2014 -0400 - - Continuation of bug 9532. - - Ie4d1edfd67a8e6f02834573f29f07baf79058534 created a several duplicate hf_ registrations. That led to the exposure of some other potential problems with generating sequences. - - Still not quite complete, but want to pacify the buildbots, so there is a small amount of manual editing to comment out a few duplicated hfs in packet-parlay.c. - - Change-Id: I0ff8a9795e213ab966db8d6333b9477bad06250b - Reviewed-on: https://code.wireshark.org/review/1302 - Reviewed-by: Michael Mann - -commit 1a1abf9 -Author: David Ameiss -Date: Tue Apr 22 11:30:54 2014 -0500 - - Conversation/memory scope fixes for LBM dissectors. See bug 9718. - - Change-Id: I58aa249d73ab44f5f56b1559b38b216cdb542ecb - Reviewed-on: https://code.wireshark.org/review/1280 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit abbcaab -Author: Pascal Quantin -Date: Wed Apr 23 16:59:28 2014 +0200 - - Kerberos: use auto generated code for ADDR-TYPE instead of a hand made value_string array - - Change-Id: I74089fe609368fdd582aef1f2cb00a3905e0641b - Reviewed-on: https://code.wireshark.org/review/1301 - Reviewed-by: Anders Broman - -commit cb8386c -Author: Evan Huus -Date: Wed Apr 23 12:46:51 2014 +0000 - - Revert "Create the HTTP tree after we're assured it's HTTP. Otherwise a bogus tree is created when HTTP2 traffic is found." - - It causes the DTLS decryption test suite to fail for some reason, and I don't have time/energy to investigate further, so we should probably revert it until that gets resolved. - - This reverts commit fc5d8db74dc473610b9fc6c0c4b571d4aa65264a. - - Change-Id: Iac9a7592047d2e080e380a70752efa076303e442 - Reviewed-on: https://code.wireshark.org/review/1297 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - -commit f0e77aa -Author: Evan Huus -Date: Wed Apr 23 08:57:43 2014 -0400 - - Add a cast to satisfy mac buildbot. - - Change-Id: I625b025d3f8a57812512497c6104977ae5d10232 - Reviewed-on: https://code.wireshark.org/review/1298 - Reviewed-by: Evan Huus - -commit 9ba4c6e -Author: Evan Huus -Date: Mon Apr 21 20:30:06 2014 -0400 - - Hash map implementation for wmem. - - This has two expected uses: - - Many current users of wmem_tree don't actually need the predecessor lookup - it provides (the lookup_le function family). A hash map provides straight - insertion and lookup much more efficiently than a wmem_tree when predecessor - lookup isn't needed. - - - Many current users of glib's hash table and hash functions use untrusted data - for keys, making them vulnerable to algorithmic complexity attacks. Care has - been taken to make this implementation secure against such attacks, so it - should be used whenever data is untrusted. - - In my benchmarks it is measurably slower than GHashTable, but not excessively - so. Given the additional security it provides this seems like a reasonable - trade-off (and it is still faster than a wmem_tree). - - Change-Id: I2d67a0d06029f14c153eaa42d5cfc774aefd9918 - Reviewed-on: https://code.wireshark.org/review/1272 - Reviewed-by: Evan Huus - -commit 268104a -Author: Roland Knall -Date: Wed Apr 23 13:53:12 2014 +0200 - - CaptureDialog: Fix IF type for user created pipe - - - If a user adds a pipe via "Capture Options"->"Manage Interfaces" - ->"Pipes" the device.if_type.type is either not filled out (in - the case if no other interfaces exist), or will be set to the - last set if_type of the device queried by the iteration in line - 3537. - - - One could argue, that this is just a fixup, as still the issue - remains, that the device structure will not be resetted, after - the search for an already existing pipe element. Maybe a separate - variable should be used for searching as it is used for adding - the pipe - - Change-Id: Ia727bf3ce270a62d065e8c524a13768af389c346 - Reviewed-on: https://code.wireshark.org/review/1296 - Reviewed-by: Alexis La Goutte - -commit 11b78ff -Author: Pascal Quantin -Date: Wed Apr 23 08:32:29 2014 +0200 - - Kerberos: put PDU dissection under Kerberos tree and remove duplicate PDU name - - Change-Id: Id4824ad3a7bca1959579e5fd0a17a67c6bcda174 - Reviewed-on: https://code.wireshark.org/review/1293 - Reviewed-by: Alexis La Goutte - Reviewed-by: Pascal Quantin - -commit d41a6e4 -Author: Lorand Jakab -Date: Tue Apr 22 22:06:55 2014 +0300 - - Fix LISP dissectior regressions introduced in 1.11 - - This patch fixes dissection of some fields and restores some of the - output before the dissector was updated not to use proto_tree_add_text() - calls. - - While at it improve the consistency in the code. - - Change-Id: Ic30e60de1382f4325bd75e814444205f2fc5a359 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/1283 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit fccf62e -Author: Michael Mann -Date: Tue Apr 22 08:56:03 2014 -0400 - - Bugfix generating a sequence of "native" types. Bug 9532. - - Previously a sequence of "native" types (int, float, etc) generated a proto_tree_add_uint (for the loop over the sequence) and a proto_tree_add_XXX (for the "native" type), but only 1 hf variable was created for the "loop" field, so DISSECTOR_ASSERT_NOT_REACHED would be generated if "native" type != uint. Now a separate hf_ variable is generated for the "loop" and "native" type. - - Also update existing IDL dissectors with new generator logic. - - Change-Id: Ie4d1edfd67a8e6f02834573f29f07baf79058534 - Reviewed-on: https://code.wireshark.org/review/1274 - Reviewed-by: Anders Broman - -commit 8ab1c80 -Author: Guy Harris -Date: Tue Apr 22 21:44:31 2014 -0700 - - Another cut-and-pasteo - UCS-4/UTF-32 should fetch 4-byte characters. - - Change-Id: Iff4a659cb0d0062cc149f451e49474c8db4143cd - Reviewed-on: https://code.wireshark.org/review/1292 - Reviewed-by: Guy Harris - -commit 0f90397 -Author: Michael Mann -Date: Wed Apr 23 00:05:04 2014 -0400 - - Fix generator to remove Dead Store (Dead assignement/Dead increment) warning found by Clang. - - (not sure why, but regeneration also "moved" some hf_ variables from previous version) - - Change-Id: I197eacbb3f892dbdca6e6bc354fc88240c1bfb34 - Reviewed-on: https://code.wireshark.org/review/1291 - Reviewed-by: Anders Broman - -commit 867a182 -Author: Jeff Morriss -Date: Tue Apr 22 22:14:56 2014 -0400 - - Fix up get_hfi_length(): - - Treat FT_BYTES and a few others the same as FT_PROTOCOL: allow a zero length - but throw an exception if the offset is already beyond the end of the TVB - (prior to this change it would assert out). This (when manually applied to - master-1.10) fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9999 . - - While we're at it: tvb_captured_length_remaining() no longer returns -1 (see - r52571) so don't expect it to. Instead just use - tvb_ensure_captured_length_remaining() to throw an exception if the offset is - bad. - - Change-Id: I686722a4fed46b86139466afcf64ff02f319c702 - Reviewed-on: https://code.wireshark.org/review/1289 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 9c8febd -Author: Jakub Zawadzki -Date: Tue Apr 22 22:27:41 2014 +0200 - - Fix copy & paste error in tvb_extract_utf_16_string, tvb_extract_ucs_4_string. - - Use proper p{le,n}toh16 macro depending on endianess. - - Change-Id: I8323e4296ec88e2cb24f54a1d8dc89328edb1957 - Reviewed-on: https://code.wireshark.org/review/1285 - Reviewed-by: Pascal Quantin - Reviewed-by: Anders Broman - -commit 490a8a6 -Author: Pascal Quantin -Date: Tue Apr 22 23:59:39 2014 +0200 - - Kerberos: define HostAddress/addr-type as a FT_UINT32 field - - Fixes part of bug 10019 - - Change-Id: Id367d6c86533c840ea2ff40ef96b1c1854b96150 - Reviewed-on: https://code.wireshark.org/review/1288 - Reviewed-by: Pascal Quantin - -commit f746d5e -Author: Peter Wu -Date: Tue Apr 22 15:30:37 2014 +0200 - - Fix ASAN error due to invalid type - - ei_array is supposed to be an array of expert_entry items. However, it - was initialized of an array of expert_info_t items which is much larger. - This caused an ASAN error when running `tshark -z expert` because - expert_stat_packet wants to read past the stack. - - Fix this by correcting the type. While at it, reduce the size of - expert_entry for 64-bit systems (reduces initial memory usage by 8 - kilobytes) and avoid a redundant g_array_index call. - - Change-Id: I2e08676a5e242743ed502dd2836806604ea75cc0 - Reviewed-on: https://code.wireshark.org/review/1275 - Reviewed-by: Alexis La Goutte - Reviewed-by: Michael Mann - -commit 2d774c6 -Author: Bill Meier -Date: Tue Apr 22 10:48:41 2014 -0400 - - Minor cleanup - - - Remove unneeded #includes; - - Move proto_reg_handoff...(() to the end of the file as per convention; - - Use dissector_add_handle() instead of using dissector_add_uint(..., 0, ...); - - #if 0 an unused global function (which caused a [-Wmissing-prototypes] warning); - - Remove an empty proto_reg-handoff...(); - - 'if (already_registered)' not required in one case. - - Change-Id: I74f267c2721df13eb4d52d7f19a6ded423218a39 - Reviewed-on: https://code.wireshark.org/review/1277 - Reviewed-by: Bill Meier - -commit 085b37d -Author: Bill Meier -Date: Tue Apr 22 10:31:05 2014 -0400 - - Fix gcc "warning: no previous prototype ... [-Wmissing-prototypes] - - Change-Id: Icdbc626dca876244b603c58cba05d0847d5d6a6f - Reviewed-on: https://code.wireshark.org/review/1276 - Reviewed-by: Alexis La Goutte - -commit 66a4303 -Author: Michael Mann -Date: Tue Apr 22 09:33:32 2014 -0400 - - Cache the "tcp_tree" with p_add_proto_data. Bug 9518. - - This is more reliable than doing "tree math" and corrects the intention of 5470356154bec50b607e071606f49696429a0c7c which made the incorrect assumption that tcp_dissect_pdus will be called with the tree that is passed into a protocol's main dissection function (directly from TCP). - - Change-Id: I6ffc2188420ab74784c7bc2c69aa79ff071c90b6 - Reviewed-on: https://code.wireshark.org/review/1214 - Reviewed-by: Anders Broman - -commit 68eae53 -Author: Alexis La Goutte -Date: Fri Apr 18 22:31:26 2014 +0200 - - Add Length for Mobility Header Link-Layer Address Option (Type 7) - - Change-Id: I8e5a254d25a63c18753a2d6a4da4bfc470191304 - Reviewed-on: https://code.wireshark.org/review/1204 - Reviewed-by: Anders Broman - -commit c0b7e19 -Author: AndersBroman -Date: Tue Apr 22 10:31:31 2014 +0200 - - Fix display of AVP: 3GPP-MS-TimeZone(23), oct is owerwritten. - - Change-Id: I12caa4b612bb98459899054841317361bf4af215 - Reviewed-on: https://code.wireshark.org/review/1273 - Reviewed-by: Anders Broman - -commit 4304571 -Author: Alexis La Goutte -Date: Fri Apr 18 23:37:21 2014 +0200 - - Manual fix of Dead Store (Dead assignement/Dead increment) warning found by Clang No found how to fix the generator... - - Change-Id: Ic49e8904b44ff733cca0df916b6677e6fb86d9ba - Reviewed-on: https://code.wireshark.org/review/1209 - Reviewed-by: Alexis La Goutte - -commit 1a6e9b5 -Author: Evan Huus -Date: Mon Apr 21 18:56:12 2014 -0400 - - Much faster implementation of 'strict' allocator. - - Rather than using a hash table, which is overkill and slow, embed a - doubly-linked-list in the prefix structure. - - On my tests with some random capture file and tshark -nxVr: - - normal block allocator: ~2.1 seconds - - old (slow) strict allocator: ~4.2 seconds - - new (fast) strict allocator: ~2.8 seconds - - The buildbot will thank me :) - - Change-Id: I2fb42229c4ee4c40bbe45ba04b7848792998eaa9 - Reviewed-on: https://code.wireshark.org/review/1251 - Reviewed-by: Anders Broman - -commit a755ccb -Author: Gerald Combs -Date: Mon Apr 21 15:25:27 2014 -0700 - - Note the new transport name resolution behavior. - - Change-Id: I345ca0770fe8c116c6103e09c70c46d7140b90e9 - Reviewed-on: https://code.wireshark.org/review/1248 - Reviewed-by: Gerald Combs - -commit 4628dc0 -Author: Gerald Combs -Date: Wed Apr 16 13:23:04 2014 -0700 - - Disable transport name resolution by default. - - Modern hosts typically open many more TCP and UDP connections than in - years past. For an example opening a popular news site in a web browser - can easily trigger dozens of separate connections. At the same time our - services file has accumulated a lot of cruft over time. As a result - transport name resolution is a bunch of lies. - - Change-Id: Ibbca5b1c7ea1e800fc46dad63b9270128dacd721 - Reviewed-on: https://code.wireshark.org/review/1240 - Reviewed-by: Anders Broman - -commit b98e8eb -Author: Martin Kaiser -Date: Mon Apr 21 20:06:20 2014 +0200 - - regenerate manuf - - Change-Id: Ib4cfdd8261e53caef695d54a2991223b1f296448 - Reviewed-on: https://code.wireshark.org/review/1247 - Reviewed-by: Martin Kaiser - -commit bf2b6dd -Author: Philip Rosenberg-Watt -Date: Mon Apr 21 10:38:20 2014 -0600 - - Add short name for CableLabs. - - Change-Id: I474c03a1a40586a14cdec2196ee3ebc89eedd8ab - Reviewed-on: https://code.wireshark.org/review/1236 - Reviewed-by: Martin Kaiser - -commit 72527a4 -Author: Bill Meier -Date: Mon Apr 21 13:07:38 2014 -0400 - - Define a function as 'static' (Fixes [-Wmissing-prototypes] warning). - - Change-Id: Ia0a5c05c953053691837c5795c8204e2144d8067 - Reviewed-on: https://code.wireshark.org/review/1241 - Reviewed-by: Bill Meier - -commit bcfa1cc9 -Author: Martin Kaiser -Date: Sun Apr 20 12:53:58 2014 +0200 - - dissect some more E-LMI fields - - Change-Id: I9b0cb7c8602f813fd06f1b3ea6107ed6fe8d72ed - Reviewed-on: https://code.wireshark.org/review/1244 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 9c08f8d -Author: Martin Kaiser -Date: Sun Apr 20 21:34:43 2014 +0200 - - mention the E-LMI lua dissector in the header - - Change-Id: I5e0e44019ddee4d39fbf2d6204c40c02d3e97c6f - Reviewed-on: https://code.wireshark.org/review/1243 - Reviewed-by: Martin Kaiser - -commit 4b754b7 -Author: Martin Kaiser -Date: Sun Apr 20 12:58:31 2014 +0200 - - add E-LMI to the release notes - - Change-Id: I5e0e44018eaee4da9fbf2d6204c40c0ad3ea7a6f - Reviewed-on: https://code.wireshark.org/review/1242 - Reviewed-by: Martin Kaiser - -commit 7a1848b -Author: Bill Meier -Date: Mon Apr 21 12:34:14 2014 -0400 - - Fix gcc "warning: no previous prototype ... [-Wmissing-prototypes]"; Do some whitespace changes - - Change-Id: I8c2e8694223270f1810aa6b13d955f0d08001d30 - Reviewed-on: https://code.wireshark.org/review/1239 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 48c77d8 -Author: Bill Meier -Date: Mon Apr 21 12:09:06 2014 -0400 - - Fix some bugs; Do more cleanup; - - Bugs fixed: - - DISSECTOR_BUG (reported by proto.c) when displaying "Parameters" - (Apparently introduced in I8de7a19 (gc538b44)) - - Incorrect byte pane highlighting for ARG_ARRAY container type - (In dissector code as originally committed) - - "uint32uint32" should be "uint32" in packet details. - (In dissector code as originally committed) - - Cleanup: - - Remove unneeded #includes; - - Simplify some code; - - Remove unneeded initializers; - - Fix: "warning: no previous prototype...[-Wmissing-prototypes]" - - Reformat hf[] array entries; - - Fix some spelling; - - Do indentation, whitespace & formatting style changes. - - Change-Id: If1f488f10ba83b27f75a1f71cf4bce7d5279e87c - Reviewed-on: https://code.wireshark.org/review/1238 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 0102007 -Author: Bill Meier -Date: Sun Apr 20 18:29:14 2014 -0400 - - (Trivial) Clean up a comment; Fix spelling errors; Do some whitespace changes. - - Change-Id: I57fb3c0d1ba97674c01c4c4799bf36696659c82b - Reviewed-on: https://code.wireshark.org/review/1237 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 3b4a591 -Author: AndersBroman -Date: Mon Apr 21 18:06:10 2014 +0200 - - Update to latsest spec. number while we are at it(no change). - - Change-Id: I5064bbbd1d4961cbff6202967cbd2ee66f7a2c0b - Reviewed-on: https://code.wireshark.org/review/1235 - Reviewed-by: Anders Broman - -commit 38b0861 -Author: Evan Huus -Date: Mon Apr 21 11:57:06 2014 -0400 - - Fix declaration of index shadows global - - Change-Id: I14030ab86c5f3a3fe28b6102f7c0d84494b138e2 - Reviewed-on: https://code.wireshark.org/review/1234 - Reviewed-by: Evan Huus - -commit d47ae54 -Author: Evan Huus -Date: Sun Apr 20 17:27:18 2014 -0400 - - Replace linked list of proto fields with array - - This is substantially more memory-efficient, shaving another ~1.5MB off our base - usage. It also lets us remove the annoying extra "last_field" pointer and - simplify proto_register_field_common(). It also accidentally fixed what may - have been a memory leak in proto_unregister_field(). - - It unfortunately complicates proto_get_next_protocol_field() to require - refetching the protocol each time, but that is itself just an array-lookup under - the covers (and isn't much used), so I don't expect the performance hit to be - noticable. - - Change-Id: I8e1006b2326d6563fc3b710b827cc99b54440df1 - Reviewed-on: https://code.wireshark.org/review/1225 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - -commit 5983cda -Author: Evan Huus -Date: Sun Apr 20 16:45:57 2014 -0400 - - Replace a GTree with a GHashTable - - Shaves ~1.5MB off our base memory usage, and provides O(1) operations instead of - O(log n). We don't need the additional operations a tree provides. - - Change-Id: I6159d09ee380a2bca0de3bb2d031a874d8eb79d2 - Reviewed-on: https://code.wireshark.org/review/1224 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - -commit 6f0f612 -Author: Jeff Morriss -Date: Sat Apr 19 22:20:26 2014 -0400 - - Apply the fix for bug 3290 to proto_tree_add_bytes*(): check the item length before trying to fake the item. - - This fixes the case described in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9983 - - proto_tree_add_bytes_item() and FT_UINT_BYTES both still need work. - - Change-Id: Ie421fed9e6dcecbc8b3eed1a57b3032d6ee043e8 - Reviewed-on: https://code.wireshark.org/review/1219 - Reviewed-by: Michael Mann - -commit cc86596 -Author: David Ameiss -Date: Mon Apr 21 09:23:59 2014 -0500 - - Minor value table updates. See bug 9718. - - Change-Id: Ia0779c6055f6e2864d2099fd607d9763e4040380 - Reviewed-on: https://code.wireshark.org/review/1233 - Reviewed-by: Michael Mann - -commit 6c6aeb1 -Author: Guy Harris -Date: Sun Apr 20 17:47:59 2014 -0700 - - Fix various white space issues and typoes and regenerate SABP dissector. - - Change-Id: Ic036dcbb36b2f0e1eda46062867b762d150b78e0 - Reviewed-on: https://code.wireshark.org/review/1232 - Reviewed-by: Guy Harris - -commit fde8ef0 -Author: Guy Harris -Date: Sun Apr 20 16:54:21 2014 -0700 - - Rename ENABLE_EXTRA_COMPILER_CHECKS to ENABLE_EXTRA_COMPILER_WARNINGS. - - This matches the current name of the --enable-extra-compiler-warnings - option in autotools. - - Fix the documentation of the option to match. - - (Note that "compiler" won't necessarily always be GCC or Clang, and - won't necessarily always use -W for warning options, so speaking of them - as "-W checks" isn't future-proof.) - - Change-Id: I2e142532e78be3c8051f1e738b3109a83e7d10dc - Reviewed-on: https://code.wireshark.org/review/1231 - Reviewed-by: Guy Harris - -commit 4fdd528 -Author: Guy Harris -Date: Sun Apr 20 16:49:34 2014 -0700 - - "extra *compiler* warnings", not just "extra warnings". - - Rename --enable-extra-warnings to --enable-extra-compiler-warnings, and - have the message talking about "extra warnings" talk about "extra - compiler warnings", to make it more uniform (the documentation for the - --enable flag speaks of "additional compiler warnings") and to clarify - that these are warnings from the compiler, not from *shark. - - Change-Id: Ic1a045670144f8d9eda2e3427142027e2a339156 - Reviewed-on: https://code.wireshark.org/review/1230 - Reviewed-by: Guy Harris - -commit cbdd515 -Author: Guy Harris -Date: Sun Apr 20 16:31:23 2014 -0700 - - Rename ENABLE_EXTRA_GCC_CHECKS to ENABLE_EXTRA_COMPILER_CHECKS. - - This matches with the change made to CMakeLists.txt. - - Change the description as well - the name was changed because those - extra checks don't just apply to GCC. - - Change-Id: Id81c081574c42e11144d119c8af45875248578b5 - Reviewed-on: https://code.wireshark.org/review/1229 - Reviewed-by: Guy Harris - -commit f456a6e -Author: Guy Harris -Date: Sun Apr 20 16:22:10 2014 -0700 - - Get rid of ENABLE_EXTRA_CLANG_CHECKS. - - It no longer does anything, and it refers to variables that no longer - exist, as we're not distinguishing between extra GCC warning flags and - extra CLang warning flags any more. - - Change-Id: If0b346f669f2573e46261e6da4dc78e96ef79a8f - Reviewed-on: https://code.wireshark.org/review/1228 - Reviewed-by: Guy Harris - -commit 0bdd9a7 -Author: Guy Harris -Date: Sun Apr 20 15:52:34 2014 -0700 - - Rename --enable-extra-compiler-checks to --enable-extra-warnings. - - That makes it clearer that what we're enabling are extra warnings, and - fits better with the description for --enable-warnings-as-errors, which - says the default is "yes, unless extra warnings are enabled". - - Change-Id: If21f778df0dfdb98acbe02cb6a763ed27f2a7f91 - Reviewed-on: https://code.wireshark.org/review/1227 - Reviewed-by: Guy Harris - -commit 68f9811 -Author: Guy Harris -Date: Sun Apr 20 15:44:53 2014 -0700 - - Don't distinguish between "GCC" and "Clang" extra -W flags. - - We test whether a given compiler supports a given -W flag, so we don't - need to separate them and check them only for particular compilers. - - To make that even clearer, rename the --enable option from - --enable-extra-gcc-checks to --enable-extra-compiler-checks, and - document it as just "do additional -W checks", and rename the - WIRESHARK_EXTRA_GCC_ CMake variables to WIRESHARK_EXTRA_COMPILER_. - - Sync up the lists of warning flags in CMake with the lists in autoconf. - - Uncomment -Wdocumentation while we're at it. If it doesn't work *at - all*, comment it out until it's fixed, or, better yet, fix it; if it - still produces warnings, we just leave it among the "extra" flags. - - Change-Id: I4042affdade612e4025e2881d08f1ca69d759626 - Reviewed-on: https://code.wireshark.org/review/1226 - Reviewed-by: Guy Harris - -commit 62592ee -Author: Gerald Combs -Date: Sun Apr 20 08:04:37 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-04-20] - - Change-Id: I2629e1cf04bdb003d659d2d25d1fe7bf0b4fe3e0 - Reviewed-on: https://code.wireshark.org/review/1221 - Reviewed-by: Evan Huus - -commit fc5d8db -Author: Michael Mann -Date: Sat Apr 19 10:07:40 2014 -0400 - - Create the HTTP tree after we're assured it's HTTP. Otherwise a bogus tree is created when HTTP2 traffic is found. - - Change-Id: Ic315ed9b7d65fe70401945cb0cceda4af863d140 - Reviewed-on: https://code.wireshark.org/review/1215 - Reviewed-by: Alexis La Goutte - Reviewed-by: Michael Mann - -commit d0489f2 -Author: Guy Harris -Date: Sat Apr 19 12:33:22 2014 -0700 - - Clean up white space (replace tabs with 4 spaces). - - Change-Id: Id253ddca497ca92272e7317177aae5e5570f4271 - Reviewed-on: https://code.wireshark.org/review/1218 - Reviewed-by: Guy Harris - -commit 97869f2 -Author: Guy Harris -Date: Sat Apr 19 12:29:50 2014 -0700 - - More name changes. - - Add ep_ to routines that may return ephemeral strings. - - Change "get_XXX" to "XXX_to_display" if the routine returns a formatted - string if it can't get a name. - - Change-Id: Ia0e82784349752cf4285bf82788316c9588fdd88 - Reviewed-on: https://code.wireshark.org/review/1217 - Reviewed-by: Guy Harris - -commit c8f7e16 -Author: Guy Harris -Date: Sat Apr 19 12:06:34 2014 -0700 - - Some routine name changes. - - "get_addr_name()" -> "ep_address_to_display()", to 1) indicate that it - returns a string with ephemeral scope and 2) indicate that it maps an - address to a "displayable" form - a name if possible, an address string - if not. - - "se_get_addr_name()" -> "get_addr_name()", to indicate that its strings - have the same scope as "get_ether_name()", "get_hostname()", and - "get_hostname6()". - - Change-Id: If2ab776395c7a4a163fef031d92b7757b5d23838 - Reviewed-on: https://code.wireshark.org/review/1216 - Reviewed-by: Guy Harris - -commit c03f13b -Author: Michael Mann -Date: Sat Apr 19 12:52:21 2014 -0400 - - IPV6 Mobility Header Binding Revocation Acknowledge Global field is the wrong bit - - According to RFC 5846 (https://tools.ietf.org/html/rfc5846#section-5.2), there are 3 bits in the Binding Revocation Acknowledgement Message, which come in the following order: - 1. Proxy Binding (P) - 2. IPv4 HoA Binding Only (V) - 3. Global (G) - - Found by Boaz Brickner - - From Alexis: MIP6 dissector is based on old draft... - - Closed-bug: 10007 - Change-Id: I570381171e1455cc03fa7b40bf682d6ed7bd0a92 - Reviewed-on: https://code.wireshark.org/review/1203 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - -commit 9496733 -Author: Alexis La Goutte -Date: Fri Apr 18 23:09:47 2014 +0200 - - IPv6 Authentication Header not parsed after Mobility Header - - When IPv6 has a Mobility Header that is followed by an Authentication Header, the Authentication Header is not parsed. - - Found by Boaz Brickner - - Change-Id: Ib6ad759c9f08c94650d72d8dfcc95856e628d2e6 - Close-Bug: 10005 - Reviewed-on: https://code.wireshark.org/review/1205 - Reviewed-by: Evan Huus - Reviewed-by: Michael Mann - -commit 80011ec -Author: Guy Harris -Date: Sat Apr 19 04:04:12 2014 -0700 - - Don't se_ allocate strings when mapping addresses to column strings. - - This should significantly reduce memory usage, without increasing the - CPU time required to process a capture file in TShark or Wireshark. - - As a result, se_address_to_str() is no longer used; eliminate it. - - Fixes bug #9949. - - Change-Id: I65a112a426c82cc73a957b81384c765c3d14f2c3 - Reviewed-on: https://code.wireshark.org/review/1213 - Reviewed-by: Evan Huus - -commit 1d57459 -Author: Alexis La Goutte -Date: Sat Apr 19 00:29:23 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I3f0365e6e693e26e2490150d78cc6a7bc82281fe - Reviewed-on: https://code.wireshark.org/review/1211 - Reviewed-by: Evan Huus - -commit 2e3ad3e -Author: Alexis La Goutte -Date: Fri Apr 18 23:53:04 2014 +0200 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I27b43b9326caaff7df5fbc65afdc77b06850c2a8 - Reviewed-on: https://code.wireshark.org/review/1210 - Reviewed-by: Evan Huus - -commit 5871409 -Author: Evan Huus -Date: Fri Apr 18 18:00:27 2014 -0400 - - Fix infinite loop. Bug #10003. - - Also do a quick scan for other similar issues and fix them too; this type of - underflow has popped up three times now in the openflow dissector in separate - bugs. Hopefully this squashes the last of them. - - Change-Id: Id404433333016f64cdd83d7e0f9e60a3028d2d0b - Reviewed-on: https://code.wireshark.org/review/1207 - Reviewed-by: Evan Huus - -commit 0601a8b -Author: Alexis La Goutte -Date: Fri Apr 18 21:42:08 2014 +0200 - - Move packet-kerberos to ASN1 dissector - - Change-Id: Ib4c97cb654b744bdc65155a0f97b3e944486fc30 - Reviewed-on: https://code.wireshark.org/review/1200 - Reviewed-by: Stig Bjørlykke - -commit 79b401b -Author: Stig Bjørlykke -Date: Fri Apr 18 21:46:34 2014 +0200 - - Remove all old BER functions. - - This should complete the transition to the "New" type. - - Change-Id: I882b088206c6e6d0592159451c943caeaf5b90ec - Reviewed-on: https://code.wireshark.org/review/1202 - Reviewed-by: Anders Broman - -commit 1fb902f -Author: Stig Bjørlykke -Date: Fri Apr 18 21:27:30 2014 +0200 - - Use new BER functions in kpasswd. - - Added RFC 3244 ChangePasswdData to the kerberos dissector. - - This is the last dissector using the "old BER" functions. - - Change-Id: I1d79047103c07c268d08e652745391f1ac37c82c - Reviewed-on: https://code.wireshark.org/review/1198 - Reviewed-by: Tomáš Kukosa - Reviewed-by: Anders Broman - -commit d35f097 -Author: Alexis La Goutte -Date: Fri Apr 18 21:43:12 2014 +0200 - - Add kerberos-exp.cnf to asn1 gitignore - - Change-Id: I48e225a6a68675afe6cacf57e5f3aa6b2eaaa407 - Reviewed-on: https://code.wireshark.org/review/1201 - Reviewed-by: Anders Broman - -commit ad33357 -Author: Pascal Quantin -Date: Fri Apr 18 16:43:36 2014 +0200 - - Exported PDU: add support for more than 32 tags - - Change-Id: Idc9f105164919827a8a81c88b5a56de4fa25df0b - Reviewed-on: https://code.wireshark.org/review/1197 - Reviewed-by: Anders Broman - -commit be76ba5 -Author: Alexis La Goutte -Date: Fri Apr 18 21:34:20 2014 +0200 - - Fix warning found by -Wunused-const-variable (Clang 3.5) - - ../../asn1/kerberos/packet-kerberos-template.c:1076:27: error: unused variable 'w2k_pac_types' [-Werror,-Wunused-const-variable] - ../../asn1/kerberos/packet-kerberos-template.c:1089:27: error: unused variable 'krb5_princ_types' [-Werror,-Wunused-const-variable] - ../../asn1/kerberos/packet-kerberos-template.c:1146:27: error: unused variable 'krb5_encryption_types' [-Werror,-Wunused-const-variable] - ../../asn1/kerberos/packet-kerberos-template.c:1184:27: error: unused variable 'krb5_checksum_types' [-Werror,-Wunused-const-variable] - ../../asn1/kerberos/packet-kerberos-template.c:1222:27: error: unused variable 'krb5_ad_types' [-Werror,-Wunused-const-variable] - ../../asn1/kerberos/packet-kerberos-template.c:1239:27: error: unused variable 'krb5_transited_types' [-Werror,-Wunused-const-variable] - ../../asn1/kerberos/packet-kerberos-template.c:1244:27: error: unused variable 'krb5_address_types' [-Werror,-Wunused-const-variable] - ../../asn1/kerberos/kerberos.cnf:153:27: error: unused variable 'kerberos_Applications_vals' [-Werror,-Wunused-const-variable] - - Change-Id: Ie842d236628efb46450f3e6c23b5590b2e622c25 - Reviewed-on: https://code.wireshark.org/review/1199 - Reviewed-by: Stig Bjørlykke - -commit acd640c -Author: Alexis La Goutte -Date: Fri Apr 18 14:04:36 2014 +0200 - - Fix mix tab and space - - Change-Id: Ife12c5118dcd70ba6b2540d53697f7c9cc9207c9 - Reviewed-on: https://code.wireshark.org/review/1196 - Reviewed-by: Evan Huus - -commit 38b8d32 -Author: Jeff Morriss -Date: Thu Apr 17 19:26:50 2014 -0400 - - Mark the exported_pdu tags as stable (before the next release). - - These tag values have been pretty stable for a while now; mark them as - stable and insert a warning (copied directly from tcpdump.org) to ensure - that people don't start using tags without registering them. - - Change-Id: I9d7b9cd0daaff7eded606506d540c2555d78c417 - Reviewed-on: https://code.wireshark.org/review/1193 - Reviewed-by: Pascal Quantin - Reviewed-by: Anders Broman - -commit e1bff5e -Author: Edwin Groothuis -Date: Fri Apr 18 16:37:08 2014 +1000 - - Fix build for FreeBSD - - Change-Id: Ide3af6a6ed535b839ad4eb1dd58681792b0af3a3 - Reviewed-on: https://code.wireshark.org/review/1195 - Reviewed-by: Alexis La Goutte - -commit 55d5c0f -Author: Bill Meier -Date: Thu Apr 17 23:13:33 2014 -0400 - - Add a hack to _VS_ENUM_XXX to prevent gcc "warning: comma at end of enumerator list [-pedantic]" - - Change-Id: Icfab3cf8e152a2ee239c042e5bfbd9260d102035 - Reviewed-on: https://code.wireshark.org/review/1194 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 0f78d03 -Author: Stig Bjørlykke -Date: Thu Apr 17 23:58:46 2014 +0200 - - Moved packet-kerberos.c to DIRTY_ASN1_DISSECTOR_SRC - - Change-Id: Ib51dc40bdf4e5e2de0dd159eb40ea5114b4b6ee4 - Reviewed-on: https://code.wireshark.org/review/1190 - Reviewed-by: Stig Bjørlykke - -commit a317ba0 -Author: Stig Bjørlykke -Date: Fri Apr 18 00:00:09 2014 +0200 - - Fixed typo HAVE_LIBGRYPT -> HAVE_LIBGCRYPT - - Change-Id: I85772e1f4d4882810bf82a9903e30156eb374df9 - Reviewed-on: https://code.wireshark.org/review/1191 - Reviewed-by: Stig Bjørlykke - -commit ad0066c -Author: Guy Harris -Date: Thu Apr 17 14:38:11 2014 -0700 - - Save and restore the current_proto string in tcp_dissect_pdus(). - - That way, the right protocol gets shown for exceptions in PDUs after the - one for which dissection failed. - - Change-Id: I9f212fe55f19a7a818cd58cd0611683cbb723c0c - Reviewed-on: https://code.wireshark.org/review/1189 - Reviewed-by: Guy Harris - -commit 53ae837 -Author: Philip Rosenberg-Watt -Date: Thu Apr 17 14:04:36 2014 -0600 - - Add CRC-8 calculator for EPON - - See IEEE Standard 802.3-2012 Section 5, Clause 65 - - Change-Id: I83d8adfd5c4fd1f263175ac726854d51419b34e0 - Reviewed-on: https://code.wireshark.org/review/1187 - Reviewed-by: Evan Huus - -commit c531099 -Author: Guy Harris -Date: Thu Apr 17 13:08:21 2014 -0700 - - Try to fix bug 10000. - - This involves duplicating macros, but at least it - - 1) doesn't have empty arguments to macros, which are apparently - considered "undefined" by C90 and C++98 - - and - - 2) doesn't involve "extern" applied to a definition rather than - a declaration, which breaks building on some platforms (and - which I think is also not legal C). - - Change-Id: I7eb98963a6d2e1bc9f869ebce3d7ba9228b6c9e4 - Reviewed-on: https://code.wireshark.org/review/1188 - Reviewed-by: Guy Harris - -commit f52626c -Author: Hadriel Kaplan -Date: Sat Apr 12 23:20:15 2014 -0400 - - Add tvb_get and proto_tree_add for string-encoded byte arrays - - This commit adds tvb_get_string_bytes and proto_tree_add_bytes_item routines for - getting GByteArrays fields from the tvb when they are encoded in ASCII hex string form. - - The proto_tree_add_bytes_item routine is also usable for normal - binary encoded byte arrays, and has the advantage of retrieving - the array values even if there's no proto tree. - - It also exposes the routines to Lua, both so that a Lua script can take - advantage of this, but also so I can write a testsuite to test the functions. - - Change-Id: I112a038653df6482a5d0ebe7c95708f207319e20 - Reviewed-on: https://code.wireshark.org/review/1158 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit c49be78 -Author: AndersBroman -Date: Thu Apr 17 15:37:07 2014 +0200 - - remove duplicated entries. - - Change-Id: I1fcbda17cbc444eee04e975d60b371fc2fa4754c - Reviewed-on: https://code.wireshark.org/review/1184 - Reviewed-by: Anders Broman - -commit 17a0b59 -Author: AndersBroman -Date: Thu Apr 17 15:15:40 2014 +0200 - - From Graham Bloice: - Fix A mismatch in the dnp3_al_obj_vals value string fixes bug - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9945 - - Change-Id: I3d0a423d7d2e4a711533debbd950e2976dd5115e - Reviewed-on: https://code.wireshark.org/review/1183 - Reviewed-by: Graham Bloice - -commit ce46865 -Author: Peter Wu -Date: Mon Apr 14 13:28:37 2014 +0200 - - ssl: Detect unencrypted heartbeat messages - - Records are always unencrypted before the ChangeCipherSpec message. This - patch assumes that conversations without a SSL decoder (i.e. before - calling ssl_change_cipher) are unencrypted. If it turns out that the - contents were encrypted anyway, then there is about 0.8% probability - that the heartbeat message gets recognized wrong - (dissect_ssl3_heartbeat checks if the first byte equals 1 (request) or 2 - (response)). Not a big deal, and the advantage that the heartbleed - expert information is triggered overweights that possible mistake. - - (Note that ssl_set_master_secret as called by external code will also - invoke ssl_change_cipher, but that should be caught by the if - condition in the line before this hunk.) - - An example capture is available at: - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9988 - - Change-Id: I5b14d9e7e8e0c1cd358f3b05c9b84fca1daf1d69 - Reviewed-on: https://code.wireshark.org/review/1102 - Reviewed-by: Evan Huus - -commit 5201d17 -Author: AndersBroman -Date: Thu Apr 17 14:01:02 2014 +0200 - - From zeljko: - Preferences for the MRCPv2 protocol, TCP port is converted from a single port to a port range field. - - Change-Id: Ieb7a7a9beb8474fe89531742d39d5ed6f6862637 - Reviewed-on: https://code.wireshark.org/review/1182 - Reviewed-by: Anders Broman - -commit 194e7ec -Author: AndersBroman -Date: Thu Apr 17 13:49:46 2014 +0200 - - From: Alvaro Neira Ayuso - fix SW_DESCR decoding - error - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9993 - - Change-Id: Ia722239797ae4458d5cf880a54b6d358dc108b64 - Reviewed-on: https://code.wireshark.org/review/1181 - Reviewed-by: Anders Broman - -commit dea68bf -Author: AndersBroman -Date: Wed Apr 16 21:58:16 2014 +0200 - - Switch to using the ASN1 based kerberos dissector. - - Change-Id: Ib8945cdad149b71e3f79bd88032fd10f55ba556d - Reviewed-on: https://code.wireshark.org/review/1174 - Reviewed-by: Anders Broman - -commit 791dd4e -Author: Pascal Quantin -Date: Wed Apr 16 22:14:25 2014 +0200 - - Use Lua 5.2.3 linked against MSVCR110.DLL when compiling with MSVC2012 - - Change-Id: I372ca3b6ad80ee5a3073d06bccd3986a6d7ba27f - Reviewed-on: https://code.wireshark.org/review/1176 - Reviewed-by: Pascal Quantin - Reviewed-by: Anders Broman - -commit 544f89e -Author: Bill Meier -Date: Wed Apr 16 22:00:32 2014 -0400 - - Fix a [pedantic] gcc warning: "empty macro arguments are undefined in ISO C90 and ISO C++98" - - Change-Id: I09f05bb1af1da20eb1a0675ed56fbe7e6b769d68 - Reviewed-on: https://code.wireshark.org/review/1180 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit a919be5 -Author: Bill Meier -Date: Wed Apr 16 20:44:27 2014 -0400 - - Fix gcc "might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]" introduced by 19a3d046f2 - - [Apparently (at least) the Ubuntu buildbot gcc (presumably < 4.9) needs two vars - to be marked volatile even though gcc.4.9 (Fedora) doesn't. - - Change-Id: Icf95511d08a31547196874aecb60d85cab975cfb - Reviewed-on: https://code.wireshark.org/review/1179 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 19a3d04 -Author: Bill Meier -Date: Wed Apr 16 18:51:09 2014 -0400 - - Fix "might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]" warning from gcc 4.9. - - Change-Id: I99f777b3058e1cef3e1a077ffde259f0d2f51c98 - Also: rename some vars to catch any incorrect usage. - Reviewed-on: https://code.wireshark.org/review/1178 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit d51cac2 -Author: Bill Meier -Date: Wed Apr 16 18:45:45 2014 -0400 - - Fix "might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]" warning from gcc 4.9 - - Rework code related to TRY_SCSI_CDB_ALLOC_LEN macro to simplify and clarify same. - Rename some vars to catch any incorrect usage. - - Change-Id: Ibf9465c5ce7670aa1147e0c311c37e582ece427a - Reviewed-on: https://code.wireshark.org/review/1177 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit b9dd810 -Author: Guy Harris -Date: Wed Apr 16 13:38:16 2014 -0700 - - Make dissect_nbss() a bit more like tcp_dissect_pdus(). - - Move some stuff out of dissect_nbss_packet() to dissect_nbss(), to make - its main loop look a bit more like tcp_dissect_pdus()' main loop, and - then pick up some changes from tcp_dissect_pdus(). - - Also, have the "Length" field cover not only the field nominally - designated as a length field, but also the low-order bit of the flags - field, because that bit is really the 17th bit of a 17-bit length field - (RFC 1002 even speaks of it in those terms). - - Change-Id: Ia95912163c23d482bfca6c026d92aadbd0ca8ac4 - Reviewed-on: https://code.wireshark.org/review/1175 - Reviewed-by: Guy Harris - -commit 4bee7a5 -Author: Pascal Quantin -Date: Wed Apr 16 18:58:06 2014 +0200 - - USB: fix 'Decode As' by USB Device functionality - - Change-Id: I22a997939f456dd4c4baecd7dd1aedc3ffefcc82 - Reviewed-on: https://code.wireshark.org/review/1173 - Reviewed-by: Pascal Quantin - -commit 0269b5e -Author: Philip Rosenberg-Watt -Date: Wed Apr 16 08:45:58 2014 -0600 - - Added David Miller and Philip Rosenberg-Watt to file info. - - Change-Id: I5f9248d58a4e809ed2fffd714411ab2e0fcc283d - Reviewed-on: https://code.wireshark.org/review/1171 - Reviewed-by: Anders Broman - -commit 328a335 -Author: AndersBroman -Date: Wed Apr 16 16:52:50 2014 +0200 - - Fix packet-maccontrol.c:147: warning: format not a string literal and no - format arguments - - Change-Id: I57305c7c6be86a706f10ac2c08f6576bd41eac94 - Reviewed-on: https://code.wireshark.org/review/1172 - Reviewed-by: Pascal Quantin - Reviewed-by: Philip Rosenberg-Watt - Reviewed-by: Anders Broman - -commit cd2abf9 -Author: Philip Rosenberg-Watt -Date: Mon Apr 14 11:57:56 2014 -0600 - - Add missing MPCP messages as per IEEE 802.3 Standard - - Added following message types: - * GATE - * REPORT - * REGISTER REQ - * REGISTER - * REGISTER ACK - - Change-Id: I005d92289cf3a8d46f3786184d18ce500863541e - Reviewed-on: https://code.wireshark.org/review/1128 - Reviewed-by: Anders Broman - -commit f012574 -Author: AndersBroman -Date: Wed Apr 16 16:21:19 2014 +0200 - - From Martin Mathieson: - For S1AP PDUs that contain a cause, show that cause in the Info column. - - Change-Id: Icecb8da278c16e0d47395b17b54dee6ebd7be646 - Reviewed-on: https://code.wireshark.org/review/1170 - Reviewed-by: Anders Broman - -commit ba7a70a -Author: Selva -Date: Wed Apr 16 12:52:45 2014 +0530 - - Fix typo in openflow dissector. - - Change-Id: Ic702cc804b0d8757f284e64d35e449ed233149d3 - Reviewed-on: https://code.wireshark.org/review/1169 - Reviewed-by: Anders Broman - -commit 65371b9 -Author: Guy Harris -Date: Tue Apr 15 21:47:11 2014 -0700 - - Fetch fields in NBDS as we add them to the protocol tree. - - That way, we don't throw an exception until we actually try to fetch a - field that's not present, so that fields we *do* successfully fetch show - up in the protocol tree. - - While we're at it, convert some proto_tree_add_text() fields to named - fields. - - Change-Id: I22877dfaa0fe53c44f66e8f150a9f31ccd5aba37 - Reviewed-on: https://code.wireshark.org/review/1168 - Reviewed-by: Guy Harris - -commit d063b32 -Author: Bill Meier -Date: Tue Apr 15 22:34:07 2014 -0400 - - Fix "might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]" warning from gcc 4.9. - - Change-Id: I8495d746f47c0e2528f88295771f86197d22d159 - Reviewed-on: https://code.wireshark.org/review/1166 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 53cb2b7 -Author: Guy Harris -Date: Tue Apr 15 18:28:39 2014 -0700 - - Get rid of another g_assert(). - - Change-Id: I7eb5177864d683cf722f877336f787b392e707e6 - Reviewed-on: https://code.wireshark.org/review/1165 - Reviewed-by: Guy Harris - -commit 16f3342 -Author: Guy Harris -Date: Tue Apr 15 17:50:29 2014 -0700 - - Fix FSF address. - - Change-Id: Id4a7b4ff8167c4691cf3b2c6273e29d1b00f79cf - Reviewed-on: https://code.wireshark.org/review/1163 - Reviewed-by: Guy Harris - -commit abbf520 -Author: Guy Harris -Date: Tue Apr 15 17:40:35 2014 -0700 - - Squelch some warnings: - - The dictionary_id member of a spdy_conv_t is only used if we have libz; - put it inside the #ifdef. That also lets us give it a type of uLong, - from libz, which avoids it being 32 bits when the type returned by - adler32() is 64 bits. (The *value returned by adler32()* might always - fit in 32 bits, but this is arguably cleaner than throwing a cast at the - problem.) - - The third argument to adler32() is a uInt; cast sizeof to uInt to avoid - other 32-bit-vs-64-bit warnings. (It should have been size_t, but maybe - libz antedated size_t's availability in all the compilers that were used - to compile it.) - - The buffer size in spdy_decompress_header_block() is always 16K; just - make it a #define that is *not* size_t, so that we avoid other - 32-bit-vs-64-bit warnings. - - Use DISSECTOR_ASSERT_NOT_REACHED() for "this can't happen" - it's marked - as "doesn't return", so we don't get "variable is unassigned" warnings - (at least not from the Clang I'm using), and also means we wouldn't get - a crash if it *does* happen (we just get a warning on the console and in - the protocol tree). - - Change-Id: I55945b69b7485a02f3f623b21f671ed2915d453d - Reviewed-on: https://code.wireshark.org/review/1162 - Reviewed-by: Guy Harris - -commit cd958c7 -Author: Guy Harris -Date: Tue Apr 15 17:27:24 2014 -0700 - - Squelch warnings when built without libz. - - Change-Id: I881bb369ccf5d32cb53014998ddf76210aaab73e - Reviewed-on: https://code.wireshark.org/review/1161 - Reviewed-by: Guy Harris - -commit 8055351 -Author: Michael Mann -Date: Sun Apr 13 11:47:59 2014 -0400 - - Add SPDY dissector (from SPDYSHARK) - - Porting SPDYSHARK Plugin ( http://code.google.com/p/spdyshark/) to built-in dissector - - Closed-bug: 9821 - Change-Id: I3169ab49e67f67a17e4094a289f4d3a389d610bc - Reviewed-on: https://code.wireshark.org/review/767 - Reviewed-by: Michael Mann - -commit 537a02b -Author: Martin Kaiser -Date: Tue Jun 18 23:30:33 2013 -0700 - - start a dissector for Ethernet Local Management Interface - - Change-Id: I332bd690be67c908067c12e570f993565de98aed - Reviewed-on: https://code.wireshark.org/review/1159 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit da055b8 -Author: Martin Kaiser -Date: Tue Apr 15 23:19:59 2014 +0200 - - remove unused variable 'tree' - - Change-Id: Icd39b32aa61fd9fc39c7a15d22134350582b9de6 - Reviewed-on: https://code.wireshark.org/review/1160 - Reviewed-by: Martin Kaiser - -commit c538b44 -Author: Michael Mann -Date: Tue Apr 15 13:20:11 2014 -0400 - - Cleanup Alljoyn dissector. - - Change-Id: I8de7a196ad068506f8e7312021879d20be4063d2 - Reviewed-on: https://code.wireshark.org/review/1156 - Reviewed-by: Alexis La Goutte - Reviewed-by: Joe Huffman - Reviewed-by: Michael Mann - -commit e80f9cd -Author: Peter Wu -Date: Sun Apr 13 23:35:29 2014 +0200 - - Fix crash on invalid SSH_CONNECTION and SSH_CLIENT values - - The third parameter to g_strsplit is the maximum number of elements, you - cannot just assume that a vector with exactly that number of elements - is available. This will crash for example: `SSH_CONNECTION= wireshark`. - - This patch takes care of that and also fixes a memleak due to missing - g_strfreev. To reduce code bloat, return the filter at last so that - g_strfreev does not have to be repeated before returning. - - Note that it still possible for the filter to contain absolute junk - since the port and host number is not validated... - - Change-Id: I4414d2a748f83ded59775fb1e733ce1250cfc553 - Reviewed-on: https://code.wireshark.org/review/1100 - Reviewed-by: Michael Mann - -commit 3066190 -Author: Michael Mann -Date: Tue Apr 15 15:16:08 2014 -0400 - - Bug 8214. Don't let array ett_ variables limit the number of array elements dissected. Also add support for set and bag dissection. - - Change-Id: I11059ec313aba7d289ce06e38b4992429f2fd999 - Reviewed-on: https://code.wireshark.org/review/1123 - Reviewed-by: Michael Mann - -commit b4442b8 -Author: Peter Wu -Date: Tue Apr 15 19:07:47 2014 +0200 - - ui/gtk/voip_calls: Fix minor memleak - - Return values from g_strsplit must be always be freed. Also remove a - useless return statement and set a saner maximum split. - - Change-Id: I680e20d40fe86103b0dcba210ef41aa5769f4f86 - Reviewed-on: https://code.wireshark.org/review/1155 - Reviewed-by: Michael Mann - -commit 3f0bc55 -Author: Gerald Combs -Date: Tue Apr 15 12:00:06 2014 -0700 - - Add license compatibility information for GMP (used by GnuTLS). - - Update GLib and GTK+ release dates and add Qt release dates while we're - here. - - Change-Id: Ia0da8f6e118e5737d19d321ce3fae6de75477b08 - Reviewed-on: https://code.wireshark.org/review/1157 - Reviewed-by: Gerald Combs - -commit 1279068 -Author: Michael Mann -Date: Tue Apr 15 12:53:48 2014 -0400 - - Fix check*.pl errors - - Change-Id: Id0526cd9b6b724a8f125574507f9ce6302db540d - Reviewed-on: https://code.wireshark.org/review/1129 - Reviewed-by: Michael Mann - -commit d73d1f1 -Author: Gerald Combs -Date: Tue Apr 15 09:57:24 2014 -0700 - - 1.11.3 → 1.11.4. - - Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019 - Reviewed-on: https://code.wireshark.org/review/1154 - Reviewed-by: Gerald Combs - -commit 1dd5d3a -Author: Gerald Combs -Date: Tue Apr 15 09:31:24 2014 -0700 - - Build 1.11.3. - - Change-Id: I8c8f1c22a2cba97e69b27e5fb0b4de9981668966 - Reviewed-on: https://code.wireshark.org/review/1153 - Reviewed-by: Gerald Combs - -commit 38d5b11 -Author: Alexis La Goutte -Date: Tue Apr 15 16:19:20 2014 +0200 - - Fix warning when build with -Wdocumentation - - epan/wmem/wmem_strutl.h:85:63: error: parameter 'str' is already documented [-Werror,-Wdocumentation] - epan/wmem/wmem_strutl.h:85:27: note: previous documentation - epan/wmem/wmem_strutl.h:90:39: error: parameter 'str' is already documented [-Werror,-Wdocumentation] - epan/wmem/wmem_strutl.h:85:57: note: previous documentation - epan/wmem/wmem_strutl.h:83:11: error: parameter 'allocator:' not found in the function declaration - epan/wmem/wmem_strutl.h:83:11: note: did you mean 'allocator'? - epan/wmem/wmem_strutl.h:84:11: error: parameter 'str:' not found in the function declaration [-Werror,-Wdocumentation] - epan/wmem/wmem_strutl.h:85:11: error: parameter 'len:' not found in the function declaration [-Werror,-Wdocumentation] - epan/wmem/wmem_strutl.h:85:11: note: did you mean 'len'? - - Change-Id: Id2888c5967c94c48f9b53957c8be361bbebd3488 - Reviewed-on: https://code.wireshark.org/review/1151 - Reviewed-by: Evan Huus - -commit 5c5a24f -Author: Alexis La Goutte -Date: Sun Apr 13 20:27:05 2014 +0200 - - Update French translation - - Change-Id: If552907a2eb0828198e912fa5c2628efa7190f20 - Reviewed-on: https://code.wireshark.org/review/1119 - Reviewed-by: Alexis La Goutte - -commit e7488b7 -Author: Bill Meier -Date: Tue Apr 15 10:25:51 2014 -0400 - - Fix "might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]" warning from gcc 4.9. - - Change-Id: I0d8f2a03d615840a1733602d0a5a6524caba6ff5 - Reviewed-on: https://code.wireshark.org/review/1152 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit bd6ffea -Author: Martin Mathieson -Date: Mon Apr 14 23:27:32 2014 +0200 - - LTE RRC: break the sr-configIndex down into periodicity and subframe offset - - Change-Id: I5e153ebba9957f3dc5551f540cf333a1d0ff89f7 - Reviewed-on: https://code.wireshark.org/review/1141 - Reviewed-by: Anders Broman - -commit 157fe98 -Author: Alexis La Goutte -Date: Mon Apr 14 22:27:10 2014 +0200 - - Update .gitignore to ignore doxygen generate file/directory (wsar_html...) - - Change-Id: I3d45c03f923dcc1c9216b8b102235221e8e3d556 - Reviewed-on: https://code.wireshark.org/review/1140 - Reviewed-by: Evan Huus - -commit e304d5d -Author: Shu Shen -Date: Mon Apr 14 16:11:27 2014 -0700 - - Fix typo in packet-openflow_v1 and v5 - - Change-Id: Iefc02123447edecbd02cd9a31fff0f412edc8461 - Signed-off-by: Shu Shen - Reviewed-on: https://code.wireshark.org/review/1148 - Reviewed-by: Evan Huus - -commit a88b811 -Author: Shu Shen -Date: Mon Apr 14 16:04:50 2014 -0700 - - Fix typo for packet-openflow_v4.c, Unknown Message Type - - Change-Id: I6b416785f99c9a333d799188f06637d6643b4a38 - Signed-off-by: Shu Shen - Reviewed-on: https://code.wireshark.org/review/1147 - Reviewed-by: Evan Huus - -commit 16b26b8 -Author: Guy Harris -Date: Mon Apr 14 15:43:03 2014 -0700 - - Put the system ID in the top-level items for neighbors. - - Add a tvb_print_system_id() routine, and use that in various ISIS - dissectors, while we're at it. - - Change-Id: I31b6b9ea8faf2b4849f974ec7ed27fbdd14b91ef - Reviewed-on: https://code.wireshark.org/review/1145 - Reviewed-by: Guy Harris - -commit d3ad273 -Author: Guy Harris -Date: Mon Apr 14 15:22:50 2014 -0700 - - Call each item in the Extended IS Reachability CLV an "IS Neighbor". - - This makes it a bit more like the (un-extended) Reachability CLVs. - - Also, just make the top-level items just a text field, just like the - top-level items for neighbors in the (un-extended) Reachability CLVs. - - Rename the system IDs to be "... neighbor ID", not just "neighbor"; the - top-level items hold all the information for the neighbor, and the - system ID for the neighbor is just one of those pieces of information. - - Change-Id: I72182dea496f8cfa6048cff3b0d2474df8f31282 - Reviewed-on: https://code.wireshark.org/review/1144 - Reviewed-by: Guy Harris - -commit 7fdd74a -Author: Gerald Combs -Date: Mon Apr 14 09:53:01 2014 -0700 - - Release note updates for 1.11.3. - - Change-Id: I16b70456b86fbc83b791186dd6e1a7e815815e0e - Reviewed-on: https://code.wireshark.org/review/1143 - Reviewed-by: Gerald Combs - -commit a838f10 -Author: Guy Harris -Date: Mon Apr 14 14:52:25 2014 -0700 - - You can't use proto_item_set_len() to make an item unknown-length. - - You also shouldn't use an item for one *element* of a structure to - represent the entire structure. - - Fix both of those. - - Change-Id: Id1711238ebec02f135c404ac001aa51d783b3c69 - Reviewed-on: https://code.wireshark.org/review/1142 - Reviewed-by: Guy Harris - -commit 45143c6 -Author: Alexis La Goutte -Date: Mon Apr 14 08:59:07 2014 +0200 - - Fix Argument with 'nonnull' attribute passed null found by Clang - - Change-Id: I9b8a6c37e4ed589ac3066ec9cbb1b63a9f30a12b - Reviewed-on: https://code.wireshark.org/review/1097 - Reviewed-by: Peter Wu - Reviewed-by: Anders Broman - -commit 2ce2320 -Author: Alexis La Goutte -Date: Mon Apr 14 21:21:42 2014 +0200 - - Upgrade doxygen configuration (with doxyen 1.8) - With doxygen -u doxygen_global.cfg - - Fix warning - Warning: Tag `SYMBOL_CACHE_SIZE' at line 290 of file doxygen_global.cfg has become obsolete. - To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u" - Warning: Tag `SHOW_DIRECTORIES' at line 490 of file doxygen_global.cfg has become obsolete. - To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u" - Warning: Tag `HTML_ALIGN_MEMBERS' at line 847 of file doxygen_global.cfg has become obsolete. - To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u" - Warning: Tag `USE_INLINE_TREES' at line 1032 of file doxygen_global.cfg has become obsolete. - To avoid this warning please remove this line from your configuration file or upgrade it using "doxygen -u" - - Change-Id: Ic0b5dda7f4bcaa17b7bf915928a938e614d54f30 - Reviewed-on: https://code.wireshark.org/review/1139 - Reviewed-by: Anders Broman - -commit 647287f -Author: Alexis La Goutte -Date: Mon Apr 14 21:15:33 2014 +0200 - - Fix warning when generate documentation (doxygen) - - ui/decode_as_utils.h:42: Warning: The following parameters of decode_build_reset_list(const gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value, gpointer user_data) are not documented: - parameter 'selector_type' - - Change-Id: I8353dae120e87c9651c6611924c1fc652436146d - Reviewed-on: https://code.wireshark.org/review/1138 - Reviewed-by: Anders Broman - -commit a9103e0 -Author: Alexis La Goutte -Date: Mon Apr 14 21:15:12 2014 +0200 - - Fix warning when generate documentation (doxygen) - - ui/gtk/gui_stat_menu.h:42: Warning: The following parameters of register_menu_bar_menu_items(const char *gui_path, const char *name, const gchar *stock_id, const char *label, const char *accelerator, const gchar *tooltip, gpointer callback, gpointer callback_data, gboolean enabled, gboolean(*selected_packet_enabled)(frame_data *, struct epan_dissect *, gpointer callback_data), gboolean(*selected_tree_row_enabled)(field_info *, gpointer callback_data)) are not documented: - parameter 'gui_path' - parameter 'label' - parameter 'accelerator' - parameter 'tooltip' - parameter 'enabled' - - Change-Id: I422d767741b29b8722c85a4ef97186d599d802c3 - Reviewed-on: https://code.wireshark.org/review/1137 - Reviewed-by: Anders Broman - -commit b00a622 -Author: Alexis La Goutte -Date: Mon Apr 14 20:25:25 2014 +0200 - - Fix warning when generate documentation (doxygen) - - ui/gtk/gui_utils.h:277: Warning: argument 'parent' of command @param is not found in the argument list of pixbuf_to_widget(const guint8 *pb_data) - ui/gtk/gui_utils.h:277: Warning: argument 'xpm' of command @param is not found in the argument list of pixbuf_to_widget(const guint8 *pb_data) - - Change-Id: I9182a6f8c85b69bd8b0bab7e03af441dee31fc1d - Reviewed-on: https://code.wireshark.org/review/1136 - Reviewed-by: Anders Broman - -commit d029cf1 -Author: Alexis La Goutte -Date: Mon Apr 14 20:23:59 2014 +0200 - - Fix warning when generate documentation (doxygen) - - pcapio.h:65: Warning: The following parameters of pcapng_write_session_header_block(FILE *pfile, const char *comment, const char *hw, const char *os, const char *appname, guint64 section_length, guint64 *bytes_written, int *err) are not documented: - parameter 'err' - - Change-Id: I0eaa55a44436de5b9687c9b7846c199fe77d98e4 - Reviewed-on: https://code.wireshark.org/review/1135 - Reviewed-by: Anders Broman - -commit bfc85bb -Author: Alexis La Goutte -Date: Mon Apr 14 20:22:58 2014 +0200 - - Fix warning when generate documentation (doxygen) - - airpcap.h:422: Warning: unable to resolve reference to `radiotap' for \ref command - airpcap.h:443: Warning: unable to resolve reference to `radiotap' for \ref command - - Change-Id: I40028cbf16ba7a3a3da5fd84abf453e4b2d39b75 - Reviewed-on: https://code.wireshark.org/review/1134 - Reviewed-by: Anders Broman - -commit cb51bd0 -Author: Alexis La Goutte -Date: Mon Apr 14 20:21:08 2014 +0200 - - Fix warning when generate documentation (doxygen) - - build/epan/proto.h:384: warning: Found unknown command `\uXXXX' - - Change-Id: Ic42730e49ba9b956090269a3b80ffd7a87da33d3 - Reviewed-on: https://code.wireshark.org/review/1133 - Reviewed-by: Anders Broman - -commit bcb6f09 -Author: Alexis La Goutte -Date: Mon Apr 14 20:20:24 2014 +0200 - - Fix warning when generate documentation (doxygen) - - ui/packet_list_utils.h:32: warning: argument 'IN' of command @param is not found in the argument list of right_justify_column(gint col, capture_file *cf) - ui/packet_list_utils.h:32: warning: argument 'IN' of command @param is not found in the argument list of right_justify_column(gint col, capture_file *cf) - ui/packet_list_utils.h:32: warning: The following parameters of right_justify_column(gint col, capture_file *cf) are not documented: - parameter 'col' - parameter 'cf' - ui/packet_list_utils.h:42: warning: argument 'IN' of command @param is not found in the argument list of resolve_column(gint col, capture_file *cf) - ui/packet_list_utils.h:42: warning: argument 'IN' of command @param is not found in the argument list of resolve_column(gint col, capture_file *cf) - ui/packet_list_utils.h:42: warning: The following parameters of resolve_column(gint col, capture_file *cf) are not documented: - parameter 'col' - parameter 'cf' - - Change-Id: I15c7046a36cc72d9904002946eab4dec81ab6861 - Reviewed-on: https://code.wireshark.org/review/1132 - Reviewed-by: Anders Broman - -commit 1fceb51 -Author: Alexis La Goutte -Date: Mon Apr 14 20:16:40 2014 +0200 - - Fix warning when generate documentation (doxygen) - - epan/wmem/wmem_strutl.h:82: warning: Found unknown command `\allocator' - epan/wmem/wmem_strutl.h:82: warning: Found unknown command `\allocator' - epan/wmem/wmem_strutl.h:80: warning: Found unknown command `\str' - epan/wmem/wmem_strutl.h:81: warning: Found unknown command `\len' - epan/wmem/wmem_strutl.h:81: warning: Found unknown command `\str' - epan/wmem/wmem_strutl.h:81: warning: Found unknown command `\st - - Change-Id: I0c3908f0e4aa84cc20fad954638b0cb10b1d6dee - Reviewed-on: https://code.wireshark.org/review/1131 - Reviewed-by: Anders Broman - -commit 05ce6ef -Author: Alexis La Goutte -Date: Mon Apr 14 19:17:06 2014 +0200 - - Fix warning when generate documentation (doxygen) - - wireshark/epan/wmem/wmem_stack.h:39: Warning: group wmem-stack: ignoring title "Stack-bbab" that does not match old title "Queue" - - Change-Id: I9376651d89d9df21aeca82ddb952c230d546169a - Reviewed-on: https://code.wireshark.org/review/1130 - Reviewed-by: Anders Broman - -commit d685e9b -Author: Alexis La Goutte -Date: Mon Apr 14 17:10:06 2014 +0200 - - Fix warning found by -Wunused-const-variable (Clang 3.5) - - Change-Id: I246aa28be28194576b4bd58714b2e6ac36f7a29a - Reviewed-on: https://code.wireshark.org/review/1121 - Reviewed-by: Peter Wu - Reviewed-by: Michael Mann - -commit fad0aa0 -Author: Joseph Huffman -Date: Mon Nov 18 08:52:07 2013 -0800 - - Addition of AllJoyn packet dissector. Bug 9361 - - Change-Id: Ia582732ee27ce9c1e4280afef5a6b3e3be959d23 - Reviewed-on: https://code.wireshark.org/review/1127 - Reviewed-by: Michael Mann - -commit dacc7ee -Author: Gerald Combs -Date: Mon Apr 14 09:53:47 2014 -0700 - - Pull in some changes from master-1.10/make-version.pl. - - Matches versioning behavior in stable branches. - - Change-Id: Ic4d451e7e9941b65d24a76bfaf57de2b4fb58239 - Reviewed-on: https://code.wireshark.org/review/1124 - Reviewed-by: Gerald Combs - -commit e9e4277 -Author: Matthieu Texier -Date: Fri Apr 4 13:39:18 2014 +0200 - - Add support of RFC 6514 PMSI bgp attribute and tunnel ID decoding - - Change-Id: Ia170002fb5af5f6548595688956cc01ec4a72298 - Reviewed-on: https://code.wireshark.org/review/960 - Reviewed-by: Alexis La Goutte - -commit 9838ab9 -Author: Gerald Combs -Date: Mon Apr 14 09:06:03 2014 -0700 - - Adjust path width for OS X & Linux. - - Change-Id: Icc51e8c3c93f78cbfa0a0aeda3552ceb4c82803d - Reviewed-on: https://code.wireshark.org/review/1122 - Reviewed-by: Gerald Combs - -commit 920ae80 -Author: Philip Rosenberg-Watt -Date: Mon Apr 14 07:43:34 2014 -0600 - - Fixed deprecated tvb_length and tvb_length_remaining. - - Change-Id: Icb7b703319f2d76383fe0a52294ca8c2d06bef84 - Reviewed-on: https://code.wireshark.org/review/1118 - Reviewed-by: Anders Broman - -commit 834c25f -Author: Martin Kaiser -Date: Mon Apr 14 16:07:46 2014 +0200 - - no need for if(tree) - - Change-Id: I90a9d2f31c479d1e13f5842be944b67ef67ed6a7 - Reviewed-on: https://code.wireshark.org/review/1117 - Reviewed-by: Martin Kaiser - -commit 97d4a8f -Author: Martin Kaiser -Date: Mon Apr 14 16:04:48 2014 +0200 - - TABs -> spaces - add modelines - - Change-Id: Iae34900e61c2b1f58e48d5ec2d2a303b00beb137 - Reviewed-on: https://code.wireshark.org/review/1116 - Reviewed-by: Martin Kaiser - -commit 9a9ca0a -Author: Alexis La Goutte -Date: Mon Apr 14 15:42:16 2014 +0200 - - lrelease / lupdate translation files - - Change-Id: I2962614ad9d4bd5a263f50e827705133c6c65d9c - Reviewed-on: https://code.wireshark.org/review/1110 - Reviewed-by: Alexis La Goutte - -commit eef5e68 -Author: Alexis La Goutte -Date: Mon Apr 14 15:38:15 2014 +0200 - - Fix typo (double at...) - - Change-Id: If095b9d01817e4345ae588020cdc3332709c18d0 - Reviewed-on: https://code.wireshark.org/review/1109 - Reviewed-by: Alexis La Goutte - -commit c4626a2 -Author: Alexis La Goutte -Date: Mon Apr 14 15:36:23 2014 +0200 - - Fix typo (Link size => Link type) in Qt Summary window - - Change-Id: I78844161e19eaa88a62417f492ac5e439c6bbac0 - Reviewed-on: https://code.wireshark.org/review/1108 - Reviewed-by: Alexis La Goutte - -commit 12e9baf -Author: Alexis La Goutte -Date: Mon Apr 14 15:33:04 2014 +0200 - - Fix typo and make buildbot doc happy - - Change-Id: I9e60fd8a8353e740c1b57f52daac86b1af1b784f - Reviewed-on: https://code.wireshark.org/review/1106 - Reviewed-by: Alexis La Goutte - -commit b8d03c5 -Author: Martin Kaiser -Date: Sun Apr 13 19:20:38 2014 +0200 - - always get the transfer type from the conversation - - Change-Id: Iadd45be615053cd070f69cd836d2a4abb2d5588f - Reviewed-on: https://code.wireshark.org/review/1115 - Reviewed-by: Martin Kaiser - -commit e1c692d -Author: Martin Kaiser -Date: Sun Apr 13 18:25:55 2014 +0200 - - check for is_setup, not for the value of the setup flag - - Change-Id: I9fe0f2e180a3ccf13a4db13918a73b1999e29ade - Reviewed-on: https://code.wireshark.org/review/1114 - Reviewed-by: Martin Kaiser - -commit 8547329 -Author: Martin Kaiser -Date: Sun Apr 13 18:54:40 2014 +0200 - - remove device_address parameter from try_dissect_next_protocol() - read the transfer type from the usb conversation instead - - Change-Id: I91b835aea32edbf7916c392afc0eb14e711f1baf - Reviewed-on: https://code.wireshark.org/review/1113 - Reviewed-by: Martin Kaiser - -commit dc97682 -Author: Martin Kaiser -Date: Sun Apr 13 18:49:16 2014 +0200 - - remove bus_id parameter from try_dissect_next_protocol() - read the transfer type from the usb conversation instead - - Change-Id: I246a64f72b8c38b98337f463ee137e30fc9b504d - Reviewed-on: https://code.wireshark.org/review/1112 - Reviewed-by: Martin Kaiser - -commit 01d2ca6 -Author: Martin Kaiser -Date: Sun Apr 13 18:41:19 2014 +0200 - - remove type parameter from try_dissect_next_protocol() - read the transfer type from the usb conversation instead - - Change-Id: Iec4866ac9c58bf576422f4bcb3bc8947bca27f06 - Reviewed-on: https://code.wireshark.org/review/1111 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 3aa48c8 -Author: Martin Kaiser -Date: Mon Apr 14 15:33:25 2014 +0200 - - path is used only for libsmi and geoip - fix a compile error when they're both unused - - Change-Id: I23b341bc02624e3e56320818056ac3cc8cd65b99 - Reviewed-on: https://code.wireshark.org/review/1107 - Reviewed-by: Martin Kaiser - -commit c687697 -Author: AndersBroman -Date: Mon Apr 14 14:47:30 2014 +0200 - - Fix no previous prototype warnings. - - Change-Id: I859597ebc957a58f659800ef63318f94e80feabf - Reviewed-on: https://code.wireshark.org/review/1104 - Reviewed-by: Anders Broman - -commit 167041a -Author: Alexis La Goutte -Date: Mon Apr 14 14:34:37 2014 +0200 - - Try to make happy Ubuntu Buildbot - - ../../../epan/wslua/wslua_tree.c: In function 'TreeItem_add_packet_field': - ../../../epan/wslua/wslua_tree.c:151:14: error: variable 'tvbr' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered] - ../../../epan/wslua/wslua_tree.c:154:9: error: variable 'ett' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered] - ../../../epan/wslua/wslua_tree.c:159:9: error: variable 'nargs' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered] - - Change-Id: I1720a62613f4bf94ae2f8649a04139a7899fb106 - Reviewed-on: https://code.wireshark.org/review/1103 - Reviewed-by: Anders Broman - -commit 2414d9d -Author: Alexis La Goutte -Date: Mon Apr 14 08:59:28 2014 +0200 - - Fix Argument with 'nonnull' attribute passed null found by Clang - - Change-Id: If1c907308a7c776a6198530663f8dce03839d43b - Reviewed-on: https://code.wireshark.org/review/1098 - Reviewed-by: Anders Broman - -commit dd00264 -Author: Hadriel Kaplan -Date: Sat Apr 12 00:32:20 2014 -0400 - - Add tvb_get and proto_tree_add for string-encoded timestamps - - This commit adds tvb_get_string_time and proto_tree_add_time_item routines for - getting nstime fields from the tvb when they are encoded in ASCII string form. - - The proto_tree_add_time_item routine is also usable for normal - big/little-endian encoded time_t, and has the advantage of retrieving - the value even if there's no proto tree. - - It also exposes the routines to Lua, both so that a Lua script can take - advantage of this, but also so I can write a testsuite to test the functions. - - Change-Id: I955da10f68f2680e3da3a5be5ad8fdce7ed6808c - Reviewed-on: https://code.wireshark.org/review/1084 - Reviewed-by: Anders Broman - -commit 92b5013 -Author: Alexis La Goutte -Date: Mon Apr 14 12:34:10 2014 +0200 - - Enhance translation (rename also pixel => Pixel to avoid similar string...) - - Change-Id: Ic2e0ca99382208c13ea2c71c11684c43b34b9988 - Reviewed-on: https://code.wireshark.org/review/1099 - Reviewed-by: Alexis La Goutte - -commit 3ca06aa -Author: Michal Labedzki -Date: Mon Apr 14 08:07:58 2014 +0200 - - Increase tap limit to 5000 - - This will fix "Warn Too many taps queued" information, - while there is more then 100 PDUs to be exported. - For example while exporting Logcat from TCP/IP it is quite - often to have PDU with multiple Logcat PDUs around 1000. - - Change-Id: I24d0619e57ae494c836c19c8a67df44503c54318 - Reviewed-on: https://code.wireshark.org/review/1096 - Reviewed-by: Alexis La Goutte - -commit 5d51a8d -Author: Michal Labedzki -Date: Tue Apr 1 08:53:39 2014 +0200 - - Fix wtap displayable names - - Also fix indentions. - - Change-Id: I5440859aaf3ec1dbf416d9da6c1dab71bec803d8 - Reviewed-on: https://code.wireshark.org/review/1094 - Reviewed-by: Alexis La Goutte - -commit 444cdf5 -Author: Michal Labedzki -Date: Mon Apr 14 07:59:25 2014 +0200 - - Bluetooth: ATT: Add missing offset calculations - - Change-Id: Ia0fe426bff7d48a45d915a18aa679bb8978d2fca - Reviewed-on: https://code.wireshark.org/review/1095 - Reviewed-by: Alexis La Goutte - -commit bf515f5 -Author: Alexis La Goutte -Date: Sun Apr 13 20:31:21 2014 +0200 - - lupdate / lrelease translation file... - - Change-Id: I6d93828ece6e62e4885c31d6d4429c652ead9389 - Reviewed-on: https://code.wireshark.org/review/1090 - Reviewed-by: Alexis La Goutte - -commit 16d45a6 -Author: Michal Labedzki -Date: Fri Apr 11 17:59:17 2014 +0200 - - Allow FT_BYTES, FT_NONE, FT_STRING use length "-1" - - All three types support zero length, so using - -1 (aka length remaining) should be safe. - - Change-Id: Ia616d652ce6884f8e12a5ac5782073403810b10b - Reviewed-on: https://code.wireshark.org/review/1072 - Reviewed-by: Alexis La Goutte - -commit fca3746 -Author: Alexis La Goutte -Date: Sun Apr 13 20:30:42 2014 +0200 - - Enhance translation (rename toolTip to avoid similar string...) - - Change-Id: I66a17871829a769fe6ffecb2becbb5f4cc7fa078 - Reviewed-on: https://code.wireshark.org/review/1089 - Reviewed-by: Gerald Combs - Reviewed-by: Evan Huus - -commit d64a5fb -Author: Michael Mann -Date: Sun Apr 13 21:08:34 2014 -0400 - - Fix infinite loop. Bug 9986 - - Change-Id: Idbd22522918f0db131945d2a39f38b963ca3e0c2 - Reviewed-on: https://code.wireshark.org/review/1093 - Reviewed-by: Michael Mann - -commit 0a5572e -Author: Hadriel Kaplan -Date: Thu Apr 3 17:42:54 2014 -0400 - - Fix Bug 9951: 'git commit hook isn't calling checkAPIs.pl with arguments for the dissectors' - - I recently made a change to packet-rtp.c and inappropriately included - g_error() in it, which the builbots caught during their run of checkAPIs.pl. - But checkAPIs.pl is supposed to catch such things for us before we submit, by - being invoked in the git pre-commit hook. - - Apparently though, buildbots call checkAPIs.pl with extra arguments for - different cases... and for packet dissectors it calls it with a '-g abort' - argument, which is how it caught the g_error. - - So the "bug" is that the pre-commit hook should invoke checAPIs.pl with that - argument too, for epan/dissectors/packet-*.c files. - - Change-Id: Ie8f9dcc55f2248918208dea85a04f67e6bf9829a - Reviewed-on: https://code.wireshark.org/review/953 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Evan Huus - Reviewed-by: Michael Mann - -commit f532fb9 -Author: Pascal Quantin -Date: Sun Apr 13 22:47:53 2014 +0200 - - MBIM: fix dissection of ENVELOPE Sim Toolkit messages - - Change-Id: I3e6567e8ebfe83f12a0e2cbb2998b2e43ad2277a - Reviewed-on: https://code.wireshark.org/review/1092 - Reviewed-by: Pascal Quantin - -commit f6dfda3 -Author: Pascal Quantin -Date: Sun Apr 13 22:39:29 2014 +0200 - - MBIM: add decoding of text based CDMA SMS - - Change-Id: Id2497597660bffeff2d98087d6511b91bfd93b1a - Reviewed-on: https://code.wireshark.org/review/1091 - Reviewed-by: Pascal Quantin - -commit cfe11b1 -Author: Pascal Quantin -Date: Sun Apr 13 18:53:29 2014 +0200 - - Add ENC_ASCII_7BITS encoding - - Change-Id: I01ec87ff4181afb5b2de487fd5f5200f8d62f17d - Reviewed-on: https://code.wireshark.org/review/1088 - Reviewed-by: Pascal Quantin - -commit 63ed474 -Author: Gerald Combs -Date: Thu Apr 10 15:30:00 2014 -0700 - - Replace QTableWidgets with QLabels + HTML tables. - - This lets the user select and copy the folder and plugin data as text. - Add clickable local filesystem URLs while we're at it. - - (I suspect that you shouldn't use QTableWidgets unless you're creating a - spreadsheet.) - - Change-Id: I45650bd4f4b6215824a4ed70ec80698d0805baba - Reviewed-on: https://code.wireshark.org/review/1064 - Reviewed-by: Gerald Combs - -commit cf85d91 -Author: Gerald Combs -Date: Sun Apr 13 08:04:54 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-04-13] - - Change-Id: I0af1de7915bf152ae59e48b4fb2e80c302aa4b39 - Reviewed-on: https://code.wireshark.org/review/1085 - Reviewed-by: Alexis La Goutte - -commit f55269e -Author: Guy Harris -Date: Sat Apr 12 15:39:20 2014 -0700 - - Use ftype_name() to get the name of an FT_ value. - - That way we don't have to update the hf_types[] value_string if a new - type is added. - - Change-Id: If4fd0a8ff2d6b54d0b70140be407dae9c4ab6b3b - Reviewed-on: https://code.wireshark.org/review/1083 - Reviewed-by: Guy Harris - -commit cb16dff -Author: Guy Harris -Date: Sat Apr 12 15:26:34 2014 -0700 - - Get rid of more tvb_get_nstringz* calls. - - Add an FT_STRINGZPAD type, for null-padded strings (typically - fixed-length fields, where the string can be up to the length of the - field, and is null-padded if it's shorter than that), and use it. Use - IS_FT_STRING() in more cases, so that less code needs to know what types - are string types. - - Add a tvb_get_stringzpad() routine, which gets null-padded strings. - Currently, it does the same thing that tvb_get_string_enc() does, but - that might change if we don't store string values as null-terminated - strings. - - Change-Id: I46f56e130de8f419a19b56ded914e24cc7518a66 - Reviewed-on: https://code.wireshark.org/review/1082 - Reviewed-by: Guy Harris - -commit ef8a0a2 -Author: Pascal Quantin -Date: Sat Apr 12 19:19:04 2014 +0200 - - Update E.212 list to Operational Bulletin No. 1047 (1.III.2014) - - Change-Id: I6eddb03a0ef541f94fc166a03417a91bb219e235 - Reviewed-on: https://code.wireshark.org/review/1081 - Reviewed-by: Pascal Quantin - -commit d7d1cdb -Author: Pascal Quantin -Date: Sat Apr 12 16:13:36 2014 +0200 - - Add MQTT to release notes - - Change-Id: I553698c522b4a1eba370591a4ab788a139f8f221 - Reviewed-on: https://code.wireshark.org/review/1080 - Reviewed-by: Pascal Quantin - -commit c00de87 -Author: Martin Kaiser -Date: Sat Apr 12 14:08:41 2014 +0200 - - no need for if(tree) - - Change-Id: Ic74a8f080628dc200fe1f5a4d34ff5f9bb60e232 - Reviewed-on: https://code.wireshark.org/review/1079 - Reviewed-by: Martin Kaiser - -commit 37f8550 -Author: Martin Kaiser -Date: Sat Apr 12 14:07:08 2014 +0200 - - TABs -> spaces - add editor modelines - - Change-Id: Ieee4ea5c5043c519c465a4b0570357f2c22e311c - Reviewed-on: https://code.wireshark.org/review/1078 - Reviewed-by: Martin Kaiser - -commit 6fd55a2 -Author: Alexis La Goutte -Date: Fri Apr 11 16:56:38 2014 +0200 - - Fix packet-vp8.c:168:6: warning: redundant redeclaration of 'proto_reg_handoff_vp8' [-Wredundant-decls] - packet-vp8.c:30:6: note: previous declaration of 'proto_reg_handoff_vp8' was here - - Change-Id: Ibbae1eeffaa672224e5ea77bda8e207d077b7262 - Reviewed-on: https://code.wireshark.org/review/1071 - Reviewed-by: Michael Mann - -commit ae127f2 -Author: Guy Harris -Date: Sat Apr 12 01:53:33 2014 -0700 - - Add Mac Roman and DOS CP437. - - Change-Id: Ib96f2cf4ea71cd0cc2c703d58b9d254bf4c1248a - Reviewed-on: https://code.wireshark.org/review/1077 - Reviewed-by: Guy Harris - -commit 538429c -Author: David Ameiss -Date: Thu Apr 10 08:53:48 2014 -0500 - - Fixes for numerous fuzz crashes - bug 9962. - - Change-Id: I34fb09b62e79bfadd362c0ade81bec80dd0f14e0 - Reviewed-on: https://code.wireshark.org/review/1058 - Reviewed-by: Guy Harris - Reviewed-by: Michael Mann - -commit 0c2978d -Author: Shu Shen -Date: Fri Apr 11 14:22:56 2014 -0700 - - Adding message type to COL_INFO for multipart messages - - Change-Id: I0ae84101c71f31e2d6ab91c7f7b74da81865b8f3 - Signed-off-by: Shu Shen - Reviewed-on: https://code.wireshark.org/review/1075 - Reviewed-by: Michael Mann - -commit 5ad84a9 -Author: Evan Huus -Date: Fri Apr 11 14:08:14 2014 -0400 - - Fix non-standard format specifiers - - C90 permits plain %f for doubles. Thanks to Alexis for pointing this out. - - Change-Id: I3f927b0a50e5764c2297c7f9d680c6363ba9fd0e - Reviewed-on: https://code.wireshark.org/review/1073 - Reviewed-by: Alexis La Goutte - Reviewed-by: Michael Mann - -commit 2afa065 -Author: Stig Bjørlykke -Date: Fri Apr 11 22:24:23 2014 +0200 - - Fix compilation if not HAVE_LIBGNUTLS and not HAVE_LIBGCRYPT - - This was introduced in the previous compilation fix. - - Change-Id: I4ec652a2708d90f35f3f00ec2c3261acb3e68397 - Reviewed-on: https://code.wireshark.org/review/1074 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit b642a28 -Author: Stig Bjørlykke -Date: Fri Apr 11 15:20:00 2014 +0200 - - Fix compilation if HAVE_LIBGNUTLS but not HAVE_LIBGCRYPT. - - Also fixed a comment for a #endif for the same defines. - - Change-Id: Icbbf619dbaeb1d4d154a5f1a8273f252d35c6981 - Reviewed-on: https://code.wireshark.org/review/1070 - Reviewed-by: Alexis La Goutte - -commit 48c05a4 -Author: Niels de Vos -Date: Fri Apr 11 10:47:19 2014 +0200 - - GlusterFS: correctly dissect flags passed with OPEN, CREATE, etc. - - RPC/XDR is in big-endian, just like dissect_rpc_uint64() and friends. - - Change-Id: I0843e280bd2ffc2c4bd9a5273a7343a17d81ad6a - Reported-by: Xavier Hernandez - Signed-off-by: Niels de Vos - Reviewed-on: https://code.wireshark.org/review/1066 - Reviewed-by: Alexis La Goutte - -commit 3f81af2 -Author: Stig Bjørlykke -Date: Fri Apr 11 13:13:42 2014 +0200 - - Improved TLS/DTLS Heartbeat Message handling. - - Added an expert info for invalid payload length (heartbleed). - - Change-Id: I9e09d1ae2b997091bbce2483c098dba7e6631859 - Reviewed-on: https://code.wireshark.org/review/1067 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - Reviewed-by: Michael Mann - -commit 9ce003a -Author: Stig Bjørlykke -Date: Fri Apr 11 13:17:56 2014 +0200 - - Added P1 extension 34. - - Change-Id: Iccaaf39d4de21e1a12a26c40a184321a67b41f3e - Reviewed-on: https://code.wireshark.org/review/1068 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit 7ac3ed3 -Author: Gerald Combs -Date: Thu Apr 10 18:25:50 2014 -0700 - - Fix unused variable warnings found by clang. - - Change-Id: I31ff6d9bfcedfc1e3cab4e191d8dbf8de347abb1 - Reviewed-on: https://code.wireshark.org/review/1065 - Reviewed-by: Gerald Combs - -commit 725c2b3 -Author: Alexis La Goutte -Date: Thu Apr 10 22:53:11 2014 +0200 - - Fix called C++ object pointer is null found by Clang Analyzer - - Change-Id: I7d142ed60af8bb776ea732bf9ef94ad92bc23d70 - Reviewed-on: https://code.wireshark.org/review/1061 - Reviewed-by: Michael Mann - -commit 36a2ba2 -Author: Martin Kaiser -Date: Thu Apr 10 23:00:59 2014 +0200 - - display LCNs as decimal number - this makes them easier to compare with your TVs channel list - - Change-Id: Ie78d1a7df8aa83455ff723fa523b84a067231e5f - Reviewed-on: https://code.wireshark.org/review/1063 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit b6cbf23 -Author: Martin Kaiser -Date: Thu Apr 10 22:59:19 2014 +0200 - - use the CI+ value string for CI+ descriptor tags - - Change-Id: I48f3304f74263672a65a74f523f14ebb7950d2d6 - Reviewed-on: https://code.wireshark.org/review/1062 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit b84ce5c -Author: Bill Meier -Date: Thu Apr 10 13:56:52 2014 -0400 - - Comment out a section re SVN usage; svn ==> git in a few cases; Fix some typos. - - Change-Id: I0bd7a7d4bdcc566af6b8f672a25fb937176fde21 - Reviewed-on: https://code.wireshark.org/review/1060 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit ed1e229 -Author: Michael Mann -Date: Thu Apr 10 08:53:53 2014 -0400 - - Fix infinite loop. Bug 9970 - - Change-Id: I4f928187b9ba3e522f63f6b6987587e3638d8ba7 - Reviewed-on: https://code.wireshark.org/review/1057 - Reviewed-by: Francesco Fondelli - Reviewed-by: Michael Mann - -commit f5b26da -Author: Bill Meier -Date: Thu Apr 10 12:55:28 2014 -0400 - - Remove unneeded #include. - - Change-Id: I3675f664f1e67c3881e5911427725fade8d1d0f0 - Reviewed-on: https://code.wireshark.org/review/1059 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 28931af -Author: AndersBroman -Date: Thu Apr 10 12:33:21 2014 +0200 - - Update to the latest packet format. - - Change-Id: I745a05c9a9e7a5addc00befc2b4ff019aca2a4cc - Reviewed-on: https://code.wireshark.org/review/1056 - Reviewed-by: Anders Broman - -commit 9ed6b19 -Author: AndersBroman -Date: Thu Apr 10 10:00:16 2014 +0200 - - Add a hint in the protocol tree. - - Change-Id: Id565b153e322599430218eb6f7a542e2dd763458 - Reviewed-on: https://code.wireshark.org/review/1055 - Reviewed-by: Anders Broman - -commit 98df3ce -Author: AndersBroman -Date: Thu Apr 10 09:43:47 2014 +0200 - - Have the checkum preference only affect IPv4 - - Change-Id: I6416ab40ac4e1e652bc453fb8e6d3eaa6ec5fe65 - Reviewed-on: https://code.wireshark.org/review/1054 - Reviewed-by: Anders Broman - -commit af6618b -Author: Guy Harris -Date: Wed Apr 9 18:41:54 2014 -0700 - - More zero-length checks. - - Fixes bug 9965. - - (Also fixes a typo in an expert info string.) - - Change-Id: I0b4f9bc4619e0d2ba291795973070598e2e142fe - Reviewed-on: https://code.wireshark.org/review/1051 - Reviewed-by: Guy Harris - -commit 209b082 -Author: Guy Harris -Date: Wed Apr 9 18:30:03 2014 -0700 - - Check for zero-length options. - - Otherwise, we get an infinite loop when processing options. This might - be the cause of bug 9967. - - Change-Id: If115c8cc8fc87b0c4252ab3cd07bfa34952786c6 - Reviewed-on: https://code.wireshark.org/review/1050 - Reviewed-by: Guy Harris - -commit ea7660a -Author: Guy Harris -Date: Wed Apr 9 18:06:20 2014 -0700 - - Fix two ett_ variables that weren't getting registered. - - Change-Id: I0b37bf3d89a108978a6c917fc4d3a33cba456493 - Reviewed-on: https://code.wireshark.org/review/1048 - Reviewed-by: Guy Harris - -commit 7cbc790 -Author: Guy Harris -Date: Wed Apr 9 17:48:32 2014 -0700 - - Avoid bug 9962 - don't use variables that haven't been set. - - See the comment for details. - - Change-Id: I0b1800dd884736e00201f09166c0d2bd6795b6c3 - Reviewed-on: https://code.wireshark.org/review/1047 - Reviewed-by: Guy Harris - -commit 7fb9e9b -Author: Guy Harris -Date: Wed Apr 9 15:58:59 2014 -0700 - - Fix white space. - - Change-Id: Ia36d439d1210f93be25a31d2a7288474688e0d9c - Reviewed-on: https://code.wireshark.org/review/1046 - Reviewed-by: Guy Harris - -commit b3350ed -Author: Evan Huus -Date: Wed Apr 9 17:19:31 2014 -0400 - - Update kafka OffsetFetchResponse dissection - - Per https://github.com/Shopify/sarama/pull/77 the spec is out of date, there is - no longer a clientID field in certain messages. - - Change-Id: Ieeb7b8f1dd32b326b3d9507e3d5897574a1b09fd - Reviewed-on: https://code.wireshark.org/review/1043 - Reviewed-by: Michael Mann - -commit 800cd7b -Author: Michael Mann -Date: Wed Apr 9 08:34:47 2014 -0400 - - Improve dissection of RFC 6607. Bug 9960 - - Change-Id: Ibab13b0ab7b3f0ac1d9c2e305cb428bb17689313 - Reviewed-on: https://code.wireshark.org/review/1039 - Reviewed-by: Evan Huus - Reviewed-by: Michael Mann - -commit 4990a8e -Author: Michael Mann -Date: Sun Apr 6 16:31:53 2014 -0400 - - Added support for MQTT protocol. Bug 9930 - - Change-Id: I04fc3a6225c56af9905f4f9bbbca5bc10f214843 - Reviewed-on: https://code.wireshark.org/review/873 - Reviewed-by: Evan Huus - Reviewed-by: Michael Mann - -commit a07dd03 -Author: Guy Harris -Date: Wed Apr 9 14:37:31 2014 -0700 - - Clean up white space. - - Change-Id: If274c6239859127485d306b92a59e4d473c26d39 - Reviewed-on: https://code.wireshark.org/review/1045 - Reviewed-by: Guy Harris - -commit 4e8d739 -Author: Guy Harris -Date: Wed Apr 9 14:32:15 2014 -0700 - - Use tvb_strncaseeql() to check for XML. - - This avoids using tvb_get_nstringz0(), and simplifies the check. - - Change-Id: Ib33cf22bf79d4fac8896c25a8b879eeb6e506831 - Reviewed-on: https://code.wireshark.org/review/1044 - Reviewed-by: Guy Harris - -commit baa9d10 -Author: Martin Kaiser -Date: Wed Apr 9 14:39:15 2014 +0200 - - iTXt chunk name - - Change-Id: I0310368319fe70782bd2c3b48e100292cd93d8c4 - Reviewed-on: https://code.wireshark.org/review/1042 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit a653014 -Author: AndersBroman -Date: Wed Apr 9 15:56:06 2014 +0200 - - There seems to be some ambigiousy on how to calculate V3 checksums for - IPv4. Introduce a preference to use the same metod as for VRRP V2. - http://ask.wireshark.org/questions/15291/does-wireshark-uses-a-pseudo-header-for-vrrpv3-ipv4-checksum-calculation - - Change-Id: I14bf279b0c85405c1963784737add9321d5cb7c4 - Reviewed-on: https://code.wireshark.org/review/1040 - Reviewed-by: Anders Broman - -commit dae96ca -Author: Pascal Quantin -Date: Tue Apr 8 20:01:01 2014 +0200 - - Switch back Windows 32 bits build to GTK2 - - GTK3 does not work great on Windows: - - the GUI is quite ugly - - features like background color in filter box does not work - - x64 builds are still using GTK2 - - no one is putting efforts on this to fix those issues - - As we are transitioning to Qt, I do not expect any improvement soon. - Let's switch back to a more user friendly GUI. - - Change-Id: I04c0856b8ac8ce808c1942f7f26b14dd57388d1a - Reviewed-on: https://code.wireshark.org/review/1026 - Reviewed-by: Anders Broman - Reviewed-by: Michael Mann - -commit 1c162ff -Author: Guy Harris -Date: Wed Apr 9 02:44:15 2014 -0700 - - Clean up the dissection of ServiceContexts. - - Make the top-level item for a ServiceContext an item for the - ServiceContext as a while, and put the VSCID under it like other items, - rather than making the VSCID the top-level item. - - Don't dissect the VSCID using the value_string field for the Object - Management Group's SCIDs; use that value_string field for the SCID if - the VSCID is 0 (meaning "Object Management Group"), and have no - value_string field for the VSCID otherwise (the interpretation of the - SCID depends on the value of the VSCID). - - Dissect the encapsulation information even for unknown ServiceContexts. - - If the ServiceContext's length is bigger than what it's supposed to be, - throw an exception if it's also bigger than the data available in the - packet; this squelches a run-time warning in that case. - - Change-Id: I11cc62c2e32f4623dba2a551119b3146a7037e6d - Reviewed-on: https://code.wireshark.org/review/1038 - Reviewed-by: Guy Harris - -commit 9c14703 -Author: Martin Kaiser -Date: Tue Apr 8 16:22:13 2014 +0200 - - remove usb_trans_info parameter - trans_info is part of the conversation info - - Change-Id: I3eafe893324d7d6d23c5475f6f7aa34b7520a6b8 - Reviewed-on: https://code.wireshark.org/review/1018 - Reviewed-by: Alexis La Goutte - -commit 3e228c0 -Author: Martin Kaiser -Date: Tue Apr 8 15:59:02 2014 +0200 - - setup dissectors don't need bus_id and device_address parameters - these values are already part of usb_conv_info - - Change-Id: I79f0c67c91f0f93ba2d52ef08875833eee5e9efd - Reviewed-on: https://code.wireshark.org/review/1017 - Reviewed-by: Alexis La Goutte - -commit 7d83a87 -Author: Guy Harris -Date: Wed Apr 9 01:04:37 2014 -0700 - - Don't use tvb_get_nstringz0(), use tvb_get_string_enc(). - - Change-Id: I8e654fa857fca6713198e3d20f2a14a0a444e935 - Reviewed-on: https://code.wireshark.org/review/1037 - Reviewed-by: Guy Harris - -commit 412c6ca -Author: Michał Orynicz -Date: Tue Apr 8 09:33:43 2014 +0200 - - Make makefile verbosity configurable from CMake - - This change makes CMAKE_VERBOSE_MAKEFILE option - of CMake used to determine verbosity of generated - makefile, instead of hardcoding it in CMakeLists.txt - script and forcing user to read the script and use - workarounds like "make VERBOSE=1" - - Change-Id: I0f3b90ccf962ff88fbfa21ad2f3920b1644d6b6e - Reviewed-on: https://code.wireshark.org/review/1002 - Reviewed-by: Michal Labedzki - Reviewed-by: Alexis La Goutte - -commit 3057e30 -Author: Michał Orynicz -Date: Tue Apr 8 10:40:09 2014 +0200 - - Change how WERROR and WERR_UNKNOWN is turned off - - Use setting WERROR and WERR_UNKNOWN explicitly to - FALSE instead using unset command. This ensures that - no if(WERROR) or if(WERR_UNKNOWN) clause will trigger - unless these variables are set to another value. - - Change-Id: I752d7691c9c101b07c6ee85db83d96d9190bccd7 - Reviewed-on: https://code.wireshark.org/review/1001 - Reviewed-by: Michal Labedzki - Reviewed-by: Alexis La Goutte - -commit 8d9c45d -Author: Evan Huus -Date: Tue Apr 8 19:11:15 2014 -0400 - - Update some Kafka API constants per lastest spec - - Change-Id: Icef981f50e81e5059916e3bde5fa8a1e1fcd92ae - Reviewed-on: https://code.wireshark.org/review/1033 - Reviewed-by: Alexis La Goutte - -commit 130b94f -Author: Guy Harris -Date: Tue Apr 8 19:01:59 2014 -0700 - - Sadly, packet-dcerpc-mapi.c is not yet free of warnings. - - Change-Id: Ic208c89a915fc34d0f42ce788a60aa15029d105b - Reviewed-on: https://code.wireshark.org/review/1036 - Reviewed-by: Guy Harris - -commit d8a647e -Author: Guy Harris -Date: Tue Apr 8 17:58:32 2014 -0700 - - OK, that might mean packet-dcerpc-mapi.c now has no warnings. - - Change-Id: I22688f0a9b6c04b1e0e9f16c92e7c0713610854c - Reviewed-on: https://code.wireshark.org/review/1035 - Reviewed-by: Guy Harris - -commit ed075f2 -Author: Guy Harris -Date: Tue Apr 8 17:50:56 2014 -0700 - - Fix some C++ warnings about implicit casts. - - Change-Id: I19730e723700f0cc7dcc7ba0db2689f076c7bb5b - Reviewed-on: https://code.wireshark.org/review/1034 - Reviewed-by: Guy Harris - -commit 6ae5747 -Author: Guy Harris -Date: Tue Apr 8 12:25:49 2014 -0700 - - I don't see anything here requiring netinet/in.h, so don't include it. - - Change-Id: Id024d7e2529a6eb9ca79ce8c3ea674a3c0795b85 - Reviewed-on: https://code.wireshark.org/review/1030 - Reviewed-by: Guy Harris - -commit 834f563 -Author: Guy Harris -Date: Tue Apr 8 12:23:57 2014 -0700 - - I don't see anything here requiring netinet/in.h, so don't include it. - - Change-Id: I852d810d6cd6105b564a6fa630a53499d99afde0 - Reviewed-on: https://code.wireshark.org/review/1029 - Reviewed-by: Guy Harris - -commit 84a57cb -Author: Gerald Combs -Date: Tue Apr 8 12:21:01 2014 -0700 - - The "not DNS" filter used UDP in the description but matched against - TCP. DNS runs over both so update the filter to exclude both. - - Thanks to Yaron Fainstein for noticing this. - - Change-Id: I0c4d1fef7f8d725bf656cca87ba5908893fff0b2 - Reviewed-on: https://code.wireshark.org/review/1028 - Reviewed-by: Gerald Combs - -commit 07ee5de -Author: Guy Harris -Date: Tue Apr 8 12:19:55 2014 -0700 - - Get the UDP protocol number from a Wireshark header. - - We have epan/ipproto.h to define various IP protocol numbers; use that. - - Change-Id: I1ec72028182125f7e11dc159791753ee26d35f12 - Reviewed-on: https://code.wireshark.org/review/1027 - Reviewed-by: Guy Harris - -commit 7d458fa -Author: Guy Harris -Date: Tue Apr 8 11:03:58 2014 -0700 - - Make sure IPv4 address structures really have 4 bytes of data. - - Change-Id: If89827677f7503fc67ba9a025f28447a68a98f07 - Reviewed-on: https://code.wireshark.org/review/1025 - Reviewed-by: Guy Harris - -commit beb4876 -Author: Guy Harris -Date: Tue Apr 8 10:57:59 2014 -0700 - - Don't assume the data pointed to by an address structure is aligned. - - And don't assume you can dereference the pointer nonetheless; that - doesn't work on SPARC, for example - you get an unaligned-access trap. - - Instead, use pntoh32() to fetch IPv4 address values from the address - structures. - - While we're at it, just use guint32 for those addresses; we don't need - in_addr_t. - - Change-Id: I84e6c653fe33b1bc6e67d9097ce423b82f1eb0c8 - Reviewed-on: https://code.wireshark.org/review/1024 - Reviewed-by: Guy Harris - -commit 0f0c079 -Author: Michał Orynicz -Date: Tue Apr 8 13:09:36 2014 +0200 - - Add commit-msg hook to tools to spare searching for it - - commit-msg script adds change id at end of commit messages. - As this script is needed for Gerrit review system to work - and every wireshark developer will need to download it from - somewhere, it will be better if it is downloaded with Wireshark - sources and ready to copy to .git/hooks - - Copied from AOSP Gerrit. - - Change-Id: Ib3705abfedd2869462eef57690a2f430037f9cc1 - Reviewed-on: https://code.wireshark.org/review/1008 - Reviewed-by: Michael Mann - -commit 3c13e98 -Author: Guy Harris -Date: Tue Apr 8 09:35:33 2014 -0700 - - Squelch another warning; fix a place assuming 8-bit device IDs. - - Change-Id: I0b2d30a7724f9493ef0388232f6c13751e707255 - Reviewed-on: https://code.wireshark.org/review/1023 - Reviewed-by: Guy Harris - -commit 45f0192 -Author: Guy Harris -Date: Tue Apr 8 09:13:39 2014 -0700 - - Get rid of some unused functions. - - Change-Id: I3b1529826c04334d2df8e3f80a69e8b51651b9cf - Reviewed-on: https://code.wireshark.org/review/1022 - Reviewed-by: Guy Harris - -commit 63f18c4 -Author: Guy Harris -Date: Tue Apr 8 09:11:21 2014 -0700 - - USB device addresses need to be 16-bit. - - They are 16-bit in the Windows header; make them that way everywhere, so - that we don't get "shortening 16 bits to 8 bits" warnings. - - Change-Id: I18f4c4254f224d76a90f3e87bc2f28cba011b5a3 - Reviewed-on: https://code.wireshark.org/review/1021 - Reviewed-by: Guy Harris - -commit 946dfdb -Author: AndersBroman -Date: Tue Apr 8 17:29:42 2014 +0200 - - Add application/vnd.oma.xdm-apd+xml - - Change-Id: I7d5c3757d5c66da4b1ce91026bdacd9631eda78c - Reviewed-on: https://code.wireshark.org/review/1020 - Reviewed-by: Anders Broman - -commit fa4c104 -Author: AndersBroman -Date: Tue Apr 8 17:10:51 2014 +0200 - - Update to V11.6.0 - - Change-Id: I91def9d33901f82b9516a0be464ba9e609da0007 - Reviewed-on: https://code.wireshark.org/review/1019 - Reviewed-by: Anders Broman - -commit 7a3cd91 -Author: Martin Kaiser -Date: Tue Apr 8 10:41:55 2014 +0200 - - reformat the code for bulk, interrupt urbs - - Change-Id: Ib2374df62daf0fc26fb02202d3a64e59b902a1e8 - Reviewed-on: https://code.wireshark.org/review/1016 - Reviewed-by: Martin Kaiser - -commit 8d6b20a -Author: Martin Kaiser -Date: Tue Apr 8 10:14:35 2014 +0200 - - move the assignments for is_request, endpoint behind the if statements - - Change-Id: Id3938253bbc63cc27823afa326b1997182e3943d - Reviewed-on: https://code.wireshark.org/review/1015 - Reviewed-by: Martin Kaiser - -commit 7952e2a -Author: Martin Kaiser -Date: Tue Apr 8 10:41:24 2014 +0200 - - get rid of src_endpoint, dst_endpoint - - Change-Id: I0d12586afb3723a0da9d24ab2a4b7aa2426b5512 - Reviewed-on: https://code.wireshark.org/review/1014 - Reviewed-by: Martin Kaiser - -commit e140c0a -Author: Martin Kaiser -Date: Tue Apr 8 10:30:35 2014 +0200 - - get rid of tmp_address - - Change-Id: I67b83c07c591ef926e5eee94a5526479453d6955 - Reviewed-on: https://code.wireshark.org/review/1013 - Reviewed-by: Martin Kaiser - -commit 6acb386 -Author: Martin Kaiser -Date: Tue Apr 8 09:59:11 2014 +0200 - - remove another two NULL checks - - Change-Id: I091f35ecca8c1418e86ac41018beca705bb1fcd6 - Reviewed-on: https://code.wireshark.org/review/1012 - Reviewed-by: Martin Kaiser - -commit ab145d20 -Author: Martin Kaiser -Date: Sun Apr 6 21:25:04 2014 +0200 - - reformat the nested switch-case part - - Change-Id: Idd98825cbbc6bcc27823afac26b1997182e994cd - Reviewed-on: https://code.wireshark.org/review/1011 - Reviewed-by: Martin Kaiser - -commit dfd3680 -Author: AndersBroman -Date: Tue Apr 8 15:32:59 2014 +0200 - - Fix a typo, missing "," - - Change-Id: I848cf4c63f9b4c7daf6e63f2e60cd1d5aded7b82 - Reviewed-on: https://code.wireshark.org/review/1010 - Reviewed-by: Anders Broman - -commit d3b599e -Author: Alexis La Goutte -Date: Mon Apr 7 07:49:38 2014 +0200 - - Remove some variant of tfs_set_notset... - - Change-Id: Ida21963cd68f8fc7387cd2ca37d9436f98318d40 - Reviewed-on: https://code.wireshark.org/review/1004 - Reviewed-by: Alexis La Goutte - -commit 7077aaa -Author: Graham Bloice -Date: Tue Apr 8 12:26:19 2014 +0100 - - Fixes for Windows build post change 1006 - Windows still needs the definition of in_addr_t - - Change-Id: I43c417de8e8199cfa58b9d494be5e828f959f1a9 - Reviewed-on: https://code.wireshark.org/review/1009 - Reviewed-by: Graham Bloice - Tested-by: Graham Bloice - -commit 717613e -Author: Alexis La Goutte -Date: Mon Apr 7 07:38:30 2014 +0200 - - Fix Hello options Flags - * Remove flag I and F (from old draft of draft-ietf-ospf-manet-or) - * Add flag AT (Authentication) from RFC6506 (RFC7166) - - Closed-bug: 9941 - Change-Id: If6e9c2aa3d2e437ac499253a3061579f344fe607 - Reviewed-on: https://code.wireshark.org/review/1003 - Reviewed-by: Anders Broman - -commit 1d8cab5 -Author: Alexis La Goutte -Date: Mon Apr 7 08:48:14 2014 +0200 - - Make filterable OSPF Hello Packet - - Change-Id: Idc7e84fe9f00c30ad6edebcdd11c72d3a7fb77e7 - Reviewed-on: https://code.wireshark.org/review/1005 - Reviewed-by: Anders Broman - -commit d3df2e5 -Author: Guy Harris -Date: Tue Apr 8 01:22:57 2014 -0700 - - On UN*X, suffices for struct in_addr and in_addr_t. - - So don't pull in . Also, avoid in - packet-dcom.c. - - While we're at it, do *not* assume that pinfo->src or pinfo->dst are - IPv4 addresses. - - Change-Id: I5fc8e859780a8d863aaf6e90a21a7039cabae0e6 - Reviewed-on: https://code.wireshark.org/review/1006 - Reviewed-by: Guy Harris - -commit abbdcd8 -Author: Alexis La Goutte -Date: Tue Apr 8 08:44:44 2014 +0200 - - Fix warning found by -Wunused-const-variable (Clang 3.5) - - Change-Id: I4506be6ae8deda5e8d1e038b089620a15b650b03 - Reviewed-on: https://code.wireshark.org/review/1000 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit 872dd70 -Author: Guy Harris -Date: Mon Apr 7 18:51:41 2014 -0700 - - Don't pretend that sizeof(guintN) will give us more robust values. - - What matter in these cases is the number of bytes on the wire; either - sizeof(guint8) = 1, sizeof(guint16) = 2, and sizeof(guint32) = 4, in - which case just using 1, 2, and 4 avoids "64-bit to 32-bit conversion" - warnings on LP64 and LLP64 environments, or they're not equal, in which - case using 1, 2, and 4 rather than the sizeof()s is correct. - - Change-Id: I4f15c5fae51958c1aff17ff819a9878fa6bd1f54 - Reviewed-on: https://code.wireshark.org/review/999 - Reviewed-by: Guy Harris - -commit 75dcbc4 -Author: Guy Harris -Date: Mon Apr 7 17:45:45 2014 -0700 - - Make sure packet-lbttcp.h ends up in the release tarball. - - Change-Id: I9e0eec78bd2020040eb8d5fe5e527fb2a6fc6f9b - Reviewed-on: https://code.wireshark.org/review/998 - Reviewed-by: Guy Harris - -commit e1ce405 -Author: Marko Hrastovec -Date: Mon Apr 7 19:59:29 2014 +0200 - - ASTERIX - added dissector for category 023. - - Sample file with traffic is the same as for CAT021 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9953). Apply filter "asterix.category == 23" to see only CAT023 packets. - A small change in actual dissecting code was also needed because of strange item I023/101. The first FX bit is in the second byte and then grows only for a byte. - - Change-Id: I3f80e6e46b642efc6f2e19e6f931cdef1c39495a - Reviewed-on: https://code.wireshark.org/review/993 - Reviewed-by: Michael Mann - -commit 2f4ca9c -Author: Michael Mann -Date: Mon Apr 7 16:33:51 2014 -0400 - - Initial checkin of LBM aka 29West dissectors. See Bug 9718. - - Change-Id: If8fcfe1971c8863f370e440f64c36eb7566f6852 - Reviewed-on: https://code.wireshark.org/review/113 - Reviewed-by: Michael Mann - -commit 8c7fae2 -Author: Guy Harris -Date: Mon Apr 7 16:41:25 2014 -0700 - - Absolute and relative OIDs have different FT_ values. - - This squelches some run-time dissector asserts. - - Change-Id: I0ce33c4eb6e9c3bd371e47363a981e9a7a0dc789 - Reviewed-on: https://code.wireshark.org/review/997 - Reviewed-by: Guy Harris - -commit 2b5fc4e -Author: Guy Harris -Date: Mon Apr 7 16:14:01 2014 -0700 - - The encoding of a string is *not* part of its type. - - So get rid of the commented-out FT_UCS2_LE; that would be handled as an - FT_STRING, FT_UINT_STRING, or FT_STRINGZ with an encoding of - ENC_UCS_2|ENC_LITTLE_ENDIAN. - - Change-Id: I828fc1ed49843a503ec70e6adaf6dadd256df407 - Reviewed-on: https://code.wireshark.org/review/996 - Reviewed-by: Guy Harris - -commit 172f5cd -Author: Guy Harris -Date: Mon Apr 7 16:07:06 2014 -0700 - - Sort the values in value_strings that we'll treat as extended. - - This squelches a run-time warning. - - Change-Id: I5b147530b7f9255c3564fe24b56e0ea3eab45852 - Reviewed-on: https://code.wireshark.org/review/995 - Reviewed-by: Guy Harris - -commit 26f46d4 -Author: Guy Harris -Date: Mon Apr 7 15:39:55 2014 -0700 - - Handle string types with somewhat appropriate encodings. - - For various string types defined in X.680, use the appropriate encoding, - or ENC_ASCII|ENC_NA in some cases where we don't have an appropriate - encoding yet. - - This most significantly fixes the handling of BMPString and - UniversalString, which are supersets of ASCII (Unicode Basic - Multilingual Plane and Unicode, respectively), but don't encode ASCII - characters as single octets. It also fixes UTF8String to, well, - properly recognize UTF-8. - - This also lets us get rid of the special handling of SyntaxBMPString in - X.509sat (and, in fact, *requires* us to get rid of it, as, otherwise, - the string value appears twice). - - Change-Id: I325c4e71a6110278eb23b86e0d986e6439cfc328 - Reviewed-on: https://code.wireshark.org/review/994 - Reviewed-by: Guy Harris - -commit a5cb72f -Author: Gerald Combs -Date: Tue Feb 11 16:07:10 2014 -0800 - - Add a Qt I/O Graph dialog. - - For each graph you can set: - - Its visibility - - A name - - A display filter - - Color, from a fixed list - - Plot style: Line, Impulse, Bar, Stacked Bar, Dot, Square, Diamond - - Basic Y Axes (packets/s, bytes/s, bits/s) - - Computed Y Axes (SUM, MIN, AVG, MAX) - - Smoothing - - You can pan and zoom using the mouse and keyboard. Clicking on a graph - selects the last packet for that interval. If all graphs have the same Y - axis a single label is shown, otherwise a legend is shown. - - The time scale (X axis) can be toggled between relative seconds and the - time of day. - - Graphs can be saved as PDF, PNG, BMP, and JPEG. Settings are "sticky" - via the io_graphs UAT. - - To do: - - Minimize graph drawing delays. - - Figure out why smoothing differs from GTK+ - - Everything else at the top of io_graph_dialog.cpp - - Fix empty resets. - - A fair amount of code was copied from TCPStreamDialog. We might want to - subclass QCustomPlot and place the shared code there. - - Move common syntax checking to SyntaxLineEdit. - - Move some common code from ui/gtk/io_stat.c to ui/io_graph_item.[ch] and - use it in both GTK+ and Qt. - - Make the io_graph_item_t array allocation in io_stat.c static. The - behavior should be identical and this gives us additional compile-time - checks. - - Change-Id: I9a3d544469b7048f0761fdbf7bcf20f44ae76577 - Reviewed-on: https://code.wireshark.org/review/435 - Reviewed-by: Gerald Combs - Tested-by: Gerald Combs - -commit cc3c05e -Author: Pascal Quantin -Date: Sun Apr 6 22:01:03 2014 +0200 - - Switch to Lua 5.2.3 built with MSVC2010 instead of the one built with MingW gcc 4.3 - - Fixes bug 9957 - - Change-Id: Ibe38ec25be5cfdad98c53c8257b0a858529897f6 - Reviewed-on: https://code.wireshark.org/review/991 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit e32b381 -Author: Hadriel Kaplan -Date: Sun Apr 6 18:54:24 2014 -0400 - - Fix Bug 9958: 'SDP displays double spaces between payload formats as a 0 payload format' - - Given an SDP m= line such as this: - - m=audio 29156 RTP/AVP 18 0 - - SDP will show a media format of G.729 (the 18) and then two G.711 entries: one - for the extra space between the 18 and 0, and one format for the 0. The latter - is correct, but the extra space one isn't. - - Technically such an m= line is malformed, since only one space is allowed - between payload formats; but it's definitely not a format of 0. - - A similar thing happens in many parts of SDP dissection code. It needs to issue - an expert error and handle it gracefully. - - Change-Id: I1f1500489a13a55e03fc8ea14b37d99a019fc449 - Reviewed-on: https://code.wireshark.org/review/989 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit 26dcdbb -Author: Jeff Morriss -Date: Sun Apr 6 19:59:52 2014 -0400 - - Tweak the Diameter heuristics a bit more. - - Increase the max Diameter message size to 65534 and reject messages whose - flags have both the E- and R-bits set. - - Change-Id: Ib11701a47d23ff042a346d59c56f9f0f4410e6b7 - Reviewed-on: https://code.wireshark.org/review/990 - Reviewed-by: Anders Broman - -commit 58a6487 -Author: Alexis La Goutte -Date: Sun Apr 6 19:25:36 2014 +0200 - - Add WS_DLL_PUBLIC for p_remove_proto_data and tvb_child_uncompres function - - Change-Id: If043683f366fedd849688ca3c512707954221a3b - Reviewed-on: https://code.wireshark.org/review/984 - Reviewed-by: Michael Mann - Reviewed-by: Anders Broman - -commit f06cdf3 -Author: Michael Mann -Date: Sun Apr 6 13:38:11 2014 -0400 - - Tweak ZigBee GreenPower heuristic to more closely match ZigBee NWK heuristic. Bug 9956 - - Change-Id: I2c4d26ee27684d1f18c39add249b9cd116cf6f71 - Reviewed-on: https://code.wireshark.org/review/985 - Reviewed-by: Michael Mann - Tested-by: Michael Mann - Reviewed-by: Alexis La Goutte - -commit 4eaec3c -Author: Guy Harris -Date: Sun Apr 6 14:21:49 2014 -0700 - - Get rid of an extra blank line. - - Change-Id: I119bbc0c4979a938e4d4633e6acbf46d265b8398 - Reviewed-on: https://code.wireshark.org/review/988 - Reviewed-by: Guy Harris - -commit 70ad7d8 -Author: Guy Harris -Date: Sun Apr 6 12:12:59 2014 -0700 - - Move the status dissecting code to the AFP dissector. - - The ASP and DSI dissectors had almost-identical dissection of the ASP - and DSI "status" responses. What's being dissected is defined by the AFP - specification (and might be different for protocols *other* than AFP - running atop AFP or DSI), so move that dissection to the AFP dissector. - - Note that, at least for AFP-over-DSI, the spec isn't being followed in - at least one capture. - - Change-Id: Idb1013483f3a3bdf2b7eb0618e48fc178a338642 - Reviewed-on: https://code.wireshark.org/review/987 - Reviewed-by: Guy Harris - -commit 5a67479 -Author: Alexis La Goutte -Date: Sun Apr 6 19:28:39 2014 +0200 - - Fix indent (use 2 spaces) and add modelinse info for frame_data.h - - Change-Id: Ib9eced1b652345cd40edb96ddde092f41a8f669c - Reviewed-on: https://code.wireshark.org/review/986 - Reviewed-by: Michael Mann - -commit 85aa071 -Author: Hadriel Kaplan -Date: Sun Apr 6 12:37:49 2014 -0400 - - Get it compiling again: WindowsXP build failing - - The WindowsXP build is failing due to a wslua testsuite failure, in the - file reader/writer tests. I've looked at it a bit and I don't know - why it's failing yet - I know why it says it's failing, but it doesn't - fail for me. And it was passing on WindowsXP until the change to Lua 5.2.3, - but I run 5.2.3 all the time and it passes for me, and there's nothing - special about the portion that's failing. - - The only way to debug it is to run it on WindowsXP myself, but I need - a build to do that with, so I've commented out the failing test and - hopefull it will build now and I can grab the automated build to debug - the issue. - - Change-Id: Ib75e8f75829e8f506823e648605ba16e21c7973a - Reviewed-on: https://code.wireshark.org/review/982 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Michael Mann - -commit 6328f6e -Author: Jeff Morriss -Date: Fri Apr 4 12:01:31 2014 -0400 - - Add a couple more in_error_pkt checks. - - Don't attempt reassembly and squash an expert info when we're in an error - packet. - - Change-Id: I7d19e4ab7add78829bf1e28ad92dce3a7431c37d - Reviewed-on: https://code.wireshark.org/review/964 - Reviewed-by: Jeff Morriss - Tested-by: Jeff Morriss - -commit e60ed4f -Author: Francesco Fondelli -Date: Wed Apr 2 14:12:01 2014 +0200 - - IANA assigned port number 6653 to OpenFlow. However, applications - (e.g. opendaylight, nox, openvswitch, etc) still use legacy port - numbers. The most common are 6633 and 6634. This patch adds a - simple heuristic logic and uses the current uint preference as - additional input. In most cases no user intervention is needed and - OpenFlow is automatically detected/dissected. - - Change-Id: Iebf09b7b870efe9d52421b9acc238208d25d4565 - Signed-off-by: Francesco Fondelli - Reviewed-on: https://code.wireshark.org/review/921 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Alexis La Goutte - -commit 5647301 -Author: Gerald Combs -Date: Sun Apr 6 08:07:06 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-04-06] - - Change-Id: Ifebae1d444037a1432d62d710c42c1da9dd0ed58 - Reviewed-on: https://code.wireshark.org/review/979 - Reviewed-by: Alexis La Goutte - -commit 01f1ed8 -Author: Martin Kaiser -Date: Sun Apr 6 19:12:28 2014 +0200 - - remove unnecessary NULL checks - - Change-Id: I5792fe99f0c75dfa0a9c5e20c4784e2e8a9c00f0 - Reviewed-on: https://code.wireshark.org/review/983 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit b40cb1a -Author: Michael Mann -Date: Sun Apr 6 10:57:33 2014 -0400 - - Apply found fix-encoding-args.pl errors in the dissector directory. - - I coincidentally found a few files with errors, so I thought it might be time to run it on the whole directory again. - - Change-Id: Ia32e54b3b1b94e5a418ed758ea79807c8bc7e798 - Reviewed-on: https://code.wireshark.org/review/978 - Reviewed-by: Michael Mann - -commit 4a00ef2 -Author: Martin Kaiser -Date: Thu Apr 3 23:09:36 2014 +0200 - - make sure that we always finalize the composite setup_tvb - - this should contribute to fix bug 9949 - - Change-Id: I5235a14b5603ac22c41dd38fb405409c066c9444 - Reviewed-on: https://code.wireshark.org/review/952 - Reviewed-by: Martin Kaiser - -commit 16f2aad -Author: Michael Mann -Date: Sat Apr 5 17:06:45 2014 -0400 - - Bugfix AFP dissection within MDSSRV. Part of bug 9950. - - Change-Id: Ibe2aa48284fe7a507133f5b70a22110bb3bb56cb - Reviewed-on: https://code.wireshark.org/review/973 - Reviewed-by: Ralph Böhme - Reviewed-by: Alexis La Goutte - -commit 828bb24 -Author: Pascal Quantin -Date: Sun Apr 6 12:10:30 2014 +0200 - - Partly revert fdeed480bf89a1f43f7b3d4be67fa0e4333f7120 - - wmem_packet_scope() cannot be used outside of a packet treatment - - Change-Id: I6e545bbb51f325b366288f17358f9d2347a7d7c4 - Reviewed-on: https://code.wireshark.org/review/977 - Reviewed-by: Pascal Quantin - -commit a90dfcb -Author: Marko Hrastovec -Date: Sun Apr 6 07:34:33 2014 +0200 - - Bugfix for ASTERIX category 021. - - It was found in https://code.wireshark.org/review/#/c/972/ and only commented out. - The bug is now fixed, the variable is used. - - Change-Id: I0361b269a06f45f4d36b8bc97c3623618cb5f859 - Reviewed-on: https://code.wireshark.org/review/976 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit fdeed48 -Author: Michael Mann -Date: Sat Apr 5 21:15:23 2014 -0400 - - Convert ep_address_to_str -> address_to_str(wmem_packet_scope, ...) for all dissectors - - Change-Id: I7489e2fb3a1f2630ca17b0a5fe1aa873992f1061 - Reviewed-on: https://code.wireshark.org/review/975 - Reviewed-by: Michael Mann - -commit 941bd01 -Author: Michael Mann -Date: Sat Apr 5 20:26:21 2014 -0400 - - Added support for BSS header in ED-137A RTP header - - Change-Id: Iffab8a62cf58d3ccf54fe2ed086aae80eb425a5f - Reviewed-on: https://code.wireshark.org/review/929 - Reviewed-by: Michael Mann - -commit 6ee4dde -Author: Hauke Mehrtens -Date: Sat Apr 5 11:08:19 2014 +0200 - - ssl-utils: add signed_certificate_timestamp tls hello extension - - This extension is defined in RFC 6962. - - Change-Id: I3aa7321c60baef59ccb59ded6b91f3e42c854bfa - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/970 - Reviewed-by: Michael Mann - -commit b903789 -Author: Hauke Mehrtens -Date: Sat Apr 5 11:05:35 2014 +0200 - - ssl-utils: add constants defined for draft-ietf-tls-oob-pubkey-11 - - This adds two tls hello extensions from - http://tools.ietf.org/html/draft-ietf-tls-oob-pubkey-11 which got - numbers assigned by the IANA in - https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml - In addition it also adds a new certificate type defined in the same - documents. - - Signed-off-by: Hauke Mehrtens - Change-Id: I3c52d9602f2f255a5700cc6a9954385ad0d7cae8 - Reviewed-on: https://code.wireshark.org/review/969 - Reviewed-by: Michael Mann - -commit bf190f2 -Author: Hauke Mehrtens -Date: Sat Apr 5 10:57:52 2014 +0200 - - ssl-utils: add named brainpool ecc curves - - This adds detection for the named brainpool ecc curves defined in RFC7027. - - Change-Id: I125ddbf74068888f4989781d274dbc74feb8b20c - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/968 - Reviewed-by: Michael Mann - -commit 0af279a -Author: Hauke Mehrtens -Date: Sat Apr 5 10:55:37 2014 +0200 - - ssl-utils: add detection of Supplemental Data - - This adds basic detection of Supplemental Data as defined in RFC4680. - - Change-Id: I8dac99bf243a6bd176585d1fe70f82abcae70c7f - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/967 - Reviewed-by: Michael Mann - -commit 590fcbc -Author: Pascal Quantin -Date: Tue Apr 1 04:34:47 2014 +0200 - - Upgrade Windows builds to Lua 5.2.3 - - Change-Id: Ie7fffa9d57b1b861ab57cc55259c79cf0e8ee0e0 - Reviewed-on: https://code.wireshark.org/review/974 - Reviewed-by: Pascal Quantin - -commit d6fa458 -Author: Hauke Mehrtens -Date: Sat Apr 5 10:49:27 2014 +0200 - - ssl-utils: add support for tls cipher suites from draft-mcgrew-tls-aes-ccm-ecc-08 - - This adds the new cipher suites from - http://tools.ietf.org/html/draft-mcgrew-tls-aes-ccm-ecc-08 - They are defined by IANA in - https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4 - - Change-Id: I1a1576567782abb93ae5b09efd4199cb1040d5d2 - Signed-off-by: Hauke Mehrtens - Reviewed-on: https://code.wireshark.org/review/966 - Reviewed-by: Michael Mann - -commit 293b5ea -Author: Hadriel Kaplan -Date: Sat Apr 5 13:20:50 2014 -0400 - - Get it compiling again: packet-asterix.c has unused const variable. - - Change-Id: I07125f1779063527f24d9195a9999cef4c8fe343 - Reviewed-on: https://code.wireshark.org/review/972 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Alexis La Goutte - -commit bc40848 -Author: Michael Mann -Date: Sat Apr 5 07:46:26 2014 -0400 - - Rework debug_print_hash logic so that it's supported by older versions of perl. - - Change-Id: I1720681dc367e01268ffbb1f31035464fa642496 - Reviewed-on: https://code.wireshark.org/review/971 - Reviewed-by: Michael Mann - Tested-by: Michael Mann - -commit f415e23 -Author: Michael Mann -Date: Fri Apr 4 22:15:18 2014 -0400 - - Decoder for category 021 added to ASTERIX dissector. Bug 9953. - - Change-Id: If72685f41cd32854d6c0c04716ee640196431f87 - Reviewed-on: https://code.wireshark.org/review/961 - Reviewed-by: Michael Mann - -commit 9fa48e3 -Author: Michael Mann -Date: Fri Apr 4 18:13:05 2014 -0400 - - New DCE/RPC MDSSVC dissector. Bug 9950 - - Change-Id: I8832c139938e767de71b2cc74ca41208f509e478 - Reviewed-on: https://code.wireshark.org/review/959 - Reviewed-by: Michael Mann - -commit b6a5f89 -Author: Michael Mann -Date: Fri Apr 4 17:06:33 2014 -0400 - - Expose dissect_spotlight as its own dissector. Needed for DCE/RPC MDSSVC - - Change-Id: I5c9dbd59b18eff5dc9cb9476f1883cb9fa9d9c02 - Reviewed-on: https://code.wireshark.org/review/958 - Reviewed-by: Michael Mann - -commit b346050 -Author: Jeff Morriss -Date: Fri Apr 4 11:56:09 2014 -0400 - - Get it compiling again. - - Change-Id: Iecc560a672970817ddc401c654c19f446fe398e9 - Reviewed-on: https://code.wireshark.org/review/963 - Reviewed-by: Jeff Morriss - Tested-by: Jeff Morriss - -commit b40b655 -Author: AndersBroman -Date: Fri Apr 4 15:49:35 2014 +0200 - - Change tvb_get_string() -> tvb_get_string_enc and ENC_ASCII -> ENC_UTF_8 - - Change-Id: I07ecca5612ae9fa2b053a62c69014612c5125d5e - Reviewed-on: https://code.wireshark.org/review/962 - Reviewed-by: Anders Broman - -commit 1966775 -Author: Alexis La Goutte -Date: Fri Apr 4 08:49:11 2014 +0200 - - Remove $Id$ in wslua - - Change-Id: I01052bb4c41a17e8289cc7ed1b465042c23b6d82 - Reviewed-on: https://code.wireshark.org/review/957 - Reviewed-by: Anders Broman - -commit 131bba8 -Author: Evan Huus -Date: Thu Apr 3 12:55:51 2014 -0400 - - Remember to destroy the pinfo pool cache - - Otherwise a library reinitialization leaks at least one large 8MB chunk. - - Change-Id: I5336fef5925eb54e88a72f1a16fc0ddf77ae6c10 - Reviewed-on: https://code.wireshark.org/review/945 - Reviewed-by: Anders Broman - -commit 8db838e -Author: Alexis La Goutte -Date: Fri Apr 4 08:14:57 2014 +0200 - - Fix indent and add modelines - - (Indent typo coming from 23d7d2ca2674565404262734f1a5855f83535c85) - - Change-Id: Ic4deae30d64db9f264223366d2d9d880708001d8 - Reviewed-on: https://code.wireshark.org/review/956 - Reviewed-by: Anders Broman - -commit e2ded09 -Author: Jeff Morriss -Date: Thu Apr 3 15:51:31 2014 -0400 - - Don't do TSN analysis on data chunks embedded in PKTDROP chunks; set in_error_pkt too. - - Add a comment indicating what we should be doing when the PKTDROP chunk contains - a truncated data chunk. - - Change-Id: Icbba4c6dafc5c2656fc337734a1a570ef4a055d2 - Reviewed-on: https://code.wireshark.org/review/950 - Reviewed-by: Anders Broman - -commit 38b1be9 -Author: Guy Harris -Date: Thu Apr 3 20:14:24 2014 -0700 - - Fix more verbs, and fix one field long name that matches its blurb now. - - Change-Id: I78a011291217be901efba331e8e41ca527d52e10 - Reviewed-on: https://code.wireshark.org/review/955 - Reviewed-by: Guy Harris - -commit c5e29ac -Author: Guy Harris -Date: Thu Apr 3 19:26:43 2014 -0700 - - Clean up some strings - "UTF8" to "UTF-8", etc.. - - Clean up the display of addresses a bit, and the use of verbs in some - field descriptions. - - Change-Id: I3d2d4fc4cd13503924abecee55adfaa899385ffb - Reviewed-on: https://code.wireshark.org/review/954 - Reviewed-by: Guy Harris - -commit 5bb64c0 -Author: Jeff Morriss -Date: Thu Apr 3 13:57:15 2014 -0400 - - Strengthen the Diameter heuristics to avoid trying to reassemble enormous messages. - - Fixes some heuristics mistakes pointed out in - http://ask.wireshark.org/questions/31227/diameter-reassembly-malformed-packets - - Change-Id: Iffc97d46cee5dd532fec0031286927fbcb86c095 - Reviewed-on: https://code.wireshark.org/review/949 - Reviewed-by: Michael Mann - -commit df52f81 -Author: Martin Kaiser -Date: Thu Apr 3 23:05:08 2014 +0200 - - fix a typo - - Change-Id: If339a36a6e3d8bedef6eed36eb121e9f25afa6e5 - Reviewed-on: https://code.wireshark.org/review/951 - Reviewed-by: Martin Kaiser - -commit 23d7d2c -Author: AndersBroman -Date: Thu Apr 3 12:37:43 2014 +0200 - - Add a preference to enable loading of the database. Effectivly - dissabling the dissector. Defaulted to FALSE e.g dissebling the - dissector. - The usage of this dissector is limited and most people don't use it so - it might as well be dissabled by default. See Bug 9569 for a discussion on - the subject. - - Change-Id: I82f675bcf8ba37220105c98360195ea805aa7330 - Reviewed-on: https://code.wireshark.org/review/939 - Reviewed-by: Michael Mann - -commit e662353 -Author: Bill Meier -Date: Thu Apr 3 12:33:14 2014 -0400 - - Remove garbage character inadvertantly introduced in the previous commit. - - Change-Id: I6338fdb4506973ea5ed991512bbefa6b855640e9 - Reviewed-on: https://code.wireshark.org/review/944 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit a45602c -Author: Bill Meier -Date: Wed Apr 2 23:13:06 2014 -0400 - - Create/use an extended value-string; Do other minor changes; - - Minor changes: - - Remove a few unneeded initializers; - - Convert "4 space tab" indentation to spaces; - - Fix some indentation; - - Remove some boilerplate comments; - - Adjust exitor modelines. - - Change-Id: Ie314a2d91bf89f8612dec9e9f161d987ea107dd5 - Reviewed-on: https://code.wireshark.org/review/942 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit c0b0a11 -Author: Bill Meier -Date: Wed Apr 2 23:59:19 2014 -0400 - - (Pedantic): set editor modelines tab-width & etc to 8; Also: fix some indentation in packet-sip.c - - Change-Id: I623fc5e4c1247dbe5e15f0f33270f4f0994268ab - Reviewed-on: https://code.wireshark.org/review/943 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit dc84709 -Author: Evan Huus -Date: Thu Apr 3 08:55:06 2014 -0400 - - please checkAPI - - Change-Id: I2dbd1fcb47b75300e753b5ef2dc60e68ca1b5fa5 - Reviewed-on: https://code.wireshark.org/review/941 - Reviewed-by: Evan Huus - -commit 5e4769d -Author: AndersBroman -Date: Thu Apr 3 13:18:59 2014 +0200 - - Use ENC_UTF_8 for strings, it's faster and *should* be OK. - - Change-Id: I7615f407a017454d3fb11ec0b45b584bfa5d79b5 - Reviewed-on: https://code.wireshark.org/review/940 - Reviewed-by: Anders Broman - -commit 4daf6f3 -Author: Guy Harris -Date: Thu Apr 3 00:01:07 2014 -0700 - - Make payload type arguments guint rather than guint8. - - That should suppress some "cast to pointer from integer of different - size" warnings. - - Change-Id: I2ef38e16ce866e244cb7c0a2275dfb5975980fc4 - Reviewed-on: https://code.wireshark.org/review/938 - Reviewed-by: Guy Harris - -commit a5a692c -Author: Guy Harris -Date: Wed Apr 2 23:54:28 2014 -0700 - - Handle DLT_USER2 as PKTAP, to handle Mavericks. - - Change-Id: Ic58c3584994f822d5d5a1434050aaa61f86ba17c - Reviewed-on: https://code.wireshark.org/review/937 - Reviewed-by: Guy Harris - -commit 618c27b -Author: Guy Harris -Date: Wed Apr 2 23:45:11 2014 -0700 - - Add a capture_pktap() routine and use it. - - That way, the packet counts are will be valid when capturing. - - Change-Id: I0a21cc817d918e7f849620db5ca6dfd84bd2cd87 - Reviewed-on: https://code.wireshark.org/review/936 - Reviewed-by: Guy Harris - -commit 04c05a2 -Author: Hadriel Kaplan -Date: Wed Apr 2 02:07:16 2014 -0400 - - Fix Bug 9920 Buildbot crash due to SDP/RTP mismatch - - For details see comments in Bug 9920. - - The executive summary: - Bug 9920 is a crash caused by a couple of issues: - - 1) The memory ownership model for the rtp_dyn_payload hashtable is split: SDP - creates the rtp_dyn_payload hashtable, but RTP can free it. Since there isn't - *one* pointer to the hashtable, RTP freeing it means SDP has a dangling - pointer. - - 2) Either the SDP dissector shouldn't be creating two separate, unique - hashtables for multiple media channels of the same addr:port, or RTP shouldn't - be free'ing the previous one. - - Change-Id: I436e67de6882f84aa82dcbdfe60bf313fe4fd99c - Reviewed-on: https://code.wireshark.org/review/918 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit df80f31 -Author: AndersBroman -Date: Thu Apr 3 06:35:51 2014 +0200 - - Fix a typo - - Change-Id: Ie32a140e49140a92c69cb6fa84cdc55402516830 - Reviewed-on: https://code.wireshark.org/review/935 - Reviewed-by: Anders Broman - -commit 67cc462 -Author: AndersBroman -Date: Wed Apr 2 16:18:39 2014 +0200 - - Don't use external function internaly to avoid multiple checks. - tvb_captured_length() -> tvb->length - tvb_captured_length_remaining(tvb, offset) -> (Inline) _tvb_captured_length_remaining() - tvb_get_ptr() -> ensure_contiguous() - - Change-Id: I3540854c9b51ca9c3319b030c7d91b4aff976a26 - Reviewed-on: https://code.wireshark.org/review/922 - Reviewed-by: Anders Broman - -commit 84bc050 -Author: AndersBroman -Date: Mon Mar 31 13:57:03 2014 +0200 - - In the string handling routines don't call tvb_get_...() inside the loops insted get the ptr and read - directly avoiding the overhead of calling fast_ensure_contiguous() - repeatibly. - - Change-Id: Ib5eee87ef9d49cb4e46b3b9c3d3db0134d3c4a32 - Reviewed-on: https://code.wireshark.org/review/889 - Reviewed-by: Anders Broman - -commit e982992 -Author: Guy Harris -Date: Wed Apr 2 20:18:50 2014 -0700 - - For single-precision calculations, use single-precision constants. - - Otherwise the calculation is done in double precision, and some - compilers complain of a double-precision value being assigned to a - single-precision variable. - - Change-Id: I78317a0e9b625ae4f34df3597fdb5eba711bcae2 - Reviewed-on: https://code.wireshark.org/review/934 - Reviewed-by: Guy Harris - -commit 9bd0932 -Author: Guy Harris -Date: Wed Apr 2 20:05:14 2014 -0700 - - For single-precision calculations, use single-precision constants. - - Otherwise the calculation is done in double precision, and some - compilers complain of a double-precision value being assigned to a - single-precision variable. - - Change-Id: I41699fa69e21a2c42d54867765f9fa35a9ab7414 - Reviewed-on: https://code.wireshark.org/review/933 - Reviewed-by: Guy Harris - -commit 0d6f511 -Author: Pascal Quantin -Date: Thu Apr 3 03:42:15 2014 +0200 - - Add PKTAP to release notes - - Change-Id: Ibec2b400493b0936505e467d1ae9bc6551e6cc03 - Reviewed-on: https://code.wireshark.org/review/931 - Reviewed-by: Pascal Quantin - -commit 0a49935 -Author: Gerald Combs -Date: Wed Apr 2 11:05:04 2014 -0700 - - Add a backporting chapter. - - Change-Id: Id0e017b18e95d6703e166fa09f767200d8ed1f8d - Reviewed-on: https://code.wireshark.org/review/925 - Reviewed-by: Alexis La Goutte - Reviewed-by: Gerald Combs - -commit 50a5598 -Author: Martin Kaiser -Date: Wed Apr 2 22:55:58 2014 +0200 - - dissect gama chunk - - Change-Id: I4fcdb926db9d2f23f5901586b5d97b727237db3d - Reviewed-on: https://code.wireshark.org/review/930 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 29519c4 -Author: Gerald Combs -Date: Wed Apr 2 12:51:52 2014 -0700 - - Remove extra parenthesis in EQ_SEQ. - - Fixes the following clang warning: - - epan/follow.c:397:20: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] - if ( ((sequence) == (seq[src_index])) ) { - ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~ - epan/follow.c:397:20: note: remove extraneous parentheses around the comparison to silence this warning - if ( ((sequence) == (seq[src_index])) ) { - ~ ^ ~ - epan/follow.c:397:20: note: use '=' to turn this equality comparison into an assignment - if ( ((sequence) == (seq[src_index])) ) { - ^~ - = - - Change-Id: Ic257bbc598e17f854b671056887ca1a13dcea850 - Reviewed-on: https://code.wireshark.org/review/928 - Reviewed-by: Gerald Combs - -commit b8b68f7 -Author: Martin Kaiser -Date: Mon Mar 31 20:34:38 2014 +0200 - - dissect the chrm chunk - - Change-Id: I922169d4e246470e018d3db53964ae3f794642f6 - Reviewed-on: https://code.wireshark.org/review/927 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit eee21a6 -Author: Martin Kaiser -Date: Mon Mar 31 21:45:40 2014 +0200 - - redefine proto_tree_add_float_format_value() if we're using the new - proto tree api, similar to other proto_tree_add_...() functions - - Change-Id: Iaef0711b8221a7bbb24f1004c81a1438f5674e42 - Reviewed-on: https://code.wireshark.org/review/926 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit b238cd1 -Author: Evan Huus -Date: Wed Apr 2 13:11:58 2014 -0400 - - Scrap wmem splay trees for now. - - There is confusion about API usage, and problems on my part concerning whether - keys should be compared signed or unsigned, and how to do that efficiently. - Unsigned keys in particular were behaving oddly. - - Change-Id: I075693bbd04c15f79f24f9a24006003a914cc572 - Reviewed-on: https://code.wireshark.org/review/924 - Reviewed-by: Evan Huus - -commit 9410882 -Author: AndersBroman -Date: Wed Apr 2 17:28:39 2014 +0200 - - Add a cople of missing pcap.extension IE:s - - Change-Id: I7086349f3fb9e3fd8c1ea902ef08b54c27b0a8c5 - Reviewed-on: https://code.wireshark.org/review/923 - Reviewed-by: Anders Broman - -commit 5838881 -Author: Michael Mann -Date: Wed Apr 2 09:17:56 2014 -0400 - - Have Infiniband dissector show payload. Bug 9929. - - The trees in the infiniband dissectors were incorrectly setup causing the data dissector to always have a NULL tree (so it wouldn't appear in packet view). - - Also cleaned up some other unnecessary global variables. - - Change-Id: I778073bdca864dfc5087cdcfc7ef0018f9bd704c - Reviewed-on: https://code.wireshark.org/review/915 - Tested-by: Michael Mann - Reviewed-by: Graham Bloice - Reviewed-by: Michael Mann - -commit 8570f17 -Author: AndersBroman -Date: Wed Apr 2 13:31:29 2014 +0200 - - Fix packet-bootp.c:5368:18: error: 'ti' may be used uninitialized in this - function - - Change-Id: I15f32e7b5c9ce23e1ddc00792b2d5c37945ae081 - Reviewed-on: https://code.wireshark.org/review/920 - Reviewed-by: Anders Broman - -commit 255eca0 -Author: Alexis La Goutte -Date: Fri Feb 21 19:36:39 2014 +0100 - - Revert Remove check and inverse code to display a error if there is a $Id$ - - Change-Id: I7061ad312df5079924c927ca95a8fa111c756012 - Reviewed-on: https://code.wireshark.org/review/498 - Reviewed-by: Alexis La Goutte - -commit 781a41a -Author: AndersBroman -Date: Tue Apr 1 18:04:52 2014 +0200 - - From Martin Mathieson: - Show the message type name in option 53, as well as in the bootp protocol root. - - Change-Id: I5864a2024d3e64fa8eeee40b465dcd3459b8472e - Reviewed-on: https://code.wireshark.org/review/910 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit 761464f -Author: Bart Van Assche -Date: Thu Jan 30 13:33:41 2014 +0100 - - Fix InfiniBand dissector. Bug 9719 - - Change-Id: I7b9df14b4d9aa520c3fe28c86014665461b758f2 - Reviewed-on: https://code.wireshark.org/review/917 - Reviewed-by: Michael Mann - -commit 7f6a1ce -Author: Bill Meier -Date: Tue Apr 1 20:36:58 2014 -0400 - - packet-pdc.c: Add asterix protocol layer to base tree (not to PDC tree). - - PDC capture file: See attachment to Bug #9746 - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9746 - - Change-Id: I815779f4213d1caec3e1c8dc46506bcc8647bcbb - Reviewed-on: https://code.wireshark.org/review/914 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 577f16a -Author: Martin Kaiser -Date: Mon Mar 31 22:44:56 2014 +0200 - - use tvb_find_guint8() to find the 0 termination in a text chunk - keyword and text are latin1 strings - - Change-Id: I01637efa2ebf4d1e1a83f6001737066dc1258e6c - Reviewed-on: https://code.wireshark.org/review/913 - Reviewed-by: Martin Kaiser - -commit fc48f57 -Author: Guy Harris -Date: Mon Mar 31 21:04:13 2014 -0700 - - Add a dissector for Apple's PKTAP headers. - - It automatically works for LINKTYPE_PKTAP and, by default, for - LINKTYPE_USER2; if any other dissector is specified for LINKTYPE_USER2, - that dissector overrides PKTAP. - - Change-Id: Ic00ac8a81c6101e45d638d337aef42df3920da12 - Reviewed-on: https://code.wireshark.org/review/903 - Reviewed-by: Evan Huus - -commit 47d2967 -Author: Pavel Karneliuk -Date: Tue Apr 1 14:57:26 2014 +0300 - - replace comparing sequence numbers of TCP segments with wrap-firendly XX_SEQ macros; replace tabs with 2 whitespace indentations - - Change-Id: I8af522cc34863501195d0a79db5c0ab4135246a8 - Reviewed-on: https://code.wireshark.org/review/907 - Reviewed-by: Anders Broman - -commit 0b5f26b -Author: Pavel Karneliuk -Date: Mon Mar 31 12:55:15 2014 +0300 - - fix comparing a sequence number of TCP fragment when its value wraps over uint32_t limit - - Change-Id: I0ff939e2d1265a2d9380c83f8f538bb43b0dadf9 - Reviewed-on: https://code.wireshark.org/review/875 - Reviewed-by: Pavel Karneliuk - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 01b6526 -Author: AndersBroman -Date: Tue Apr 1 15:36:57 2014 +0200 - - Inlining some tvb function gives a 6% performance gain according to - valgrind. - - Change-Id: I7881f8c1407d422a3f1ad5bc17e975b45703db74 - Reviewed-on: https://code.wireshark.org/review/909 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 8c5e9fc -Author: Graham Bloice -Date: Mon Mar 31 14:29:57 2014 +0100 - - Fixed display of IIN during reads and writes of IIN object. - Added (hidden) dnp3.addr field set by both source and destination dnp3 - addresses to allow easier filtering. - - Change-Id: I04980c24c1b9f30a2ee5a0d5ea4ac32ae877504e - Reviewed-on: https://code.wireshark.org/review/908 - Reviewed-by: Graham Bloice - Tested-by: Graham Bloice - -commit 2284f0b -Author: AndersBroman -Date: Tue Apr 1 10:01:57 2014 +0200 - - For now use UTF-8 for all strings for performance reasons. - - Change-Id: If47ffbee58d534ce3d44f00e1e5b966bc42a2ea8 - Reviewed-on: https://code.wireshark.org/review/906 - Reviewed-by: Anders Broman - -commit 914cbc2 -Author: Hadriel Kaplan -Date: Mon Mar 31 23:58:04 2014 -0400 - - Fix checkApis perl script false positive proto_tree_add with ENC_* - - In epan/proto.c in function proto_tree_add_split_bits_crumb, the - proto_tree_add_text function is called with one of its arguments - using ENC_BIG_ENDIAN, but it's not an argument for proto_tree_add_text - itself but instead a function being called inside it. checkAPIs.pl - tries to avoid this in check_proto_tree_add_XXX_encoding, by removing - parenthesis arguments, but in this acse there are newlines between - the arguments, causing the regex to not catch them. This commit - fixes the regex. - - Change-Id: I70ef79d5436ba2ec04ffdc3d9939c7aa2cdf6a1f - Reviewed-on: https://code.wireshark.org/review/902 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit e7b3eff -Author: Hadriel Kaplan -Date: Mon Mar 31 22:47:56 2014 -0400 - - Fix tshark.c to pass checkAPIs script - - Since tshark.c was using strdup, perror, and g_main_quit, changes to - the file won't pass checkAPIs; so this commit replaces those with - the approved functions; except strdup, which was unecessary. - - Change-Id: I031aa44594f2b96960a45f48537ab4e9a10d34b1 - Reviewed-on: https://code.wireshark.org/review/898 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit 97cddf5 -Author: Hadriel Kaplan -Date: Tue Apr 1 00:20:07 2014 -0400 - - Fix proto.c to pass checkAPIs script - - Since proto.c was using strcat(), changes to the file won't pass checkAPIs. - So this commit replaces it with the appropriate function, and also replaces - the deprecated tvb_length_remaining and tvb_ensure_length_remaining function - calls with the new versions, since checkAPIs was warning about that too. - This commit does not change the ep_* memorry calls to the new wmem-based - ones though, as that's a bigger deal than this trivial commit I think. - - Change-Id: I51e6d5b3a6e03233f2695c890ff4c10d02fdb0c0 - Reviewed-on: https://code.wireshark.org/review/905 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit dc4c26c -Author: Guy Harris -Date: Mon Mar 31 19:48:21 2014 -0700 - - Update encap_table_base. - - As the comment after the WTAP_ENCAP_ list says, "After adding new item - here, please also add new item to encap_table_base array". - - Change-Id: I918603fa271978b3a81525466c5f4067efc7a783 - Reviewed-on: https://code.wireshark.org/review/897 - Reviewed-by: Guy Harris - -commit 249daa6 -Author: Bill Meier -Date: Tue Apr 1 00:26:12 2014 -0400 - - Copy randpkt.exe & randpkt.pdb to install directory during windows build. - - Change-Id: I6ef6b181897bd3d35dc94ebb2d04aaa209d8df6e - Reviewed-on: https://code.wireshark.org/review/904 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit a8e9637 -Author: Bill Meier -Date: Mon Mar 31 23:12:20 2014 -0400 - - Fix two bugs and do misc other minor changes; - - Bugs fixed: - - col_...() should not be called under 'if (tree)'; - - proto_reg_handoff_pdc(): pdc tcp.port preference change was handled incorrectly; - - Minor changes: - - Move proto_reg_handoff...() to the end of the file as per convention; - - new_register_dissector...() call not needed; - - Remove some unneeded initializers; - - 'xxx++' ==> 'xxx += 1' in a few instances; - - widen a few variables (guint? ==> guint); - - Add XXX comment about possible simplification of the code; - - Remove unneeded #include ; - - Reformat hf[] entries for readability; - - Do whitespace changes; - - Change-Id: Ib9224f0c6392a45c19656a63bbac97fbaf3acc08 - Reviewed-on: https://code.wireshark.org/review/900 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit a72dc7a -Author: Bill Meier -Date: Mon Mar 31 22:50:39 2014 -0400 - - Fix expert_...() calls to not be under 'if (tree)';Do other minor changes; - - Minor changes; - - Remove #include ; It's not needed; - - Do some whitespace changes; - - Use tab-width=8 in editor modelines - - Change-Id: I84a1c9bc814fae384c4d5a434c2f9aed865c76ae - Reviewed-on: https://code.wireshark.org/review/899 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 4958cd7 -Author: Bill Meier -Date: Mon Mar 31 15:28:39 2014 -0400 - - Remove 3 dups from .gitignore - - Change-Id: I81434f311568d42dd897461365a5c345dd9ff1bc - Reviewed-on: https://code.wireshark.org/review/893 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit d8001e8 -Author: Alexis La Goutte -Date: Mon Mar 31 11:14:29 2014 +0200 - - Continue to remove $Id$ from top of file - - (Using sed : sed -i '/^\*\* \$Id\$/,+1 d') (2 star and space) - - Change-Id: I48505ffb8bfa103cd7db0117e18cdb1925a7034d - Reviewed-on: https://code.wireshark.org/review/884 - Reviewed-by: Anders Broman - -commit b7b33b5 -Author: Alexis La Goutte -Date: Mon Mar 31 12:45:42 2014 +0200 - - Continue to remove $Id$ from top of file - - Last one $Id$ (remove by hand) to make checkAPI haapy ! - - Change-Id: I5adfdcac0629a36e08c5fe3ea7960bdbc251364f - Reviewed-on: https://code.wireshark.org/review/887 - Reviewed-by: Anders Broman - -commit 7d77d75 -Author: Alexis La Goutte -Date: Mon Mar 31 12:22:59 2014 +0200 - - Continue to remove $Id$ from top of file - - (Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ ) - - Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9 - Reviewed-on: https://code.wireshark.org/review/886 - Reviewed-by: Anders Broman - -commit 757aa33 -Author: Alexis La Goutte -Date: Mon Mar 17 15:57:02 2014 +0100 - - Continue to remove $Id$ from top of file - - (Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) - - Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd - Reviewed-on: https://code.wireshark.org/review/881 - Reviewed-by: Anders Broman - -commit fb61a0a -Author: Alexis La Goutte -Date: Mon Mar 31 12:10:52 2014 +0200 - - Continue to remove $Id$ from top of file - - (Using sed :sed -i '/^ \* \$Id\$/,+1 d') (2 spaces before star) - - Change-Id: I7060f198b4ae4dd271ecc454f6c6dd8bd4cfd8d4 - Reviewed-on: https://code.wireshark.org/review/885 - Reviewed-by: Anders Broman - -commit b0ba475 -Author: Alexis La Goutte -Date: Mon Mar 17 17:59:52 2014 +0100 - - Continue to remove $Id$ from top of file - - (Using sed : sed -i '/^ \$Id\$/,+1 d') (No star only 2 spaces before) - - Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54 - Reviewed-on: https://code.wireshark.org/review/883 - Reviewed-by: Anders Broman - -commit 7287b58 -Author: Alexis La Goutte -Date: Mon Mar 17 16:46:33 2014 +0100 - - Continue to remove $Id$ from top of file - - (Using sed : sed -i '/^/,+0 d') (XML Comments) - - Change-Id: Ifd03f70ae84dfbbbe04d91f10fd30857fd197014 - Reviewed-on: https://code.wireshark.org/review/882 - Reviewed-by: Anders Broman - -commit a8f1e34 -Author: Evan Huus -Date: Mon Mar 31 12:32:51 2014 -0400 - - Doc tweaks and macro parameterization - - Change-Id: I9898bedf05a785683e79866a149336cbbf402d27 - Reviewed-on: https://code.wireshark.org/review/892 - Reviewed-by: Evan Huus - -commit 0233001 -Author: Alexis La Goutte -Date: Mon Mar 17 15:08:11 2014 +0100 - - Continue to remove $Id$ from top of file - - Remove all $Id:$ (by hand) - - Change-Id: Ia8790ee852fe338469e855713199220d345a59b7 - Reviewed-on: https://code.wireshark.org/review/880 - Reviewed-by: Anders Broman - -commit 09cd306 -Author: Alexis La Goutte -Date: Fri Mar 7 17:52:50 2014 +0100 - - Continue to remove $Id$ from top of file - - (Using sed : sed -i '/^\* \$Id\$/,+1 d') (no space before star) - - Change-Id: I318968db2b8512ba1303b5fc5c624c66441658f0 - Reviewed-on: https://code.wireshark.org/review/879 - Reviewed-by: Anders Broman - -commit f2dfc39 -Author: Alexis La Goutte -Date: Fri Mar 7 16:32:18 2014 +0100 - - Continue to remove $Id$ from top of file - - (Using sed : sed -i '/^ \t$Id\$/,+0 d') (tab before $Id$) - - Also modify generator (NDR.pm) - - Change-Id: I348a1d129d1d1320bd80b428038ea5ed291d6ca8 - Reviewed-on: https://code.wireshark.org/review/878 - Reviewed-by: Anders Broman - -commit 94a791a -Author: Alexis La Goutte -Date: Fri Mar 7 14:06:43 2014 +0100 - - Continue to remove $Id$ from top of file - - (Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$) - - Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688 - Reviewed-on: https://code.wireshark.org/review/876 - Reviewed-by: Evan Huus - -commit 3170f2e -Author: Alexis La Goutte -Date: Fri Mar 7 14:16:15 2014 +0100 - - Continue to remove $Id$ from top of file - - (Using sed : sed -i '/^ \* \$Id\$/,+1 d') (Double space between star and $Id$) - - Change-Id: If9b8f345e3b6493de0b573600e60005c8b0b33c3 - Reviewed-on: https://code.wireshark.org/review/877 - Reviewed-by: Evan Huus - -commit d0edbd3 -Author: AndersBroman -Date: Mon Mar 31 17:55:28 2014 +0200 - - Use tvb_get_string_enc() with UTF_8 when checking headers as it's faster. - - Change-Id: I88cd6f71c1fcbf67948dd0ebdc6e5641d6ba111c - Reviewed-on: https://code.wireshark.org/review/891 - Reviewed-by: Anders Broman - -commit b3708a9 -Author: AndersBroman -Date: Mon Mar 31 14:35:05 2014 +0200 - - According to RFC 3261 - 7 SIP Messages - - SIP is a text-based protocol and uses the UTF-8 charset - - So use ENC_UTF_8|ENC_NA. - - Change-Id: I0101eca3dd7d8ff9ebf98fd733548131b862919e - Reviewed-on: https://code.wireshark.org/review/890 - Reviewed-by: Anders Broman - -commit 6a3394e -Author: AndersBroman -Date: Mon Mar 31 13:44:05 2014 +0200 - - Inlining wmem_strbuf_grow seems to give better performance. - - Change-Id: I80f3d42fb01461af97984b463a6e8b8217eed552 - Reviewed-on: https://code.wireshark.org/review/888 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 280c295 -Author: Alexis La Goutte -Date: Sat Mar 15 12:52:29 2014 +0100 - - Add --enable-extra-clang-checks for autotools and CMakeList - With -Wunreachable-code flags (and disable for the moment -Wdocumentation) - - Change-Id: I126c962b32e650a63b78092e95896736ae7335c9 - Reviewed-on: https://code.wireshark.org/review/678 - Reviewed-by: Alexis La Goutte - -commit 0973a32 -Author: Alexis La Goutte -Date: Sun Mar 23 16:02:04 2014 +0100 - - Fix Argument with 'nonnull' attribute passed null found by Clang - - Change-Id: Ie59c379a4f00c807ebc50c95eea2017f8cac0c69 - Reviewed-on: https://code.wireshark.org/review/796 - Reviewed-by: Evan Huus - -commit 650ed5f -Author: Hanspeter Portner -Date: Sun Mar 30 10:47:08 2014 +0200 - - packet-osc dissector bug fix of path validity func - - - 'is_valid_path' function has been corrected - - an OSC path is valid if: - - it consists of printable characters only - - does not contain ' ' and '#' - - characters '*' ',' '?' '[' ']' '{' '}' are valid, but have special meaning at the receiving end (used for pattern matching) - - Change-Id: I4ff4308d0955da2ef377d606b7778819b97754a0 - Reviewed-on: https://code.wireshark.org/review/868 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit 550e315 -Author: Bill Meier -Date: Sun Mar 30 16:55:08 2014 -0400 - - Fix fuzz-test.sh '-b' option so it works again; Do some other tools/*test*.sh changes - - - Add -b option to randpkt-test.sh and test-captures.sh; - - Create/ue a common function to do '-x' tests on files/dirs; - - Rename exit_error function to ws_exit_error - - Change-Id: I032c9d784bec1fb6b0717aaad08a061e4d935476 - Reviewed-on: https://code.wireshark.org/review/872 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit b63b503 -Author: Hadriel Kaplan -Date: Sat Mar 29 17:16:22 2014 -0400 - - Fix Bug 9938 'tshark "-Y -2 -w" saves non-dependent frames' - - When the '-Y' display filter option is given with a '-2', and a '-w' to write out - the packets, tshark grabs *all* dependent frames in the catprue file, even those - that weren't dependents of a matching packet. Note that this also uses the '-2' - two-pass option, since only two-pass mode writes out dependent frames to begin with. - - Change-Id: I17726447bec434ba2566e98fb78893d1331e3056 - Reviewed-on: https://code.wireshark.org/review/866 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Evan Huus - -commit 5cdf04e -Author: Gerald Combs -Date: Sun Mar 30 08:06:45 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-03-30] - - Change-Id: Iff714193adc4035d96f69d4944b43da7edb3cfa8 - Reviewed-on: https://code.wireshark.org/review/869 - Reviewed-by: Evan Huus - -commit bda08a2 -Author: Guy Harris -Date: Sat Mar 29 16:00:13 2014 -0700 - - Hide unused variable. - - Leave it there, but commented out, just in case it *should* be used. - "#if 0" out the code that sets it. - - Change-Id: I8802fc416030106d9d8421b0d7b8612597794bab - Reviewed-on: https://code.wireshark.org/review/867 - Reviewed-by: Guy Harris - -commit d156def -Author: Guy Harris -Date: Sat Mar 29 13:22:27 2014 -0700 - - Rename "size" variable to "length", to match other string routines. - - Change-Id: I385345cfafc7e7b4d3e66713fb0fe570b39f438d - Reviewed-on: https://code.wireshark.org/review/865 - Reviewed-by: Guy Harris - -commit 8ffdf42 -Author: Guy Harris -Date: Sat Mar 29 12:56:21 2014 -0700 - - Add a pcorey48tohll() macro, and use #defines for some offsets. - - The "48 bits, in a weird byte order" is a variant of 64-bit - "Corey-endian", with the upper 16 bits of the result - which are in the - *middle* of the bytes of the number - ignored. Define a pcorey48tohll() - macro and use that, rather than the loop. - - There are a bunch of #defines for offsets in the headers; use them - rather than magic constants. - - Change-Id: Idfdc8a741278d71a5db47c067914c97615c3e02d - Reviewed-on: https://code.wireshark.org/review/864 - Reviewed-by: Guy Harris - -commit 521bab1 -Author: Evan Huus -Date: Fri Mar 28 11:00:28 2014 -0400 - - Use sized strbufs when extracting tvb strings - - We rarely know exactly how long a string will be, but we frequently have a good - lower bound (that's better than the default strbuf size of 16). Starting at that - size probably reduces the amount of allocation/copying needed. - - Also make use of the new _finalize() method to save memory and avoid constness - problems. - - Change-Id: I3f043bd12c1ccfce5990168fb6531ecd287bec5b - Reviewed-on: https://code.wireshark.org/review/856 - Reviewed-by: Guy Harris - Reviewed-by: Evan Huus - -commit 7df8839 -Author: Evan Huus -Date: Thu Mar 20 12:04:06 2014 -0400 - - Splay tree implementation for wmem - - This is a tree implementation intended to replace the current red-black tree in - wmem_tree (which was inherited from emem), assuming there are no regressions. - Splay trees bubble recently accessed keys to the top, and as such have a number - of very nice properties: https://en.wikipedia.org/wiki/Splay_tree - - This implementation is a variant known as "independent semi-splaying", which has - better practical performance. It should do about as well as the red-black tree - for random insertions and accesses, but somewhat better for patterned accesses - (such as accessing each key in order, or accessing certain keys very - frequently). - - There are a few other changes relative to the red-black tree implementation that - are worth mentioning: - - Instead of requiring complex keys to be split into guint32 chunks and doing - this weird trick with sub-trees, I let the keys be arbitrary pointers and - allowed the user to specify an arbitrary comparison function. If the function - is NULL then the pointers are compared directly for the simple integer-key - case. - - Splay trees do not need to store a red-black colour flag for each node. It is - also much easier to do without the parent pointer in each node. And due to - the simpler system for complex keys, I was able to remove the "is_subtree" - boolean. As such, splay nodes are 12 bytes smaller on 32-bit platforms, and - 16 bytes smaller on a 64-bit platform. - - All done in about half the lines of code. - - Change-Id: I89fb57e07d2bb7e3197190c7c2597b0c5adcc03b - Reviewed-on: https://code.wireshark.org/review/758 - Reviewed-by: Evan Huus - -commit a1d4189 -Author: Pascal Quantin -Date: Sat Mar 29 10:00:33 2014 +0100 - - Upgrade Windows builds to Lua 5.2.1 - - Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e - Reviewed-on: https://code.wireshark.org/review/863 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit adc46f5 -Author: Evan Huus -Date: Sat Mar 29 11:01:06 2014 -0400 - - Tighten the NO_MORE_DATA_CHECK macros - - We should return if we've already somehow overflowed the apparent length, not - just if we've hit it dead on. - - Fixes bug #9932 and probably others. - - Change-Id: I2719c3bd38f03e18ea557df962ee4a1beb64c2e8 - Reviewed-on: https://code.wireshark.org/review/862 - Reviewed-by: Pascal Quantin - Reviewed-by: Evan Huus - -commit 302632f -Author: Hadriel Kaplan -Date: Fri Mar 28 18:47:48 2014 -0400 - - Fix some compiler issues on windows with Lua 5.2 - - Change-Id: I5c692bbc5fd1a9f0d361413e44e70282c3299901 - Reviewed-on: https://code.wireshark.org/review/860 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit 48fc43b -Author: Evan Huus -Date: Fri Mar 28 16:28:53 2014 -0400 - - Implement finalize() method for wmem strbuf. - - Change-Id: Ib7a2b0d348b3624f41253e2d0995a4a38a9fe45d - Reviewed-on: https://code.wireshark.org/review/859 - Reviewed-by: Evan Huus - -commit 7785dd0 -Author: Pascal Quantin -Date: Fri Mar 28 23:42:08 2014 +0100 - - Please checkAPI.pl - - Change-Id: I78e9d3781df81fd4edda7e9b20749cb096a05499 - Reviewed-on: https://code.wireshark.org/review/861 - Reviewed-by: Pascal Quantin - -commit c39060a -Author: Hadriel Kaplan -Date: Fri Mar 28 11:20:08 2014 -0400 - - Update README.wslua with latest info. - - Change-Id: I20ea6c374f791054f16f0aaba33967b869348ff5 - Reviewed-on: https://code.wireshark.org/review/857 - Reviewed-by: Alexis La Goutte - -commit a8562b2 -Author: Bill Meier -Date: Fri Mar 28 13:50:39 2014 -0400 - - Add handling of OSC over TCP; fix a bug in the UDP heuristic. - - Bug Fixed: UDP heuristic wasn't properly setting the dissector - for the UDP conversation. - - From https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9837#c3: - - I did a little survey about alternative OSC transmission, but UDP. - - As OSC is packet-based, it is tramitted raw via packet-oriented protocols (e.g. UDP). - - For reliable stream-based protocols (TCP, USB), the raw OSC packet is - prefixed with the packets Int32 size as a packetization scheme. - - For unreliable stream-based protocols (RS232 and other serial lines), - the raw OSC packet is SLIP and/or double SLIP encoded as packetization - scheme. - - There was discussion in the past to make SLIP encoding the default for - all stream-based protocols, but apparently it has never been adopted - for any OSC via TCP implementation I've found in the web. - - As OSC is used in networked Audio, most implementations run with the - Nagle algorithm disable, and send the prefixed length and the raw OSC - packet separately. - - Change-Id: Ife690cc5ea0575c65124a7b441431e1cc6ba5091 - Reviewed-on: https://code.wireshark.org/review/858 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit f7c6254 -Author: AndersBroman -Date: Fri Mar 28 14:57:24 2014 +0100 - - tvb_get_ascii_string is really expensive. On a large capture file which I - profiled in october Fetch cost has gone from 15,6M to 24,2M, changing - tvb_get_string() to tvb_get_string_enc() with ENC_UTF_8 where it seems - safe helps a bit and should be done any way. - - Change-Id: I4d3e640bfde3304a991c09e2a30ad7dd132fc5ac - Reviewed-on: https://code.wireshark.org/review/855 - Reviewed-by: Anders Broman - -commit 3438243 -Author: Pascal Quantin -Date: Fri Mar 28 13:44:34 2014 +0100 - - Fix crash when calling "MAP Summary" dialog when no file is open - - Fixes bug 9934 - - Change-Id: I2915d0715431cf983511fe7f5f036be99bbd2467 - Reviewed-on: https://code.wireshark.org/review/853 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit b2509f6 -Author: AndersBroman -Date: Fri Mar 28 06:45:01 2014 +0100 - - Deleted one line to much in previous chgange. - - Change-Id: I19d1153558130356286bac55f6cb321d30a767b1 - Reviewed-on: https://code.wireshark.org/review/852 - Reviewed-by: Anders Broman - -commit 2c1e673 -Author: Hadriel Kaplan -Date: Thu Mar 27 16:35:48 2014 -0400 - - Allow chained calls with Lua TreeItem functions, and fix a couple of minor errors. - - A common Lua idiom is to use chained calls, i.e. tree:foo():bar():choo(). This actually - works for tree:add() because it returns the new child tree item which is then the one - being applied to the next chained call. But it doesn't work beyond that for things like - set_generated() and so on. So this commit fixes that. - - This also fixes the Lua tree:add() function for the FT_BOOL type to let it be a Lua boolean value. - And it reverts a previous change to Struct.tohex() to allow coercion of the argument. - - Change-Id: I10f819d363163914ba320c87d4bedebe5b50cacf - Reviewed-on: https://code.wireshark.org/review/851 - Reviewed-by: Anders Broman - -commit 0ffc690 -Author: Martin Kaiser -Date: Thu Mar 27 17:24:24 2014 +0100 - - dissect sRGB chunk - - Change-Id: I5a9eefb7f5108de0e46b70453a4485b1cbc3983d - Reviewed-on: https://code.wireshark.org/review/850 - Reviewed-by: Martin Kaiser - -commit ca384a1 -Author: Martin Kaiser -Date: Thu Mar 27 15:14:31 2014 +0100 - - use an expert info if a png chunk is too large for us - - Change-Id: I6a06bf297ef68ca351deff2e08eec7cd12ba8fe0 - Reviewed-on: https://code.wireshark.org/review/849 - Reviewed-by: Martin Kaiser - -commit ca9c160 -Author: Hadriel Kaplan -Date: Thu Mar 27 17:24:20 2014 -0400 - - Fix bug9931 'Encapsulated ethernet packets sometimes show invalid FCS' - - This fixes part-1 of bug9931: the uninitialized use of a wtap_pkthdr - struct. The second part of the bug deals with dissectors calling - the Ethernet dissector for ecnapsulated Ethernet packets but using - the wrong dissector handle to do so. That's unrelated to the issue this - commit addresses, so I'm splitting them up. - - Change-Id: I87be7b736f82dd74d8c261062f88143372b5344c - Reviewed-on: https://code.wireshark.org/review/848 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit 9a977fc -Author: AndersBroman -Date: Thu Mar 27 17:48:19 2014 +0100 - - Add dissection of 3G Interface Type package and add some comments about - the usage of variables in the h248_package_t struct. - - Change-Id: Ic5419ab5c20051e56963fe8ea1728d78f95538f0 - Reviewed-on: https://code.wireshark.org/review/846 - Reviewed-by: Anders Broman - -commit d1bef29 -Author: AndersBroman -Date: Thu Mar 27 15:07:34 2014 +0100 - - Regenerate the dissector with the latest template. - - Change-Id: Iefdd7122537108c37e71650ad2674418109d2f1b - Reviewed-on: https://code.wireshark.org/review/845 - Reviewed-by: Anders Broman - -commit 418c3a7 -Author: Pascal Quantin -Date: Thu Mar 27 11:38:06 2014 +0100 - - NAS EPS: display also detach cause in case of network initiated procedure - - Change-Id: I36fef9eb8a81b03f29c812f94524f4cdf056448b - Reviewed-on: https://code.wireshark.org/review/844 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit 3dd4ef5 -Author: Pascal Quantin -Date: Thu Mar 27 09:54:47 2014 +0100 - - MBIM: fix identification of DSS streams and add a way to register an external dissector for DSS - - Change-Id: Ic7f5708b60ee5846d95725dbbd14d8958d43372e - Reviewed-on: https://code.wireshark.org/review/843 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit 3584a21 -Author: AndersBroman -Date: Thu Mar 27 10:34:59 2014 +0100 - - From Martin Mathiesson: Display Detach Type in info col. - - Change-Id: I33692ac93f60cbabec0804f6ee7e75a9d5b9497c - Reviewed-on: https://code.wireshark.org/review/842 - Reviewed-by: Anders Broman - -commit f3fe29f -Author: Hadriel Kaplan -Date: Wed Mar 26 19:12:04 2014 -0400 - - Add paths to Lua package.path so require works for user scripts - - This adds the global and personal plugins directories to the - package.path setting in Lua, so doing 'require' will work - properly. - - Change-Id: Iec33bc60cd7d41aa122da456db91d4ccc3085f82 - Reviewed-on: https://code.wireshark.org/review/841 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit 09055f1 -Author: Martin Kaiser -Date: Wed Mar 26 23:24:07 2014 +0100 - - two more chunk names - - Change-Id: I5a34a59c88a4119be2fac4acdd352d474ffc62cd - Reviewed-on: https://code.wireshark.org/review/840 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 9497476 -Author: Martin Kaiser -Date: Wed Mar 26 23:15:01 2014 +0100 - - add some more chunk names - - Change-Id: I6d294a901af88f993ca6a44ababad194fb44a693 - Reviewed-on: https://code.wireshark.org/review/839 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit d5ddfed -Author: Martin Kaiser -Date: Wed Mar 26 21:43:20 2014 +0100 - - clean up the png dissector - - use value_string instead of our own data type - read the type string in one go - - Change-Id: I115c99c4636540702c1fd301f09a92a0dd466fcd - Reviewed-on: https://code.wireshark.org/review/838 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 436100c -Author: Martin Kaiser -Date: Wed Mar 26 12:14:59 2014 +0100 - - use the correct png chunk len - the parameter for proto_tree_add_text() is the length, not the end offset - - Change-Id: Ie24d5982b7ff13363061fb087438dd714cae748a - Reviewed-on: https://code.wireshark.org/review/837 - Reviewed-by: Martin Kaiser - -commit 482a3cd -Author: AndersBroman -Date: Wed Mar 26 15:55:07 2014 +0100 - - More fiddling with heuristic. - - Change-Id: I50b78cc38c6f529695ecd54ced0ed94e8a683534 - Reviewed-on: https://code.wireshark.org/review/835 - Reviewed-by: Anders Broman - -commit 873a96f -Author: AndersBroman -Date: Wed Mar 26 13:09:31 2014 +0100 - - Fix off by one error - - Change-Id: I24c9e988786a95489f918bed2c043e6eb23e4caa - Reviewed-on: https://code.wireshark.org/review/834 - Reviewed-by: Anders Broman - -commit 7fd2daa -Author: Balint Reczey -Date: Sun Mar 23 10:55:44 2014 -0100 - - Postpone replacing GTK+ stock icon usage - - This prevents regressions observable on GTK+ 3.10 which caused - icons to disappear in some cases. - - Change-Id: Ic971258807510dc038e30c6c64fb547f0529a3c2 - Reviewed-on: https://code.wireshark.org/review/792 - Reviewed-by: Balint Reczey - -commit 97ab466 -Author: Pascal Quantin -Date: Wed Mar 26 10:55:26 2014 +0100 - - LTE RRC: add file forgotten in gb981173 - - Change-Id: I1727e56e678c32402f6331463c06c62072c954d8 - Reviewed-on: https://code.wireshark.org/review/833 - Reviewed-by: Pascal Quantin - -commit 8c2bb80 -Author: Hadriel Kaplan -Date: Wed Mar 26 02:24:51 2014 -0400 - - Add various functions for Lua directory handling and path info - - This adds new functions to get plugins path info, find out if a directory - exists, make a new one, remove one, etc. It also creates a file environment - for user-supplied Lua scripts, to prevent global variable contamination as - well as supply the script-specific file name. Some other minor cleanup was - done as I found them. - - A new testsuite was added to test the existing and new directory functions. - - Change-Id: I19bd587b5e8a73d89b8521af73670e023314fb33 - Reviewed-on: https://code.wireshark.org/review/832 - Reviewed-by: Anders Broman - -commit da1af6e -Author: Hadriel Kaplan -Date: Tue Mar 25 18:11:05 2014 -0400 - - Add filterable expert info for Lua - - This adds the ability for a Lua script to register expert info fields, - similar to C-code dissectors. This change also removes the need for - the expert_add_info_format_internal() function. Existing Lua scripts - do not have to change, because the existing expert info function - uses the internal "_ws.lua" protocol instead of nothing; but using - the new functionality provides more benefits since it correctly - registers the expert info fields to the dissector's protocol. - - The test suite was amended to generate both old and new forms. - - Change-Id: Ib5ae74e927cfa81312baf7b04ff4104b0b4f936e - Reviewed-on: https://code.wireshark.org/review/830 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit b981173 -Author: Pascal Quantin -Date: Wed Mar 26 00:07:20 2014 +0100 - - LTE RRC: fix dissection of SystemInfoListGERAN IE - - Change-Id: I502f7cd97cf00822900b4cd09e183e3b491c1437 - Reviewed-on: https://code.wireshark.org/review/831 - Reviewed-by: Pascal Quantin - -commit 38b5efd -Author: Pascal Quantin -Date: Tue Mar 25 22:51:05 2014 +0100 - - MBIM: fix dissection of control packets when capturing with usbmon - - Change-Id: Ie20fcb8d393a85d47ba78f6cb70de77fedda2587 - Reviewed-on: https://code.wireshark.org/review/829 - Reviewed-by: Pascal Quantin - -commit 843054c -Author: Martin Kaiser -Date: Tue Mar 25 21:37:46 2014 +0100 - - no need for if(tree) - - Change-Id: If95ece8e2db1b650de5804465128020caf391956 - Reviewed-on: https://code.wireshark.org/review/828 - Reviewed-by: Martin Kaiser - -commit 027ecfb -Author: Martin Kaiser -Date: Tue Mar 25 21:29:56 2014 +0100 - - use wmem_ascii_strdown() - - Change-Id: Iaa7dfdc979e78f53b53f2b9a0b093873c9004f2d - Reviewed-on: https://code.wireshark.org/review/827 - Reviewed-by: Martin Kaiser - -commit 63b0d89 -Author: Martin Kaiser -Date: Fri Mar 21 14:22:09 2014 +0100 - - if a .png file is sent on the application mmi resource, pass the file - data to the png dissector - - Change-Id: I112733f97ba35d9ec497b427c64b2f5ea99fd963 - Reviewed-on: https://code.wireshark.org/review/818 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit d6381c6 -Author: AndersBroman -Date: Tue Mar 25 18:19:12 2014 +0100 - - Strengthen RANAP heuristic. - - Change-Id: I8f6515d2716bb633f753243b7f86d371a22ebbad - Reviewed-on: https://code.wireshark.org/review/826 - Reviewed-by: Anders Broman - -commit 86d65a0 -Author: AndersBroman -Date: Tue Mar 25 11:00:50 2014 +0100 - - Introduce wmem_ascii_strdown() - - Change-Id: Icdc5a0d5033f3ab709fbf19a33ab26f609d4b1f0 - Reviewed-on: https://code.wireshark.org/review/824 - Reviewed-by: Evan Huus - -commit a99a036 -Author: Michal Labedzki -Date: Mon Mar 24 11:54:00 2014 +0100 - - Bluetooth: Fix wrong recognized RFCOMM services - - It seems that RFCOMM service can be dynamically changed while - connection is still alive. In other words: host can connect to - remote device and set one RFCOMM service (remote service), but later - remote device can change service to one of host service without - any disconnection. This patch add support for this case. - Also improve searching for useful UUID service through SDP. - - Change-Id: I9e03b9b965d6b0d9761b4a451cdeb4a1a33ca017 - Reviewed-on: https://code.wireshark.org/review/808 - Reviewed-by: Anders Broman - -commit ab42220 -Author: Michal Labedzki -Date: Tue Mar 25 08:59:28 2014 +0100 - - Bluetooth: AVDTP: Add option to disable Force Codec preference - - In real option "SBC" was Default/Off, now user can choose between - Default and Force SBC Codec. - - Change-Id: I605320d89fade11dc7172793bc0492bc4b319e9c - Reviewed-on: https://code.wireshark.org/review/822 - Reviewed-by: Anders Broman - -commit e90f660 -Author: AndersBroman -Date: Tue Mar 25 10:04:02 2014 +0100 - - Don't register in the rtp.pt table if the pt value is set to zero. - - Change-Id: I17c523da0fb57ed8591f409615fe56ab18977103 - Reviewed-on: https://code.wireshark.org/review/823 - Reviewed-by: Anders Broman - -commit 03d982a -Author: Alexis La Goutte -Date: Thu Feb 20 11:00:15 2014 +0100 - - DHCP/BOOTP: Add specific 43 Option when Class is ArubaAP or ArubaInstantAP - - Change-Id: I77d898af2b6b6f413f3698bb24f4c6280898da1a - Reviewed-on: https://code.wireshark.org/review/775 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit de44124 -Author: Hadriel Kaplan -Date: Sun Mar 23 11:01:12 2014 -0400 - - Enhance Lua API doc generator and add more API info - - This enhances the Lua API doc generator Perl script to handle - meta-information in description comments, such as bold, italics, - raw code, version info, etc. - - The supported markup and codes are documented in make-wsluarm.pl. - - It's not beautiful Perl code (I don't know Perl), and I'd rather - do it using Lua, but I think keeping it Perl makes more sense in - the long run. - - Change-Id: I477b3ebe770075dcea9ec52708e2d6fb5758d2f4 - Reviewed-on: https://code.wireshark.org/review/802 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit e4756cc -Author: Guy Harris -Date: Mon Mar 24 20:15:21 2014 -0700 - - Comment cleanups. - - Remove some more 802.11i references, and replace a reference to the - "WEP" bit with a reference to the "Protected" bit. - - Change-Id: I77b50af2b34e2bdc4c21af29b54627ed19219090 - Reviewed-on: https://code.wireshark.org/review/821 - Reviewed-by: Guy Harris - -commit 4038fa9 -Author: Guy Harris -Date: Mon Mar 24 20:07:07 2014 -0700 - - IEEE 802.11i is dead; long live IEEE 802.11-2012. - - 802.11i was absorbed into a revision of the 802.11 spec, so speak of - "IEEE 802.11 RSNA EAPOL"/"wlan_rsna_eapol" until somebody comes up with - a better name for it. - - Also, add in one more key flags bit that's in 802.11-2012 but not - 802.11i-2004. - - Change-Id: Ia825f7466f3b3d159706eb681546b5bbb4e066bf - Reviewed-on: https://code.wireshark.org/review/820 - Reviewed-by: Guy Harris - -commit 250c2b0 -Author: Martin Kaiser -Date: Mon Mar 24 22:54:17 2014 +0100 - - minor cleanup - - replace TABs with spaces - - add editor modelines - - remove unnecessary NULL checks - - Change-Id: Ic6024fc4b6aec56c8cafd39c707e20485fa6cca7 - Reviewed-on: https://code.wireshark.org/review/819 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 9c2e374 -Author: Martin Kaiser -Date: Mon Mar 24 15:48:07 2014 +0100 - - separate function to dissect File Acknowledge APDU - - Change-Id: I1824407cae4cded0680b01e9dea1de6f0408c607 - Reviewed-on: https://code.wireshark.org/review/817 - Reviewed-by: Martin Kaiser - -commit d2ba473 -Author: Pascal Quantin -Date: Mon Mar 24 22:29:11 2014 +0100 - - Upgrade LPPe dissector to V1_1-20140108-C - - Change-Id: I1d5d4ed73825bb5cda0cc2e76e5000c38c50b601 - Reviewed-on: https://code.wireshark.org/review/816 - Reviewed-by: Pascal Quantin - -commit 69f4610 -Author: Pascal Quantin -Date: Mon Mar 24 22:06:57 2014 +0100 - - Add IEEE 1722a and Landis & Gyr Telegyr 8979 dissectors to release notes - - Change-Id: I1785bd35f9fcd2624a97e6ba224f3dbafb673846 - Reviewed-on: https://code.wireshark.org/review/815 - Reviewed-by: Pascal Quantin - -commit 8aaff81 -Author: Clay Jones -Date: Fri Mar 21 14:21:24 2014 -0600 - - Add the FNET_PRIVATE ppi extension. - Look for a dissector for "ppi_fnet" and use it if found, otherwise - just display the fnet tag on the data. - - Change-Id: I07009215faa8faad0e6a82468bad33f266778426 - Reviewed-on: https://code.wireshark.org/review/778 - Reviewed-by: Anders Broman - -commit 93d996b -Author: Graham Bloice -Date: Sun Mar 23 19:20:19 2014 +0000 - - Enhanced text2pcap so that if direction is specified on the command line, "-D", - and a direction indicator added to the start of each packet in the text file, - "I" or "O", then the ip source and destination addresses and udp, tcp and sctp - ports are swapped for an inbound packet. - Tcp sequence numbers and ack sequence numbers are updated accordingly. - - Change-Id: Iec2c0fd68d80aad8842b7513fdd30bae6806b96a - Reviewed-on: https://code.wireshark.org/review/801 - Reviewed-by: Graham Bloice - Tested-by: Graham Bloice - Reviewed-by: Michael Mann - -commit d04cddf -Author: Martin Kaiser -Date: Mon Mar 24 15:30:25 2014 +0100 - - no need for if(tree) - - Change-Id: Ia6db5839a8bbbc79a5196406e3f8d59f7ce7498a - Reviewed-on: https://code.wireshark.org/review/814 - Reviewed-by: Martin Kaiser - -commit d066376 -Author: AndersBroman -Date: Mon Mar 24 14:36:04 2014 +0100 - - Check API found: Found non-ASCII characters on line 248 ..253 - - Change-Id: I964690c6468f1b8cfdf63cb5784f26065d56a204 - Reviewed-on: https://code.wireshark.org/review/813 - Reviewed-by: Anders Broman - -commit 3258588 -Author: AndersBroman -Date: Mon Mar 24 14:30:52 2014 +0100 - - Don't include voip_bg.xpm, it's not used any more. - - Change-Id: I34fb5166afb7b1218cb7e011096c4a3455b364d3 - Reviewed-on: https://code.wireshark.org/review/812 - Reviewed-by: Anders Broman - -commit d35a4e8 -Author: AndersBroman -Date: Mon Mar 24 13:41:49 2014 +0100 - - Get rid of the background pixmap, set the background color directly. - - Change-Id: I7b291892b041055fe4165abcbb2962a295aedce4 - Reviewed-on: https://code.wireshark.org/review/811 - Reviewed-by: Anders Broman - -commit 698e829 -Author: Michal Labedzki -Date: Mon Mar 10 15:48:43 2014 +0100 - - USB: Fix comments about dissector tables used in "Decode As" - - Issue requested by Tomasz Mon, thanks. - - Change-Id: I9931f561294ef34573c6426f17a299c8929a2341 - Reviewed-on: https://code.wireshark.org/review/810 - Reviewed-by: Anders Broman - -commit 79ed216 -Author: Michal Labedzki -Date: Thu Mar 20 18:31:03 2014 +0100 - - Use tabs instead of spaces - - Change-Id: I16086216ffcac0a457c8fcdabfc0458d4e701ea0 - Reviewed-on: https://code.wireshark.org/review/809 - Reviewed-by: Anders Broman - -commit e01c07a -Author: Michal Labedzki -Date: Sun Mar 23 18:27:19 2014 +0100 - - Bluetooth: L2CAP: Fix disconnection CIDs - - CID has two roles: Source CID and Destination CID. This two roles - have another two different meanings: one if frame is received, another if frame - is sent (SCID is "DCID", etc). Then using information that PDU is "request" - or "response" we can correctly recognize CID. - - This should fix unrecognized L2CAP payload while there were no valid - Disconnection Request. - - Change-Id: Ibcbbb9e6966873b6af12c1e3c65c6a3983aa4163 - Reviewed-on: https://code.wireshark.org/review/807 - Reviewed-by: Anders Broman - -commit 992c65c -Author: Michal Labedzki -Date: Sun Mar 23 16:43:55 2014 +0100 - - Bluetooth: L2CAP: A little update to Core 4.1 - - Add some command codes seen in Core 4.1 specification. - Also add some missing fields. - - Change-Id: If3761744b1ada185027a560bceb66804d7eea8ec - Reviewed-on: https://code.wireshark.org/review/806 - Reviewed-by: Anders Broman - -commit 01c4685 -Author: Michal Labedzki -Date: Fri Mar 21 12:36:28 2014 +0100 - - Bluetooth: AVDTP: Use full name for MPF field - - Change-Id: I25d359926fa5790383624378a6826c8fd5a9bd5c - Reviewed-on: https://code.wireshark.org/review/805 - Reviewed-by: Anders Broman - -commit 9c370fc -Author: Michal Labedzki -Date: Sun Mar 16 13:07:36 2014 +0100 - - Bluetooth: AVDTP: Improve filtering - - A few more filtering name separated by "." for convention. - - Change-Id: Ie1ceb0ba807e033085c43826c334933c6b178389 - Reviewed-on: https://code.wireshark.org/review/804 - Reviewed-by: Anders Broman - -commit 8e3e0fd -Author: Michal Labedzki -Date: Wed Mar 19 09:58:07 2014 +0100 - - Bluetooth: Add Member "Company" UUIDs - - Change-Id: I8f455f12eeeaa51a0699e4cc1ee639d7031ce2c6 - Reviewed-on: https://code.wireshark.org/review/803 - Reviewed-by: Anders Broman - -commit 8da90a2 -Author: Alexis La Goutte -Date: Sun Mar 23 16:18:48 2014 +0100 - - Fix Argument with 'nonnull' attribute passed null found by Clang - - Change-Id: I5c84e4813d03b734afaf2a7cb3205773324f049d - Reviewed-on: https://code.wireshark.org/review/798 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit 30a4398 -Author: Alexis La Goutte -Date: Sun Mar 23 16:15:28 2014 +0100 - - Fix Argument with 'nonnull' attribute passed null found by Clang - - Change-Id: Ie27fb4c5067c35237a5027ce6428b6cfed40b141 - Reviewed-on: https://code.wireshark.org/review/797 - Reviewed-by: Evan Huus - Reviewed-by: Michael Mann - -commit 2d78287 -Author: Guy Harris -Date: Sun Mar 23 12:17:23 2014 -0700 - - Add a dissector table for EAPOL Key Descriptor types. - - Instead of having a switch statement in the EAPOL dissector for Key - Descriptor types, have a dissector table, and: - - have the EAPOL dissector register with a dissector for the RC4 - type; - - have the 802.11 dissector register with dissectors for WPA and - RSN types. - - This means that ieee_80211_add_tagged_parameters() no longer needs to be - public; make it static. - - Change-Id: I68e0592c3ea055c693d6d5d5a9eb88634ea37a95 - Reviewed-on: https://code.wireshark.org/review/800 - Reviewed-by: Guy Harris - -commit 2a6e50c -Author: Guy Harris -Date: Sun Mar 23 11:44:12 2014 -0700 - - Clean up white space. - - This makes the code's if/then/else bracketing clearer. - - Make the if/then/else style more consistent in one case, which also helps. - - Change-Id: I7c765b761d92c6710461181b3e3ccd77d2a40f83 - Reviewed-on: https://code.wireshark.org/review/799 - Reviewed-by: Guy Harris - -commit 04c9655 -Author: Alexis La Goutte -Date: Tue Feb 18 15:45:24 2014 +0100 - - DHCP/bootp: Always display by default value of Option 43 (Vendor-Specfic) - - Change-Id: I91b711a11865ce8d31d3585b93b11923e25a12d3 - Reviewed-on: https://code.wireshark.org/review/774 - Reviewed-by: Evan Huus - -commit e0378db -Author: Gerald Combs -Date: Sun Mar 23 08:06:28 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-03-23] - - Change-Id: I33cecc1f3c4e66f5758eeb8cbba77cde97a06ae5 - Reviewed-on: https://code.wireshark.org/review/793 - Reviewed-by: Alexis La Goutte - -commit 045a662 -Author: Guy Harris -Date: Sun Mar 23 00:52:27 2014 -0700 - - Note that the EAPOL-Key Key Data this dissects is for 802.11. - - Change-Id: Id012c468da8619108ec41ad3ae43564f4fa636aa - Reviewed-on: https://code.wireshark.org/review/791 - Reviewed-by: Guy Harris - -commit 864304c -Author: Alexis La Goutte -Date: Sat Mar 22 15:31:20 2014 +0100 - - Update to QCustomPlot 1.2.0 - - Reapply remove trailing whitespace and some spelling fixes - MSCV warning are already fixed - Fix also a not ASCII caracter in qcustomplot.h - - Change-Id: Ied6b0a4ad7397caea6b75fa56f4f2d6ea91d0472 - Reviewed-on: https://code.wireshark.org/review/787 - Reviewed-by: Anders Broman - -commit 21a61a8 -Author: Hadriel Kaplan -Date: Sun Mar 23 00:30:21 2014 -0400 - - Add Lua Struct.values() function, and prevent coercion in all Struct functions - - This adds a Struct.values() function to get the number of values - needed/returned with Struct.pack/unpack. It also changes the existing - Struct functions such that they don't coerce a non-string argument - into a string. (not preventing it confused a user on ask.wireshark.org) - - Change-Id: I93d5846105e55b67680e1c276a7286535c77b039 - Reviewed-on: https://code.wireshark.org/review/790 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit 9950510 -Author: Alexis La Goutte -Date: Sat Mar 22 14:56:36 2014 +0100 - - Add missing modelines info - - Change-Id: Ic0f83eb469442b386d6389c08860b0faaae2e324 - Reviewed-on: https://code.wireshark.org/review/785 - Reviewed-by: Anders Broman - -commit 69af33f -Author: Hadriel Kaplan -Date: Sat Mar 22 12:58:12 2014 -0400 - - Fix spelling mistakes in Lua test scripts - - Change-Id: I8671eb3d3b46ec5c723a6545451ecbb33a10c807 - Reviewed-on: https://code.wireshark.org/review/788 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Alexis La Goutte - -commit 1f28f47 -Author: Hadriel Kaplan -Date: Sat Mar 22 10:27:33 2014 -0400 - - Fix Bug 9915 'GIOP dissector prints non-UTF-8 to Info column' - - When the capture file in Bug 9915 is opened in wireshark with GTK2, - the console prints out 'Pango-WARNING **: Invalid UTF-8' warnings. - This capture file was a subset of the one in fuzzbot crash bug 9883. - I believe it is what's causing the crash in 9883, because GTK is - finicky about such things. But my system doesn't crash for bug 9883, - so perhaps it's not the same root cause. - - Change-Id: Ifaaed9157f9abd34014001c954647f7db51d650b - Reviewed-on: https://code.wireshark.org/review/786 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Alexis La Goutte - -commit 4acdfe3 -Author: AndersBroman -Date: Sat Mar 22 11:32:25 2014 +0100 - - Fix request for implicit conversion from 'gpointer' to 'struct file_priv_t *' not permitted in C++ - - Change-Id: If88c65fa70d38d6b447a060a19d2681aa7166217 - Reviewed-on: https://code.wireshark.org/review/783 - Reviewed-by: Anders Broman - -commit 66719c9 -Author: Hadriel Kaplan -Date: Thu Mar 20 17:56:21 2014 -0400 - - Add way for Lua file reader to save state per file read/write ops - - Lua can create a file reader/writer, to open new capture file - formats or write to new ones. To save local state, it can save - things in Lua itself; but since there can be multiple open files - at the same time (for example during a reload), the Lua script - won't know for which file and state its read/write functions are - being invoked for. To remedy this, and also provide a convenient - way to store such state, this commit adds the ability for a Lua - script to store a Lua table in the wtap/wtap_dumper's priv - data member, just like C-code-based reader/writers do. - - Change-Id: Ifc9e0d5f0379accee56f2a04b6080238670fec52 - Reviewed-on: https://code.wireshark.org/review/766 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit 296bc0b -Author: Hadriel Kaplan -Date: Fri Mar 21 22:47:20 2014 -0400 - - Fix Bug 9909 Buildbot crash correctly - - Fixed a null de-reference in packet-ieee80211.c caused by change-id - I742726027bcab7d25ca4a9ce3a406518db6d272f, commit g4b8b83407ac744d114462235a8bcca0d480954c7. - - See Bug 9909 for details. - - Change-Id: I7189476faee3ae6ab34fb52c1564ac668496679a - Reviewed-on: https://code.wireshark.org/review/780 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit da83ead -Author: Alexis La Goutte -Date: Wed Mar 19 11:26:03 2014 +0100 - - Enhance Neighbor report - - Closed-bug: 9724 - - Change-Id: Id6aefcddf5bd8bd490296e84351152808c03004a - Reviewed-on: https://code.wireshark.org/review/731 - Reviewed-by: Alexis La Goutte - -commit 82f11d4 -Author: Alexis La Goutte -Date: Fri Mar 21 22:53:58 2014 +0100 - - Fix indexcap tools - - Change-Id: Ib77af11975873106b7db7ac1bcd12f4a0800b59e - TypeError: extract_protos_from_file() takes exactly 6 arguments (7 given) - Reviewed-on: https://code.wireshark.org/review/779 - Reviewed-by: Alexis La Goutte - -commit 97ba940 -Author: Martin Kaiser -Date: Fri Mar 21 10:35:20 2014 +0100 - - fix a crash in the GTK "Interface Management" dialogue - for Pipes and Local Interfaces - (Capture / Options / Manage Interfaces) - - if you start with an empty dialogue, select a pipe using Browse and - press Save, wireshark crashes because of a strcmp() against the - uninitialized pipe_name - - initialize pipe_name to NULL and make sure its value is reset when the - dialogue is closed - - don't add a pipe unless there's an active selection in the pipe list - (which may be "New Pipe") - - Change-Id: Id460c8d0d43cd7fc4cb8f4e9b4357898bbef20f7 - Reviewed-on: https://code.wireshark.org/review/776 - Reviewed-by: Anders Broman - -commit 752e545 -Author: Hadriel Kaplan -Date: Fri Mar 21 15:12:55 2014 -0400 - - Fix API comments and don't use sprintf in wslua_int64.c - - Change-Id: I4997317e010f685d47e1e2ab512b086e54b286a7 - Reviewed-on: https://code.wireshark.org/review/777 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Alexis La Goutte - -commit 51597c1 -Author: Alexis La Goutte -Date: Fri Mar 21 19:29:45 2014 +0100 - - Add a missing word to translation - - Change-Id: I7ec79840331a5072f12236c27f8dc842c703b23f - Reviewed-on: https://code.wireshark.org/review/773 - Reviewed-by: Alexis La Goutte - -commit aa082ce -Author: Alexis La Goutte -Date: Tue Feb 25 23:26:23 2014 +0100 - - Enhance translation (rename toolTip to avoid similar string...) - - Change-Id: I23e30b445ac587e2702477afcf6b155ff21f23d4 - Reviewed-on: https://code.wireshark.org/review/772 - Reviewed-by: Alexis La Goutte - -commit 57d68fe -Author: Alexis La Goutte -Date: Sun Feb 16 16:14:49 2014 +0100 - - Add dot to string - - And avoid different string for translation... - - Change-Id: I36ae0fd3366cb9b42f146163f4355778f0b9b40c - Reviewed-on: https://code.wireshark.org/review/771 - Reviewed-by: Alexis La Goutte - -commit ad39bb3 -Author: Martin Kaiser -Date: Fri Mar 21 17:28:58 2014 +0100 - - test for >0 - - Change-Id: I7114028ce296ffa875ddfbb24b935dc2573f964c - Reviewed-on: https://code.wireshark.org/review/770 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 95f5938 -Author: Martin Kaiser -Date: Fri Mar 21 15:25:34 2014 +0100 - - fix clear/scrambled detection - - Change-Id: Id82763dd17e8c4e0902ae8e31ec6554e8f174b59 - Reviewed-on: https://code.wireshark.org/review/769 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit d1873db -Author: Hadriel Kaplan -Date: Thu Mar 20 12:57:29 2014 -0400 - - Fix Bug 9903: 'Clicking reload-file ignores selected file format reader' - - There's a relatively new feature in 1.11.3 to select a specific file format - reader, instead of relying on magics or heuristics. If you select a file - reader and open a file, open it, and then click the reload-file button or go - to View->Reload or press the ctrl-R keymap, the file is reloaded but using the - magic/heuristics again instead of the file format reader you previously chose. - Likewise, the Lua relaod() function has the same issue (which is how I found - this problem). - - I have tested this change by hand, using a Lua script, but I didn't add it - to the testsuite because I need another change for my test script to work - correctly. (an enhancement rather than a bug fix, which I'll submit separately) - - Change-Id: I48c2d9ea443e37fd9d41be43d6b6cd5a866d5b01 - Reviewed-on: https://code.wireshark.org/review/764 - Reviewed-by: Anders Broman - -commit 49be990 -Author: Alexis La Goutte -Date: Sat Mar 15 18:55:46 2014 +0100 - - Make Mac OS X buildbot happy (fix index shadow variable) - - packet-epl.c:2248: warning: declaration of 'index' shadows a global declaration - packet-epl.c: In function 'dissect_epl_sdo_command_write_multiple_by_index': - packet-epl.c:2380: warning: declaration of 'index' shadows a global declaration - packet-epl.c: In function 'dissect_epl_sdo_command_read_by_index': - packet-epl.c:2489: warning: declaration of 'index' shadows a global declaration - - Change-Id: Ib1a1d1d2aa596df558162839e7594b7fd12559a3 - Reviewed-on: https://code.wireshark.org/review/765 - Reviewed-by: Alexis La Goutte - -commit f5cfcf6 -Author: Andreas Leibold -Date: Fri Feb 28 15:47:29 2014 +0100 - - ieee1722a dissector added - - Change-Id: I4361e282146d86057d6797bc001f6605d5d06486 - - Whitespaces removed, Code clean up, usage of expert information API - - Change-Id: I4361e282146d86057d6797bc001f6605d5d06486 - - code beautyfying, modeline added - - Change-Id: I4361e282146d86057d6797bc001f6605d5d06486 - - code beautyfying - - Change-Id: I4361e282146d86057d6797bc001f6605d5d06486 - Reviewed-on: https://code.wireshark.org/review/430 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit e0556fa -Author: Lukas Emersberger -Date: Thu Mar 13 14:39:39 2014 +0100 - - EPL: Enable PLK to display OD entries - - Each package is dissected using a reference to object indeces, so - that in the view of the dissector output, a clear indication - to what the index means and what the subindices mean is given. - Additional special entries (mappings, timestamps) have their own hf - fields, and can be searched for via display filter. - - Signed-off-by: Lukas Emersberger - Change-Id: I928c11a9f4a5b762c8947713a0f70e03bd711158 - Reviewed-on: https://code.wireshark.org/review/730 - Reviewed-by: Roland Knall - Reviewed-by: Lukas Emersberger - Reviewed-by: Anders Broman - -commit 25826ad -Author: Hadriel Kaplan -Date: Fri Mar 21 09:54:44 2014 -0400 - - Fix using '%hh' for printf format because MS Visual C++ is lame - - Change-Id: I1d80b82d7c6a5aa85bf59b449326874c0f851737 - Reviewed-on: https://code.wireshark.org/review/763 - Reviewed-by: Alexis La Goutte - -commit dc75867 -Author: Hadriel Kaplan -Date: Fri Mar 21 09:28:01 2014 -0400 - - Fix missing license in conversation_debug.h - - Change-Id: I5922a36ee84d45653e52e6fe847c6a9085ee5e21 - Reviewed-on: https://code.wireshark.org/review/762 - Reviewed-by: Anders Broman - -commit 0940595 -Author: Roland Knall -Date: Thu Mar 20 15:23:55 2014 +0100 - - openSAFETY, EPL: Fix heuristic for false-positives - - - Adding a typedefinition which can be deactivated, so - that certain types of frames are only detected in their - respective transport protocols - - Rename bytes array as it is a key-word for some IDEs and - hinders syntax checking - - Add node info to the time request from/by fields - - EPL: add message type to heuristic dissection call - - Change-Id: Ia572bb68fc1d24d70e72b77867f0dad323b055b9 - Reviewed-on: https://code.wireshark.org/review/750 - Reviewed-by: Roland Knall - Reviewed-by: Anders Broman - -commit a04f610 -Author: Hadriel Kaplan -Date: Wed Mar 5 10:56:33 2014 -0500 - - Add debug printing functions for conversations, sip, sdp, rtp - - There have been enough gnarly bus in sip/sdp/rtp that it needs - to have good debug printing. Using a debugger isn't good enough - because there's interaction across multiple frames and it's too - hard to follow what's going on without real printed data history. - - Change-Id: Ifb5bb1fb580be81f988569ece79d238a9c030c34 - Reviewed-on: https://code.wireshark.org/review/688 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit 9c5f199 -Author: Hadriel Kaplan -Date: Thu Mar 20 17:59:50 2014 -0400 - - Fix bug 9909 Buildbot crash - but only to stop the crashing - - This fixes the crashing on buildbot, but only in the sense that - it now calls DESSECTOR_ASSERT_NOT_REACHED() for the case that's - causing the crash - which is a null dereference, due to something - going wrong in add_tagged_field() of packet-ieee80211.c. - - I don't know what the right thing to do is, but at least this - gets buildbot going again. (that file is over 25k lines!) - - Change-Id: I1658944f9704a071dffc7f4834b9294fffc0e7ba - Reviewed-on: https://code.wireshark.org/review/757 - Reviewed-by: Anders Broman - -commit 7b6f047 -Author: Guy Harris -Date: Thu Mar 20 18:45:42 2014 -0700 - - Handle big-endian Prism headers. - - Apparently, some systems write out big-endian Prism headers (probably - big-endian-MIPS-based Wi-Fi APs running $LINUX_DISTRIBUTION and the - like), so check for both big-endian and little-endian message codes, - and, for the fields in the header, use the byte order that matched. - - Change-Id: Ia13df606676bb7dbc5d12fe4e297681bebb6f478 - Reviewed-on: https://code.wireshark.org/review/759 - Reviewed-by: Guy Harris - -commit 0ec20c3 -Author: Martin Kaiser -Date: Fri Mar 14 09:55:39 2014 +0100 - - brackets around MAKE_TYPE_VAL's definition - - Change-Id: I8e080b250b81976898d2950da9e91fb32b719590 - Reviewed-on: https://code.wireshark.org/review/756 - Reviewed-by: Martin Kaiser - -commit 48f6b80 -Author: Martin Kaiser -Date: Thu Mar 13 18:52:43 2014 +0100 - - (nearly empty) function to dissect the body of a track header box - - Change-Id: I17e4bb3968e503b250b9c8d6a7a9bb2abf0f6868 - Reviewed-on: https://code.wireshark.org/review/755 - Reviewed-by: Martin Kaiser - -commit c9440cb -Author: Martin Kaiser -Date: Thu Mar 20 20:30:31 2014 +0100 - - use the WTAP_TYPE_AUTO define to make things clearer - - Change-Id: I1dd51d1452333826c153b6bb861262a6166af3c5 - Reviewed-on: https://code.wireshark.org/review/754 - Reviewed-by: Martin Kaiser - -commit 6553435 -Author: Bill Meier -Date: Thu Mar 20 13:38:08 2014 -0400 - - col_...() should not be under 'if (tree)'; add editor modelines. - - Change-Id: I4c2464c6faa79bdc1edb205f3f842864963d1cb9 - Reviewed-on: https://code.wireshark.org/review/753 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 3626f86 -Author: Pascal Quantin -Date: Thu Mar 20 16:32:53 2014 +0100 - - Upgrade LTE RRC dissector to v11.7.0 - - Change-Id: If1f64241846cc18463c8c5e9da7dd2a5eaba6733 - Reviewed-on: https://code.wireshark.org/review/752 - Reviewed-by: Pascal Quantin - -commit ffe7134 -Author: AndersBroman -Date: Thu Mar 20 15:40:59 2014 +0100 - - Get the NEXT protocol not the previous top one. - - Change-Id: I261a740cbc369d905c89236b5173944e2780af59 - Reviewed-on: https://code.wireshark.org/review/751 - Reviewed-by: Anders Broman - -commit 0513b29 -Author: Anders Broman -Date: Thu Mar 20 12:22:39 2014 +0000 - - Revert "Allow pcapng interface options to be available to dissectors." - This patch causes Wireshark/tshark to segfault if the file is reread(open a file and press reload). - The test suite also fails on - 2.1.1 Step: Exit status for existing file: "/home/wireshark/builders/trunk/sol10sparc/build/test/captures/dhcp.pcap" must be 0/home/wireshark/builders/trunk/sol10sparc/build/test/suite-clopts.sh: line 149: 6646 Segmentation Fault (core dumped) $TSHARK -r "${CAPTURE_DIR}dhcp.pcap" > ./testout.txt 2>&1 - - OSX build bot chokes on - pcapng.c: In function 'pcapng_destroy_option_value': - pcapng.c:377: warning: implicit declaration of function 'g_byte_array_unref' - pcapng.c:379: warning: implicit declaration of function 'g_array_unref' - pcapng.c: In function 'pcapng_collect_block_option': - pcapng.c:419: warning: implicit declaration of function 'g_byte_array_new_take' - pcapng.c:419: warning: initialization makes pointer from integer without a cast - - these functions are glib 2.22 - This reverts commit 7b13a3b0f6a5617e0e352f87cc5a20afea226aa8. - - Change-Id: Ia82fdb2d08287bc2cd2841e1e941ae68cbc2e009 - Reviewed-on: https://code.wireshark.org/review/749 - Reviewed-by: Anders Broman - -commit 7b13a3b -Author: Christopher Kilgour -Date: Sun Feb 23 17:30:57 2014 -0800 - - Allow pcapng interface options to be available to dissectors. - - Interface options[1], and more generally pcapng options[2], are useful - information that can provide improved dissector output. - - Prior to this change, only certain pcapng interface options were interpreted - and made available to dissectors, e.g. the interface name or description. - This change augments the situation by providing epan_get_interface_option( ), - which returns an array of byte arrays if the option code exists - (otherwise NULL). Each element of the array is a byte buffer containing - the raw data of the option. An array-of-buffers is used because pcapng - allows for multiple instances of the same option to be present in the file. - All interface options found in a pcapng file are thus made available to the - dissector. - - The implementation also provides infrastructure to collect options from - other pcapng blocks such as the section header. Currently these options - are discarded, but could be retained in the future to support more features. - - [1] http://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html#sectionidb - [2] http://www.winpcap.org/ntar/draft/PCAP-DumpFileFormat.html#sectionopt - - Change-Id: I944b6f0f03dde9b8e7d1348b76acde6f9d312f37 - Reviewed-on: https://code.wireshark.org/review/331 - Reviewed-by: Anders Broman - -commit f65513291 -Author: Martin Kaiser -Date: Wed Mar 19 22:51:39 2014 +0100 - - the entries for file types with magic numbers are - 0...heuristic_open_routine_idx-1 - - at the moment, we loop over all entries of the open_info_arr - - Change-Id: Iabca32521a066d994b1c840b7514faa983375f0c - Reviewed-on: https://code.wireshark.org/review/748 - Reviewed-by: Martin Kaiser - -commit 4a51f62 -Author: Martin Kaiser -Date: Wed Mar 19 22:38:31 2014 +0100 - - use the correct end index when we loop over the open_info_arr - - until recently, we always had a 0,0,0,... entry at the end of the array - that's gone now - which makes sense for people who register wiretap - plugins... - - Change-Id: Id47dc4917481ffa8560e17b8740c2f9716bb8df1 - Reviewed-on: https://code.wireshark.org/review/747 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Martin Kaiser - -commit c14cc2f -Author: Alexis La Goutte -Date: Wed Mar 19 20:53:04 2014 +0100 - - Make checkAPIs happy - strncpy -> g_strlcpy - - Change-Id: Ib17b6799a762e2e2e65bf7c6dd5a894bfb127c86 - Reviewed-on: https://code.wireshark.org/review/746 - Reviewed-by: Alexis La Goutte - -commit 0f51f78 -Author: Alexis La Goutte -Date: Wed Mar 19 19:40:53 2014 +0100 - - The 1.11.x installer puts the global plugins in the wrong place [Mac OS X] - - Issue found by rols - - Fix comment and use the correct plugin_dir path (missing wireshark folder) - - Change-Id: I298bc5e9872d8c20c5baeaaf056262b9668f15bf - Closed-bug: 9854 - Reviewed-on: https://code.wireshark.org/review/745 - Reviewed-by: Alexis La Goutte - -commit 5b7ad82 -Author: Alexis La Goutte -Date: Wed Mar 19 19:32:28 2014 +0100 - - Try to fix Buildbot (Mac OS X and Windows) about conversion - - logcat.c: In function 'detect_version': - logcat.c:142: warning: implicit conversion shortens 64-bit value into a 32-bit value - logcat.c:143: warning: implicit conversion shortens 64-bit value into a 32-bit value - logcat.c:150: warning: implicit conversion shortens 64-bit value into a 32-bit value - logcat.c:151: warning: implicit conversion shortens 64-bit value into a 32-bit value - logcat.c: In function 'logcat_dump_text': - logcat.c:427: warning: implicit conversion shortens 64-bit value into a 32-bit value - logcat.c:451: warning: implicit conversion shortens 64-bit value into a 32-bit value - - Change-Id: I4361567e599b7d04f422fccd7f8b1bccc897f114 - Reviewed-on: https://code.wireshark.org/review/744 - Reviewed-by: Alexis La Goutte - -commit 16e7096 -Author: Evan Huus -Date: Wed Mar 19 13:04:37 2014 -0400 - - Remove duplicate call to fix-encoding-args - - Change-Id: I7067a8856ff1c431d5e5ec7ec2a51228a8613631 - Reviewed-on: https://code.wireshark.org/review/743 - Tested-by: Alexis La Goutte - Reviewed-by: Alexis La Goutte - -commit 2aebb94 -Author: Jan Kaisrlik -Date: Sat Mar 15 19:58:40 2014 +0000 - - fix of bug 9836. Avg. packet size in Statistics -> Summary is rounded to nearest. GTK QT - - Change-Id: I34e84e6cf4587fee999764435fa1a407c8aa04bb - Reviewed-on: https://code.wireshark.org/review/687 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Evan Huus - -commit 7e423a3 -Author: Hadriel Kaplan -Date: Wed Mar 19 12:57:13 2014 -0400 - - Add read_format extension to manual pages - - The -X read_format extension was added in code but in the manuals. - - Change-Id: I21692120229ef531671fc3db247809ace69d23b3 - Reviewed-on: https://code.wireshark.org/review/742 - Reviewed-by: Alexis La Goutte - -commit c8a98f3 -Author: Hadriel Kaplan -Date: Wed Mar 19 12:14:09 2014 -0400 - - Fix lua file testsuite not working and weak heuristic readers not being registered - - The testsuite for Lua file reader/writer uses the acme_file.lua script to - generate a pcapng file from an Acme sipmsg.log file. It then compares the - tshark verbose output of this new pcapng file to a sip.pcapng file in - the test/captures directory that was previously made. Unfortunately, the - acme_file.lua script generates a timestamp based on local system timezone, - rather than UTC, so the testsuite fails if not run in the EST timezone where - the sip.pcapng file was originally made. This has now been fixed. - - Also, trying to register new weak heuristic readers fails because the GArray - is terminated with a NULL-based row without Glib knowing about that. So this - commit changes it to let Glib handle the NULL-terminated row, so that appending - takes it into account automatically. - - Change-Id: I037ce1cfbda03585b3a1e159df78ff8ebb41fc32 - Reviewed-on: https://code.wireshark.org/review/741 - Reviewed-by: Alexis La Goutte - -commit a68e3a4 -Author: Michal Labedzki -Date: Sun Feb 9 18:37:44 2014 +0100 - - Wiretap: Add support for Android Logcat - - Now Androit Logcat (Logger) binary logs are supported. - Try "adb logcat -Bf /sdcard/log.logcat; adb pull /sdcard/log.logcat". - Also there is possibility to save logs to text format like by "adb". - - Change-Id: If7bfc53d3fbd549a0978d1dbf96f3fff671fd601 - Reviewed-on: https://code.wireshark.org/review/235 - Reviewed-by: Anders Broman - -commit 27ad4c0 -Author: ruengeler -Date: Wed Mar 19 17:06:40 2014 +0100 - - Add a new case to find existing assocs when only the information of an INIT chunk is provided. - - Change-Id: I88c5367652fb59a3da2cfd8895a1c0cc5176b859 - Reviewed-on: https://code.wireshark.org/review/740 - Reviewed-by: Michael Tüxen - Tested-by: Michael Tüxen - -commit 9f01daa -Author: Alexis La Goutte -Date: Wed Mar 19 14:00:46 2014 +0100 - - Add check of whitespace error after Wireshark check (checkhf, checAPIs...) - - (Because check whitespace quit after check... and no longer launch other check...) - - Change-Id: I97ee0191c3d985934e74d23576f88984ec0e9b46 - Reviewed-on: https://code.wireshark.org/review/739 - Reviewed-by: Alexis La Goutte - -commit 830ad37 -Author: Alexis La Goutte -Date: Wed Mar 19 13:59:56 2014 +0100 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I303184523c22d17c3f642852bcd97a9533bf5521 - Reviewed-on: https://code.wireshark.org/review/738 - Reviewed-by: Alexis La Goutte - -commit d35ccc5 -Author: Alexis La Goutte -Date: Wed Mar 19 13:49:42 2014 +0100 - - Try to fix Mac OS X Buildbot - - packet-ieee80211.c:8583: warning: integer constant is too large for 'long' type - packet-ieee80211.c:8584: warning: integer constant is too large for 'long' type - packet-ieee80211.c:8585: warning: integer constant is too large for 'long' type - - Change-Id: I5badc6e0d2595d4353e33cd273d55f28737b34a8 - Reviewed-on: https://code.wireshark.org/review/737 - Reviewed-by: Alexis La Goutte - -commit 8c3dee9 -Author: Alexis La Goutte -Date: Wed Mar 19 13:44:50 2014 +0100 - - Fix warning/error found by CheckAPI - - (and fix also fix-encodings-args) - - Change-Id: Ic2e99ca02398b7525b1cf68ab0d8279a2909940e - Reviewed-on: https://code.wireshark.org/review/736 - Reviewed-by: Alexis La Goutte - -commit f7461a8 -Author: Peter Wu -Date: Wed Mar 19 12:33:54 2014 +0100 - - USB: decode HID desc for unknown iface class - - If the interface class is not yet known (for example, in the enumeration - phase; or if the interface descriptor was missed), then a HID descriptor - would not get dissected. Instead of printing an unhelpful "unknown - descriptor" message, always try to find a HID descriptor. - - Change-Id: Ic162d6b93b0428a1edd3a925229093dfcc52c42d - Reviewed-on: https://code.wireshark.org/review/735 - Reviewed-by: Alexis La Goutte - -commit 35c8934 -Author: Peter Wu -Date: Wed Mar 19 12:30:45 2014 +0100 - - USB: show data fragment for control messages - - This makes the usb.data_fragment field more useful in tshark, i.e., - showing the bytes for the data stage. Previously, the GUI would just - show the "Data Fragment" text label which is not really useful on its - own. - - Change-Id: Id0ca39a9a144a37aa6d0b4ae65c1d655deb76748 - Reviewed-on: https://code.wireshark.org/review/734 - Reviewed-by: Alexis La Goutte - -commit 7bbb3ac -Author: Alexis La Goutte -Date: Wed Mar 19 12:49:27 2014 +0100 - - Try to make Mac OS X buildbot Happy - - packet-ieee80211.c:8581: warning: implicit conversion shortens 64-bit value into a 32-bit value - packet-ieee80211.c:8582: warning: integer constant is too large for 'long' type - packet-ieee80211.c:8583: warning: integer constant is too large for 'long' type - packet-ieee80211.c:8583: warning: implicit conversion shortens 64-bit value into a 32-bit value - packet-ieee80211.c:8584: warning: integer constant is too large for 'long' type - packet-ieee80211.c:8584: warning: implicit conversion shortens 64-bit value into a 32-bit value - - Change-Id: I8f8c5518239c7d6e55006abfca8d9452f9a09c6a - Reviewed-on: https://code.wireshark.org/review/733 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 3d6c13e -Author: Alexis La Goutte -Date: Wed Mar 19 12:22:23 2014 +0100 - - Fix build - - wslua_file.c:92:13: error: request for implicit conversion from 'WFILE_T' to 'FILE_T' not permitted in C++ [-Werror=c++-compat] - - Change-Id: Iff9cc716333802a3902429a8c68e5f4cdac2ee9e - Reviewed-on: https://code.wireshark.org/review/732 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit eb2fb39 -Author: Alexis La Goutte -Date: Tue Mar 11 08:25:34 2014 +0100 - - The 1.11.x installer puts the global plugins in the wrong place [Mac OS X] - - Issue found by rols - - The installer puts the normal included plugins (e.g. mate, wimax) in - /Applications/Wireshark.app/Contents/Frameworks/wireshark/plugins, - however the global plugins directory is set to - /Applications/Wireshark.app/Contents/Resources/lib/wireshark/plugins - (as it was in previous versions) so no plugins load at startup. - In order to make them load you have to create this directory and - copy the plugins there, or put them in your personal directory. - - From remark of Gerald, use recommandation of Bundle Programming Guide (use Contents/PlugIns for plugin) - - https://developer.apple.com/library/mac/documentation/corefoundation/conceptual/cfbundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW19 - - Change-Id: Ib1ae7da48a8fa94f7037912cd44c05532a238b71 - Closed-bug: 9854 - Reviewed-on: https://code.wireshark.org/review/602 - Reviewed-by: Gerald Combs - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 4b8b834 -Author: Moraney Jalil -Date: Thu Mar 13 13:54:27 2014 +0200 - - Support for IEEE 802.11ad - - (according to the 9th draft of the standard) - - Closed-bug: 8594 - - Change-Id: I742726027bcab7d25ca4a9ce3a406518db6d272f - Reviewed-on: https://code.wireshark.org/review/632 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit bbd1880 -Author: AndersBroman -Date: Wed Mar 19 07:23:29 2014 +0100 - - Fix Error: the name for hf_lg8979_start_ptnum8 ("lg8979.start_ptnum8") has - trailing space in packet-lg8979.c - - Change-Id: I80e5c93846c66aad1d1bc6f91b20501e0f384a6c - Reviewed-on: https://code.wireshark.org/review/729 - Reviewed-by: Anders Broman - -commit 488f2a0 -Author: Pascal Quantin -Date: Tue Mar 18 23:01:22 2014 +0100 - - Exported PDU: add support for data length on the wire - - Change-Id: Iff14ec4d0297ec85f3597b33871fb0ab5256a597 - Reviewed-on: https://code.wireshark.org/review/728 - Reviewed-by: Anders Broman - -commit 30ba425 -Author: Hadriel Kaplan -Date: Sun Mar 16 17:20:07 2014 -0400 - - Fix Bug 9885: 'Buildbot crash output: fuzz-2014-03-14-15333.pcap' - - The Buildbot found a crash which is cause by a bug that has - been there all along, but a recent change exposed. This bug is - likely in 1.10.6 as well, so I'll backport this if I can - reproduce it in 1.10.6. - - Change-Id: I505bc73cbe6281e6d64f00de441c8e6231b55000 - Reviewed-on: https://code.wireshark.org/review/702 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Evan Huus - Reviewed-by: Martin Kaiser - Reviewed-by: Michael Mann - -commit fff998d -Author: cbontje -Date: Tue Mar 11 15:46:27 2014 -0600 - - New Dissector for Landis & Gyr (Telegyr) 8979 - - Commit includes dissector code for lg8979 as well as additions to RTAC Serial code to call dissector when required. - - See bug report 9874 for further details and sample pcap files - - UPDATE1: L&G 8979 commit for addressing comments from Anders and Alexis and added Cmakelists.txt - UPDATE2: address further comments from Alexis re. proto_item_set_text / proto_item_add_text entries. Also add modelines - UPDATE3: fix compilation error noted by Alexis - UPDATE4: address proto_tree_add_* comments from Michael - - Change-Id: I6e69d2b7b7e91e6efa12e4a5fb7dbd140c0540ed - Reviewed-on: https://code.wireshark.org/review/610 - Reviewed-by: Michael Mann - -commit 04d9501 -Author: Michael Mann -Date: Tue Mar 18 13:21:51 2014 -0400 - - Add capture file reader/writer support for Lua so scripts can implement new capture file formats. - - This enables a Lua script to implement a brand new capture file format reader/writer, so that for example one could write a script to read from vendor-specific "logs" of packets, and show them as normal packets in wireshark. - - Change-Id: Id394edfffa94529f39789844c382b7ab6cc2d814 - Reviewed-on: https://code.wireshark.org/review/431 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Michael Mann - Reviewed-by: Anders Broman - -commit d832cb1 -Author: Pascal Quantin -Date: Tue Mar 18 18:24:56 2014 +0100 - - Fix OS-X compilation broken by gc354675 - - Change-Id: Ie32a2c256055059d1eade29af69eaad9011ca78b - Reviewed-on: https://code.wireshark.org/review/727 - Reviewed-by: Pascal Quantin - -commit c354675 -Author: AndersBroman -Date: Tue Mar 18 13:59:14 2014 +0100 - - Dechunk/export sctp payloads trough export PDU. - - Change-Id: I86d21cadcbd3e85b7a91d509ffd3c317d76a2ce2 - Reviewed-on: https://code.wireshark.org/review/726 - Reviewed-by: Anders Broman - -commit d416783 -Author: Pascal Quantin -Date: Mon Mar 17 17:14:39 2014 +0100 - - ULP: upgrade dissector to approved version 2.0.1 - - Change-Id: I9d7b16c450cb99aa1d66b0a180241c36f8869637 - Reviewed-on: https://code.wireshark.org/review/716 - Reviewed-by: Evan Huus - -commit 1db0fc5 -Author: Alexis La Goutte -Date: Mon Mar 17 18:04:47 2014 +0100 - - Enhance pre-commit tools to avoid false positive - - Limit check to file with extension *.c or *.h - - Patch revert by mistake in 49394d3101ec286b335213a9845b6d4202955021 - - Change-Id: Ifed4c833c740218e5e24b3176dc20802fa5849bb - Reviewed-on: https://code.wireshark.org/review/719 - Reviewed-by: Evan Huus - -commit b749291 -Author: Bill Meier -Date: Mon Mar 17 12:55:30 2014 -0400 - - Revert "Try to make the heuristic a bit more efficient." - (based upon an OK from Anders). - - (The commit caused 'reload_framing_info' to be referenced before being set). - - This reverts commit b3ce4ecc1460fc0171d65e69549e155b447d851a. - svn path=/trunk/; revision=52004 - - Change-Id: If715e1cad041fd832f460411cc652d9b5764d069 - Reviewed-on: https://code.wireshark.org/review/718 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 386ebf5 -Author: Bill Meier -Date: Mon Mar 17 11:58:22 2014 -0400 - - Heuristics length check must use captured_length; Do other misc changes: - - - Use tvb_reported_length() iso tvb_length() in various places; - - Add some 'if(tree) {...}'; - - Remove an unneeded length-check; - - Use a consistent formatting style for hf[]array entries; - - Do some minor whitespace changes; - - Add editor modelines. - - Change-Id: Iac0a74142c5a5944e69fc911e54b0fbdfd1f5bab - Reviewed-on: https://code.wireshark.org/review/717 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit d426802 -Author: AndersBroman -Date: Mon Mar 17 17:07:02 2014 +0100 - - Try to fix warning: cast discards__attribute__((const)) qualifier - from pointer target type [-Wcast-qual] - - Change-Id: Idb1d8c9ac6fee135d3c3c7438d46ad6fb396954f - Reviewed-on: https://code.wireshark.org/review/715 - Reviewed-by: Anders Broman - -commit ce527ba -Author: AndersBroman -Date: Mon Mar 17 16:54:08 2014 +0100 - - Try to fix trivial varnings - - Change-Id: I7b09999fe34ffded73f0b26c3e561b39d2120643 - Reviewed-on: https://code.wireshark.org/review/714 - Reviewed-by: Anders Broman - -commit aea1edf -Author: AndersBroman -Date: Mon Mar 17 16:24:59 2014 +0100 - - Mark tree as unused. - - Change-Id: I57c201c0077144aace68bb51a6b0c7350dd8d5a8 - Reviewed-on: https://code.wireshark.org/review/713 - Reviewed-by: Anders Broman - -commit e839a4a -Author: AndersBroman -Date: Mon Mar 17 13:52:41 2014 +0100 - - Inhance summary output for some 3GPP AVPs - - Change-Id: I3657cef87070b91ae17a438140f1fb77edae8622 - Reviewed-on: https://code.wireshark.org/review/709 - Reviewed-by: Alexis La Goutte - Reviewed-by: Pascal Quantin - Reviewed-by: Anders Broman - -commit d43f7d1 -Author: Alexis La Goutte -Date: Sat Mar 15 11:35:21 2014 +0100 - - Remove -Wunreachable-code it is removed from GCC - - http://gcc.gnu.org/ml/gcc-help/2011-05/msg00360.html - - Change-Id: I3f016611d0dc5e7cc6d53965f9b5d2b1ee88fe1c - Reviewed-on: https://code.wireshark.org/review/677 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Evan Huus - -commit 66d0b18 -Author: Alexis La Goutte -Date: Mon Mar 17 12:02:29 2014 +0100 - - Fix some typo on 802.11 dissector - (Found by Jalil Moraney in change to add 802.11ad support review 632) - - Change-Id: I547bf647ae7400633ad27c7849088fd088928075 - Reviewed-on: https://code.wireshark.org/review/708 - Reviewed-by: Anders Broman - -commit 3b69de7 -Author: Marko Hrastovec -Date: Mon Mar 17 10:44:14 2014 +0100 - - Asterix CAT062 fix. Units for cartesian velocity of track were displayed with wrong units. - - Change-Id: I716dfeb16b049544e691dcdf75c488758d9e1fa0 - Reviewed-on: https://code.wireshark.org/review/707 - Reviewed-by: Alexis La Goutte - -commit 2507ce4 -Author: Alexis La Goutte -Date: Mon Mar 17 10:39:42 2014 +0100 - - Revert de6bfa12b0c002e1930cfb9946078097d294acf8 (break Linux and Mac OS X buildbot...) - - Change-Id: If5a6a77909b2d178052605cf2fc6fc0ef758553c - Reviewed-on: https://code.wireshark.org/review/706 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit de6bfa1 -Author: Alexis La Goutte -Date: Sat Mar 15 18:01:20 2014 +0100 - - Fix build on my old Windows XP Buildbot (With VS2008EE) - - ../../asn1/atn-ulcs/packet-atn-ulcs-template.c(126) : fatal error C1083: Cannot - open include file: 'stdint.h': No such file or directory - - Change-Id: I8825a2f0b6440ec5a4bbfb49ea5c183dd8cbf03f - Reviewed-on: https://code.wireshark.org/review/705 - Reviewed-by: Anders Broman - -commit 46970c4 -Author: Joerg Mayer -Date: Mon Mar 17 00:07:10 2014 +0100 - - Print a message in case we don't have an X11 SDK installed about where - to find xquartz. - - Change-Id: I76548fba0b01f8274d12bbb55f4f16622d9a7eff - Reviewed-on: https://code.wireshark.org/review/704 - Reviewed-by: Jörg Mayer - -commit 17fc3b4 -Author: Joerg Mayer -Date: Mon Mar 17 00:05:43 2014 +0100 - - CMake updates: - - build by default - - update to 2.8.12.2 which actually builds on Mavericks - - Change-Id: I60b539613e13d2cdccbd083b28f641ff1ce363c4 - Reviewed-on: https://code.wireshark.org/review/703 - Reviewed-by: Jörg Mayer - -commit 072b990 -Author: Guy Harris -Date: Sun Mar 16 13:39:07 2014 -0700 - - Add a #define for the stats block header length, and use it. - - And rename to #define for the stats block trailer length to indicate - that it's the length of the trailer, not the length of the stats block - in its entirety. - - Change-Id: Iec82c971b32f2d3f4a604fe75a91633e1813ebd5 - Reviewed-on: https://code.wireshark.org/review/701 - Reviewed-by: Guy Harris - -commit fcf1c44 -Author: AndersBroman -Date: Sun Mar 16 18:57:18 2014 +0100 - - Make the avp_str available to sub dissectors and Let the subdissector have - precedence filling in the avp_item string. Use that in a couple of places. - - Change-Id: I1af7a1ca4c14fb56ddeaab336202e6c2a18e556b - Reviewed-on: https://code.wireshark.org/review/699 - Reviewed-by: Michael Mann - Reviewed-by: Anders Broman - -commit 5f508e8 -Author: Joerg Mayer -Date: Sun Mar 16 19:59:17 2014 +0100 - - Small updates to the setup process documentation - - Change-Id: Ie6dc3a8254e30495945155f058f1ef10a75c4745 - Reviewed-on: https://code.wireshark.org/review/700 - Reviewed-by: Jörg Mayer - -commit d8265cd -Author: Michael Mann -Date: Sat Mar 15 20:32:47 2014 -0400 - - Remove Visual Studio solution and project files (and their existence from Makefiles) - - There have been discussions on -dev about removing this and I believe I was the last holdout. Finally convinced that I should just have a local copy (ignored by git) - - Change-Id: Ic72a22baf58e3412023cf851f0fce16eb07113b0 - Reviewed-on: https://code.wireshark.org/review/681 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 51f26ab -Author: Ronnie Sahlberg -Date: Sat Mar 15 08:12:34 2014 -0700 - - NFS: We need to pass data through to the dissect_rpc_list() callback - - Change-Id: Iace7c6dfb81f0a98bbae304346906a5e82c82812 - Signed-off-by: Ronnie Sahlberg - Reviewed-on: https://code.wireshark.org/review/679 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 5569f66 -Author: Gerald Combs -Date: Sun Mar 16 08:06:26 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-03-16] - - Change-Id: I714e82b9ea319c2937460978f6feb119917f56f9 - Reviewed-on: https://code.wireshark.org/review/696 - Reviewed-by: Evan Huus - -commit fa72887 -Author: Joerg Mayer -Date: Sun Mar 16 12:39:30 2014 +0100 - - Fix GTK3 detection (or more specific: the include paths) on Windows - - Change-Id: Ia0aef096849d1935ca4a6d1d31aabd099087cf29 - Reviewed-on: https://code.wireshark.org/review/694 - Reviewed-by: Jörg Mayer - -commit b0b6064 -Author: Joerg Mayer -Date: Sun Mar 16 09:39:50 2014 +0100 - - Fix - [ 5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-umts_fp.c.o - /home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c: In function ‘umts_fp_init_protocol’: - /home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4526:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat] - umts_fp_conversation_info->iface_type = uat_umts_fp_ep_and_ch_records[i].interface_type; - ^ - /home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4527:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat] - umts_fp_conversation_info->division = uat_umts_fp_ep_and_ch_records[i].division; - ^ - /home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4533:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat] - umts_fp_conversation_info->rlc_mode = uat_umts_fp_ep_and_ch_records[i].rlc_mode; - ^ - cc1: all warnings being treated as errors - - Change-Id: Ie783a261c40d26ffd105822d5f45bd0513aa1914 - Reviewed-on: https://code.wireshark.org/review/693 - Reviewed-by: Jörg Mayer - -commit 9d8cfcc -Author: Guy Harris -Date: Sun Mar 16 01:16:13 2014 -0700 - - And another warning fix. - - Change-Id: Ibbf3366d0075f7b367383a2950c9f0bc54ae194c - Reviewed-on: https://code.wireshark.org/review/692 - Reviewed-by: Guy Harris - -commit f61f79f -Author: Guy Harris -Date: Sun Mar 16 01:02:22 2014 -0700 - - Squelch some warnings by narrowing or widening some variables. - - Change-Id: If3ad60532e8b7e74272683b254582d86653c777e - Reviewed-on: https://code.wireshark.org/review/691 - Reviewed-by: Guy Harris - -commit dc6a973 -Author: Guy Harris -Date: Sun Mar 16 00:31:15 2014 -0700 - - Get rid of unused #defines and no-longer-used structures. - - The #defines came from Radiotap, but this isn't Radiotap (I see no - presence bits here), and Radiotap has to handle stuff that this code - doesn't (such as, for example, Atheros Wi-Fi adapters that, annoyingly, - pad the space between the 802.11 header and the 802.11 payload when in - monitor mode, hence the "datapad" flag). - - Change-Id: I87ca3539e0f9254ab94cc8897bdf69e4574f0525 - Reviewed-on: https://code.wireshark.org/review/690 - Reviewed-by: Guy Harris - -commit 9f6f6bc -Author: Guy Harris -Date: Sun Mar 16 00:19:20 2014 -0700 - - Reorganize the code. - - Pull the packet data copying code into the routines that parse the rest - of the record data. Have those routines directly fill in the metadata - headers in the packet data, without bothering to fill in a structure - first. - - As a result, those routines no longer can set phdr->caplen to a value - different from phdr->len, so don't set WTAP_HAS_CAP_LEN. - - Have the existing sanity checking code cause the read to fail if the - checks fail, and add some additional sanity checking. - - Use #defines for some offsets into the statistics header and trailer. - - Change-Id: Ie936683b96888961d6e2598131cc0eb6146b37e9 - Reviewed-on: https://code.wireshark.org/review/689 - Reviewed-by: Guy Harris - -commit 4342323 -Author: Guy Harris -Date: Fri Mar 14 12:38:52 2014 -0700 - - Support to version 3.0 of netscaler packet wire format. - - From shekhar.chandra@citrix.com. See bug 9280. - - Change-Id: If3abbc653bb1f127b151976d4183af4c4f1e71eb - Reviewed-on: https://code.wireshark.org/review/658 - Reviewed-by: Michael Mann - -commit f199688 -Author: AndersBroman -Date: Thu Mar 13 21:41:16 2014 +0100 - - Add an UAT table to define endpoints and channel data to be able to - presetup conversations with FP dissection data. - - Change-Id: Ibced63bf944d7268751f8055095eb26477664be1 - Reviewed-on: https://code.wireshark.org/review/643 - Reviewed-by: Alexis La Goutte - Reviewed-by: ronnie sahlberg - Reviewed-by: Michael Mann - -commit 3ac19d3 -Author: Guy Harris -Date: Sat Mar 15 12:18:28 2014 -0700 - - Clean up the setting of the len and caplen fields. - - Always include the length of the metadata headers, as we're always - copying them. - - Do a straightforward check to make sure the data length is >= 4 before - subtracting out the FCS (which appears not to actually be an FCS; at - least in the captures I've seen, it looks like random junk). - - Improve the comments for that code. - - Get rid of some tabs, in favor of spaces, while we're at it, and make - the 3 sections of code where that's done more alike. - - Change-Id: Ica338cd492ac535833933a8b7cd5191217c5ab5b - Reviewed-on: https://code.wireshark.org/review/685 - Reviewed-by: Guy Harris - -commit 42c522c -Author: Bill Meier -Date: Sat Mar 15 13:57:05 2014 -0400 - - (Minor) prefs_register_protocol() callback not required; Therefore: simplify proto_reg_handoff...(). - - Change-Id: Ic09351d7b04d55814211618056e92430bc114f6f - Reviewed-on: https://code.wireshark.org/review/684 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 7b6b6e5 -Author: Bill Meier -Date: Sat Mar 15 13:51:33 2014 -0400 - - Add a length-check to heuristic to prevent any exception during test; add editor modelines. - - Change-Id: I8b4f565699c4d044cc3b64b22115a921b97b3d38 - Reviewed-on: https://code.wireshark.org/review/683 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 33b3bb9 -Author: Bill Meier -Date: Sat Mar 15 13:49:05 2014 -0400 - - (Trivial): add editor modelines. use consistent indentation & do whirespace re-formatting. - - Change-Id: Ic8378bf398bcabfe1f50f7f6ccbe10e2e84884d5 - Reviewed-on: https://code.wireshark.org/review/682 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit d6548f9 -Author: Pascal Quantin -Date: Sat Mar 15 14:31:14 2014 +0100 - - Remove unused const variables errors seen with recent Clang version - - Fixes bug 9886 - - Change-Id: I8624ef1c5874aea5521d21c998510fc29c838936 - Reviewed-on: https://code.wireshark.org/review/657 - Reviewed-by: Pascal Quantin - -commit 830684f -Author: Bill Meier -Date: Sat Mar 15 11:48:58 2014 -0400 - - #if 0 (with XXX comment) use of try_conversion(); Also: do misc cosmetic changes. - - Change-Id: Ib31439cfaaf5c08113b87f0bbb0b75932ca06bc9 - Reviewed-on: https://code.wireshark.org/review/680 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 5af1e3a -Author: Alexis La Goutte -Date: Sat Mar 15 11:01:03 2014 +0100 - - Fix -Wabsolute-value in TAP Compare stat (Found by Clang 3.5) - - tap-comparestat.c:321:55: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] - tap-comparestat.c:321:55: note: remove the call to 'abs' since unsigned values cannot be negative - tap-comparestat.c:347:56: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] - tap-comparestat.c:347:56: note: remove the call to 'abs' since unsigned values cannot be negative - - Change-Id: Ice950228d844373abcbd0cdc8ea05079b8b933d0 - Reviewed-on: https://code.wireshark.org/review/676 - Reviewed-by: Anders Broman - -commit 813bc10 -Author: Alexis La Goutte -Date: Sat Mar 15 10:55:01 2014 +0100 - - Fix -Wabsolute-value in GTK Compare stat (Found by Clang 3.5) - - compare_stat.c:235:34: error: taking the absolute value of unsigned type 'guint32' (aka 'unsigned int') has no effect [-Werror,-Wabsolute-value] - compare_stat.c:235:34: note: remove the call to 'abs' since unsigned values cannot be negative - compare_stat.c:406:55: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] - compare_stat.c:406:55: note: remove the call to 'abs' since unsigned values cannot be negative - compare_stat.c:432:56: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] - compare_stat.c:432:56: note: remove the call to 'abs' since unsigned values cannot be negative - - Change-Id: I03cc3136df3faf42c25986f52f015b8d87ce5774 - Reviewed-on: https://code.wireshark.org/review/675 - Reviewed-by: Anders Broman - -commit 35648de -Author: Alexis La Goutte -Date: Sat Mar 15 10:52:23 2014 +0100 - - Fix -Wabsolute-value in GTK SCTP Graph (Found by Clang 3.5) - - sctp_graph_dlg.c:1562:18: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] - sctp_graph_dlg.c:1562:18: note: remove the call to 'abs' since unsigned values cannot be negative - sctp_graph_dlg.c:1574:18: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] - sctp_graph_dlg.c:1574:18: note: remove the call to 'abs' since unsigned values cannot be negative - - Change-Id: If3cdce123256543a95fe0b596eee962e1d93d118 - Reviewed-on: https://code.wireshark.org/review/674 - Reviewed-by: Anders Broman - -commit 0d2dd00 -Author: Alexis La Goutte -Date: Sat Mar 15 10:49:47 2014 +0100 - - Fix -Wabsolute-value in ICMP dissector (found by Clang 3.5) - - packet-icmp.c:1245:7: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] - packet-icmp.c:1245:7: note: remove the call to 'abs' since unsigned values cannot be negative - packet-icmp.c:1245:30: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] - packet-icmp.c:1245:30: note: remove the call to 'abs' since unsigned values cannot be negative - packet-icmp.c:1254:6: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] - packet-icmp.c:1254:6: note: remove the call to 'abs' since unsigned values cannot be negative - packet-icmp.c:1254:29: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] - packet-icmp.c:1254:29: note: remove the call to 'abs' since unsigned values cannot be negative - packet-icmp.c:1623:7: error: taking the absolute value of unsigned type 'guint32' (aka 'unsigned int') has no effect [-Werror,-Wabsolute-value] - packet-icmp.c:1623:7: note: remove the call to 'abs' since unsigned values cannot be negative - packet-icmp.c:1629:7: error: taking the absolute value of unsigned type 'guint32' (aka 'unsigned int') has no effect [-Werror,-Wabsolute-value] - packet-icmp.c:1629:7: note: remove the call to 'abs' since unsigned values cannot be negative - - Change-Id: I6b344d01b8239fb93aedf95d954ef1243ba45a6b - Reviewed-on: https://code.wireshark.org/review/673 - Reviewed-by: Anders Broman - -commit 3094062 -Author: Guy Harris -Date: Sat Mar 15 03:02:40 2014 -0700 - - Use constants instead of vwr->STATS_LEN in some cases. - - In some cases, we know, based on the FPGA code, what vwr->STATS_LEN is, - so use that #define. - - While we're at it, replace some hardcoded numbers that represent the - statistics trailer length with the appropriate #define. - - Also, combine two identical case arms for Ethernet into one. - - Change-Id: I0bdea8e5aab146094ad21fa7e67dca2913da688b - Reviewed-on: https://code.wireshark.org/review/672 - Reviewed-by: Guy Harris - -commit 41c8cd6 -Author: Guy Harris -Date: Sat Mar 15 02:45:34 2014 -0700 - - Fix setting of STATS_LEN - it's what's in the file, not what we *generate*. - - vwr->STATS_LEN is the length of the statistics trailer at the end of the - packet, and it's the same for S2 and S3 versions of the WLAN card. It - should *not* be set to the length of the metadata headers that we - *generate and put in front of the packet data that we hand to our - callers*. - - Get rid of a debugging message while we're at it. - - Change-Id: I465b5ba4dedb88f1f401d34439b44b16a4bb01cc - Reviewed-on: https://code.wireshark.org/review/671 - Reviewed-by: Guy Harris - -commit 0d6cdb5 -Author: Guy Harris -Date: Sat Mar 15 02:24:03 2014 -0700 - - Clean up naming and get rid of unused and duplicate definitions. - - The so-called "radiotap headers" bear no resemblance to actual - radiotap.org radiotap headers; there are no presence bits, for example. - Get rid of the words "radiotap" and "radio tap", get rid of #defines - that aren't used, get rid of duplicate definitions. - - Change-Id: I0bb6abda5d13bf20810dc865a567f4ec51a38056 - Reviewed-on: https://code.wireshark.org/review/670 - Reviewed-by: Guy Harris - -commit 5d24091 -Author: Alexis La Goutte -Date: Fri Mar 14 17:39:52 2014 +0100 - - Fix indent (use 2 spaces) - - Change-Id: If7872c510d20e9f04e44e3fdf09c023e5ac602d9 - Reviewed-on: https://code.wireshark.org/review/648 - Reviewed-by: Pascal Quantin - -commit e63eb02 -Author: Pascal Quantin -Date: Sat Mar 15 09:57:52 2014 +0100 - - Fix compilation of packet-aruba-erm.c - - Change-Id: I30bef3eb92e1bdf67e4a3019ef3542e14ac9505c - Reviewed-on: https://code.wireshark.org/review/669 - Reviewed-by: Pascal Quantin - -commit a16b862 -Author: Alexis La Goutte -Date: Fri Mar 14 16:54:51 2014 +0100 - - Enhance dissector Aruba ERM - - Support type 0 (legacy), type 1 (peek), type 3 (pcap+radio) mode - via preference - - type 2 (airmagnet) is no yet supported - - Change-Id: I4f0d10e5d9b87bdcf5863d84e565201acaeee45b - Reviewed-on: https://code.wireshark.org/review/647 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Hadriel Kaplan - Reviewed-by: Anders Broman - -commit bac9b5b -Author: Hadriel Kaplan -Date: Fri Mar 14 21:05:25 2014 -0400 - - Fix lrexlib.c clang static analyzer warning - - This fixes a "Argument with 'nonnull' attribute passed null" warning - generated by the clang static analyzer. It's a false positive, but - easy to remedy. - - Change-Id: Id737d1ac29765ed26a416c5cd13bedafee478fb6 - Reviewed-on: https://code.wireshark.org/review/661 - Reviewed-by: Anders Broman - -commit f75f1d5 -Author: Hadriel Kaplan -Date: Fri Mar 14 21:12:10 2014 -0400 - - Fix README.heuristic wording to Bill Meier's correction - - Change-Id: Ifeb61abdcc7aa049529d584ff3fe50b6fd79fe21 - Reviewed-on: https://code.wireshark.org/review/662 - Reviewed-by: Anders Broman - -commit c7383fa -Author: Guy Harris -Date: Sat Mar 15 00:48:56 2014 -0700 - - Better document the offset of the MPDU in the packet data. - - In the S1 FPGA code, copy the "MPDU starts at 4 or 6" comment. - - Get rid of misleading comment in the S2/S3 FPGA code; we're using the - MPDU_OFF field from the private data structure, so we're not calculating - *anything* at that point. Put in comments indicating what's being done - at the point where those calculations are actually done. - - Change-Id: Ifda709a6b2aa7edad964f639086012c72c0a71fe - Reviewed-on: https://code.wireshark.org/review/668 - Reviewed-by: Guy Harris - -commit 288923d -Author: Guy Harris -Date: Fri Mar 14 20:18:24 2014 -0700 - - Add a #define for the record header length, and use it. - - Add a comment describing (some of) the record, while we're at it, and - update another comment to reflect reality. - - Change-Id: Ia7f1432402b843b96983375c0e0842c030de0cee - Reviewed-on: https://code.wireshark.org/review/667 - Reviewed-by: Guy Harris - -commit a0afd45 -Author: Guy Harris -Date: Fri Mar 14 19:49:54 2014 -0700 - - Some records have two statistics blocks; clarify that. - - Change-Id: I139cd73f6fff84528e105f9246a4207aa48a68df - Reviewed-on: https://code.wireshark.org/review/666 - Reviewed-by: Guy Harris - -commit 50b3da0 -Author: Guy Harris -Date: Fri Mar 14 19:47:22 2014 -0700 - - More use of vwr->STATS_LEN to clarify what code is doing. - - Change-Id: I9292f7b054f7b71727409deb062200a0301db5ee - Reviewed-on: https://code.wireshark.org/review/665 - Reviewed-by: Guy Harris - -commit 225635e -Author: Guy Harris -Date: Fri Mar 14 19:45:02 2014 -0700 - - Get rid of duplicate code. - - Change-Id: I39515c13f667a62445e3498cf90742dc271e390c - Reviewed-on: https://code.wireshark.org/review/664 - Reviewed-by: Guy Harris - -commit 3158a5b -Author: Guy Harris -Date: Fri Mar 14 18:36:36 2014 -0700 - - Use vwr->STATS_LEN instead of numbers, and eliminate redundant checks. - - Instead of throwing in 48 and 64 as numbers, use vwr->STATS_LEN to - indicate what the lengths are. Yeah, it has to be fetched at run time, - but big deal. - - That also shows that, as we've already rejected records whose size is - less than vwr->STATS_LEN, we don't have to check for that, so eliminate - those checks. - - Change-Id: Id4822b3e5a02abfffb2da96a50999e36548a4279 - Reviewed-on: https://code.wireshark.org/review/663 - Reviewed-by: Guy Harris - -commit ba7e5e3 -Author: Guy Harris -Date: Fri Mar 14 16:14:15 2014 -0700 - - len and caplen are derived independently, so set WTAP_HAS_CAP_LEN. - - Fix presumed typo while we're at it. - - Change-Id: Ic8ae6e6669e5c5fc618ec2516af98ba2390487ce - Reviewed-on: https://code.wireshark.org/review/660 - Reviewed-by: Guy Harris - -commit 55f6b2e -Author: Guy Harris -Date: Fri Mar 14 12:52:00 2014 -0700 - - Remove more now-unused stuff. - - Change-Id: I8f65ed38e0b5f8923b7c273c2fca4c2b57c5af9c - Reviewed-on: https://code.wireshark.org/review/659 - Reviewed-by: Guy Harris - -commit 6e33920 -Author: Guy Harris -Date: Fri Mar 14 12:23:03 2014 -0700 - - Get rid of a no-longer used preference. - - We no longer need a preference to determine the byte order of the T and - L in the TLVs, as libpcap and libwiretap both, when reading a file, - translate from the file's byte order to the reading host's byte order - and, in fact, currently don't use the variable in which the preference - is stored; eliminate the preference. - - Change-Id: Id06a6284960c1ac77028af07f3937eb4a7b0acaa - Reviewed-on: https://code.wireshark.org/review/656 - Reviewed-by: Guy Harris - -commit bf0b7f7 -Author: Alexis La Goutte -Date: Fri Mar 14 18:45:34 2014 +0100 - - Fix indent (use 4 spaces) and add Modelines - - Change-Id: I50c66638d48a6579b50204769bd27210d9d6c228 - Reviewed-on: https://code.wireshark.org/review/655 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit e0d76a5 -Author: Alexis La Goutte -Date: Fri Mar 14 18:26:09 2014 +0100 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I688509fff7d5b663f2ff54b42a80c52592613213 - Reviewed-on: https://code.wireshark.org/review/654 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit d3cc7e0 -Author: Alexis La Goutte -Date: Fri Mar 14 18:21:28 2014 +0100 - - Fix -Wunused-const-variable found by Clang 3.5 - - Change-Id: Idf5ac9e067a647d3e1be82df352d956c87d6050c - Reviewed-on: https://code.wireshark.org/review/653 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 348c19c -Author: Bill Meier -Date: Fri Mar 14 13:05:15 2014 -0400 - - Use try_val_to_str() in heuristics test (intead of a loop); ensure no exception during test. - - Change-Id: Ib55ccca4a025fb1cbef52ffa01888fef6d72156a - Reviewed-on: https://code.wireshark.org/review/651 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit f02b888 -Author: Bill Meier -Date: Fri Mar 14 12:21:40 2014 -0400 - - Fix two bugs & do various other changes. - - Bugs fixed: - - Catch exceptions during heuristics test so that the sequence of - dissector heuristics tests is not terminated abnormally; - (Prevents incorrect tshark "one-pass" dissection); - - Comment out registration of heuristic for TCP; TCP dissection - requires different code than for UDP. ("XXX: ToDo" added) - - Misc: - - Create/use two extended value_strings; - - "UL" is not needed as a modifier for several constants; - - Remove some unneeded initializers; - - Localize some variables; - - Remove unneeded '#include - - Do some whitespace changes. - - Change-Id: Ida11cb6b26911c0032155fde7491dd2a6f136c34 - Reviewed-on: https://code.wireshark.org/review/650 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 740ec32 -Author: Bill Meier -Date: Thu Mar 13 16:18:06 2014 -0400 - - Ensure there's no exception during the initial heuristics test. - - Change-Id: I7d7e8bf2d1d63b34659f6de506eb4b2693780cce - Reviewed-on: https://code.wireshark.org/review/649 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit eea31be -Author: Alexis La Goutte -Date: Fri Mar 14 16:53:22 2014 +0100 - - Add modelines information and peekremote register for futur use... - - Change-Id: I81f726cd20878770a37d9489f40d473960714425 - Reviewed-on: https://code.wireshark.org/review/646 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 4b2ec6b -Author: AndersBroman -Date: Fri Mar 14 13:55:34 2014 +0100 - - Display framed_ipv6_prefix as an IPv6 address even when it's not the full - 16 bits. - - Change-Id: I6cef08e2da9467cb54b5d08526c77c87e7afe1fa - Reviewed-on: https://code.wireshark.org/review/645 - Reviewed-by: Anders Broman - -commit 04c39bb -Author: Hadriel Kaplan -Date: Mon Mar 10 01:54:51 2014 -0400 - - Add Lua heuristic dissector support - - This adds the ability for Lua scripts to register heuristic dissectors - for any protocol that has registered a heuristic dissector list, such - as UDP, TCP, and ~50 others. The Lua function can also establish a - conversation tied to its Proto dissector, to avoid having to check the - heuristics for the same flow. The example dissector in the testsuite - has also been enhanced to include a heuristic dissector, to verify - the functionality and provide an example implementation. - - Change-Id: Ie232602779f43d3418fe8db09c61d5fc0b59597a - Reviewed-on: https://code.wireshark.org/review/576 - Reviewed-by: Anders Broman - -commit a59ac1b -Author: 0xbismarck <0xbismarck@gmail.com> -Date: Thu Mar 13 12:01:23 2014 -0400 - - Bug 9704: GSM_MAP SendRoutingInfoForSM incomplete - - Added the field information for Phase 1 for the Send Routing Info - For Sm message per request of ticket 9704. Code per the suggestion of - Anders Broman. Adding Phase 1 code to GSMMAP.asn. - - Did not have any data to verify that the change worked. - - Change-Id: Ic387e2e12e8893abb0f453f5010909ffbfd1808c - Reviewed-on: https://code.wireshark.org/review/147 - Reviewed-by: Pascal Quantin - -commit 2f794e9 -Author: Pascal Quantin -Date: Thu Mar 13 22:47:14 2014 +0100 - - MBIM: fix 3GPP SMS PDU record dissection - - Change-Id: I232a12eb7f7ee49464bb45c6f284ca3a3825909c - Reviewed-on: https://code.wireshark.org/review/644 - Reviewed-by: Pascal Quantin - -commit eff7a9b -Author: Patrick MacArthur -Date: Wed Mar 12 15:21:23 2014 -0400 - - Fix dissection of RDMA WRITE ONLY IMM packets. - - Change-Id: Icdc4aaa243191dc85e067a75a068c175fa09296b - Reviewed-on: https://code.wireshark.org/review/637 - Reviewed-by: Alexis La Goutte - -commit e204e9a -Author: Alexis La Goutte -Date: Thu Mar 13 12:52:41 2014 +0100 - - Enhance ZigBee Routing Table - Make field filterable and use value_string for status - - Based from capture available in bug 9855 - - Need to continue... lot of enhance is possible in ZigBee dissector... - - Change-Id: I0ac84e05a7b8b54e9879abbb7495034318188394 - Reviewed-on: https://code.wireshark.org/review/631 - Reviewed-by: Anders Broman - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit ba32257 -Author: Martin Kaiser -Date: Tue Mar 11 22:46:25 2014 +0100 - - add a test for SSL/TLS decryption using the master secret - - rename the existing SSL test to clarify that it uses the server's - private key for decryption - - Change-Id: I13598fc4cf724b144a8f27bfa7a3316acfc78728 - Reviewed-on: https://code.wireshark.org/review/640 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit c9956e3 -Author: AndersBroman -Date: Thu Mar 13 21:08:57 2014 +0100 - - Use dissector_try_uint_new() and include diam_sub_dis_inf when calling all - AVP sub dissectors. - - Change-Id: I6dcc362ea755794d3e18d8d27ed2128b46bd887b - Reviewed-on: https://code.wireshark.org/review/642 - Reviewed-by: Anders Broman - -commit f3f77bd -Author: Pascal Quantin -Date: Thu Mar 13 21:23:24 2014 +0100 - - Add tfshark.rc.in to Makefile.am - - Change-Id: I7d987534243a3e1575191f67d8b660c3c4c4731f - Reviewed-on: https://code.wireshark.org/review/641 - Reviewed-by: Pascal Quantin - -commit a9f349b -Author: Guy Harris -Date: Thu Mar 13 12:41:00 2014 -0700 - - Rename and relabel some fields, as per emburey's comment. - - Change-Id: I8e32672912bb202903182126613ce3394e0e1c35 - Reviewed-on: https://code.wireshark.org/review/639 - Reviewed-by: Guy Harris - -commit 641eb36 -Author: Gerald Combs -Date: Thu Mar 13 10:20:28 2014 -0700 - - Fix value_string checks in checkAPIs.pl. - - Some strings contain semicolons, which meant g36db2df was terminating - our REs too early. Try terminating them with '}' followed by ';'. - - Change-Id: I97f63351ef35c91e3123d9abd47576d47fea4b2b - Reviewed-on: https://code.wireshark.org/review/638 - Reviewed-by: Gerald Combs - -commit 53dab8e -Author: Bill Meier -Date: Tue Mar 11 10:28:41 2014 -0400 - - Note that a dissector heuristic test *must not* cause an exception before returning FALSE. - - Change-Id: I9f1ab000f7a2c554d1c20abf8ca4e4bab4b5ef27 - Reviewed-on: https://code.wireshark.org/review/635 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 36db2df -Author: Gerald Combs -Date: Wed Mar 12 17:11:27 2014 -0700 - - Add a check for newlines in value_strings. - - Update checkAPIs.pl to look for newlines in value_strings and - enum_val_t's. We now have to perform the check before we strip quoted - strings. Hopefully that won't cause a problem. Rename the check since - we do more than check for NULL termination. - - Add modelines. - - Fixes bug 9878. - - Change-Id: I39dd910db60c7028ea4bdb58e8cfdb239c094748 - Reviewed-on: https://code.wireshark.org/review/628 - Reviewed-by: Gerald Combs - -commit b1a05d5 -Author: Pascal Quantin -Date: Thu Mar 13 14:46:42 2014 +0100 - - ULP: add UDP transport - - and fix indent (use 2 spaces) - - Change-Id: I558616e3030a55a845cd4ba31ac32f08bdf8376d - Reviewed-on: https://code.wireshark.org/review/634 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 73618c8 -Author: Roland Knall -Date: Thu Mar 13 14:28:43 2014 +0100 - - Pre-Commit Hook check to check for newer version - - Insert a short check to always check for newer versions - in the tool directory of the pre-commit script - - So far, only a warning is being generated, allowing the - developer to decide for him/herself - - Change-Id: I6fce60e3de1d051757d0ed38eae8fdc94cec7662 - Reviewed-on: https://code.wireshark.org/review/633 - Reviewed-by: Alexis La Goutte - -commit b5fae94 -Author: Guy Harris -Date: Thu Mar 13 01:28:08 2014 -0700 - - Assorted cleanups of field names and descriptions. - - The PeekRemote headers are 802.11, so "Dot80211" is redundant. - - "Wep" really means "Protected" as there's also WPA/WPA2. - - "FlagsN" means "802.11n", not "802.11ac", and the "n" in "flagsn" - indicates that. Also, "Hz" stands for "Hertz", as in "Heinrich Hertz", - so the "H" is capitalized. - - Change-Id: If46cc4859ae8d65a199c9ad1fd48d2f2128ccd3d - Reviewed-on: https://code.wireshark.org/review/630 - Reviewed-by: Guy Harris - -commit 08bf1a4 -Author: Hadriel Kaplan -Date: Thu Mar 13 02:45:03 2014 -0400 - - Add support for Aruba ERM Radio-Format - - This adds support for a variant of the current Aruba ERM format, - a new format that provides rdio information. This addresses - enhancment bug 9880. - - Change-Id: Ia38ff09d9f814193bdc544466dbd005123771262 - Reviewed-on: https://code.wireshark.org/review/629 - Reviewed-by: Anders Broman - -commit 907d24d -Author: Guy Harris -Date: Wed Mar 12 16:11:00 2014 -0700 - - Get rid of $Id$, add some comments. - - Change-Id: I3f34484f18fba45b23b5acc924b56e5b62291114 - Reviewed-on: https://code.wireshark.org/review/627 - Reviewed-by: Guy Harris - -commit 13d635b -Author: Guy Harris -Date: Wed Mar 12 15:12:58 2014 -0700 - - Get rid of space-before-tab in indentation. - - Change-Id: If747e7b2af34e27ca8558293140a74691a0113b4 - Reviewed-on: https://code.wireshark.org/review/624 - Reviewed-by: Guy Harris - -commit c8b6b76 -Author: Guy Harris -Date: Wed Mar 12 15:10:29 2014 -0700 - - Thou shalt not put newlines in the strings in value_string tables. - - That just breaks too many things. - - This catches the examples of that found in bug 9878. There might be - others that my grepping didn't find. - - We should also have the checkAPIs.pl script check for this, so this - isn't a full fix for bug 9878. - - Change-Id: I3bf6f1fc0fe8654d0f54a995e72f1966ae012f5e - Reviewed-on: https://code.wireshark.org/review/623 - Reviewed-by: Guy Harris - -commit 0284e87 -Author: Guy Harris -Date: Wed Mar 12 14:44:01 2014 -0700 - - Consistently put -lm at the end of library lists. - - I'm not sure why it's associated with GLIB_LIBS in most entries - at - some point, was it the case that we didn't use libmath routines but GLib - did? - but there's no guarantee that other libraries don't use them, so - put them at the end of the lists. That also makes the lists a bit more - consistent. - - (Yes, I know, the wireshark_ldadd list is followed by some other - libraries in the library lists that use it, so -lm isn't *really* at the - end everywhere.) - - Change-Id: Ia2e0b295fdaae771fdee7d5eecdefaa83fae9992 - Reviewed-on: https://code.wireshark.org/review/622 - Reviewed-by: Guy Harris - -commit 5ae2815 -Author: Hadriel Kaplan -Date: Tue Mar 11 00:27:50 2014 -0400 - - Fix bug 9866: Qt 'Clearing filters does not seem to affect the packet list' - - Clicking the "X" clear filter button now applies the clearing to the - displayed packet list. This commit also adds tooltips for the display - filter display filter box's butons. - - Change-Id: I827020a7705a32a4a9204d22e94942853e25bba6 - Reviewed-on: https://code.wireshark.org/review/601 - Reviewed-by: Evan Huus - -commit bc3aa5d -Author: Alexis La Goutte -Date: Mon Mar 10 22:28:08 2014 +0100 - - Add dissection of flags, status, flagsN for Omnipeek/Peek Remote dissector. - - Information about value of flags from Emburey - - Change-Id: Iba79fba8e95cd2fc80f6fba5fa937d5485fbb381 - Closed-bugs: 9586 - Reviewed-on: https://code.wireshark.org/review/595 - Reviewed-by: Anders Broman - Reviewed-by: Evan Huus - -commit c4c8350 -Author: Hadriel Kaplan -Date: Thu Mar 6 17:20:48 2014 -0500 - - Fix bug 9021: 'RTP not decoded inside the conversation in v.1.10.1' - - The behavior for SIP/SDP handling of RTP conversation tracking - changed in v1.10, with some unintended consequences. The bugs did not - show up at the time because wireshark makes 2 passes of the packet list, - and so the problems auto-corrected themselves in most cases. Unfortunately, - a change in r53641 modified how UDP behaves, making it always create - conversations for UDP packets, and that exposed the bugs inherent in the - SIP/SDP code changes. - - This commit reverts the behavior of SIP/SDP to its pre-1.10 model, but - creates a new preference setting for "Delay SDP changes for tracking media", - which if enabled, will turn on the new (but buggy) model introduced in 1.10. - This preference is *disabled* by default, since for a majority of cases the - new behavior is worse than the previous behavior. - - The preference, and this commit's fix, is not intended to last long. I intend - to re-write the SIP/SDP/RTP interaction model for release 1.11 - I think it's - too big a change for 1.10, however, which is why I submitted this commit. - - Change-Id: Ic5601749d6c2344e952ced8206dd9296bfdc4b90 - Reviewed-on: https://code.wireshark.org/review/543 - Reviewed-by: Evan Huus - -commit 70ff7be -Author: Martin Mathieson -Date: Wed Mar 12 17:36:26 2014 +0100 - - MAC LTE: fix a typo in Buffer Size value_string - - Change-Id: Ie38726fb51a74bbcdc630550e61fa0e934ffdd1e - Reviewed-on: https://code.wireshark.org/review/618 - Reviewed-by: Pascal Quantin - -commit 69cc9e1 -Author: Hadriel Kaplan -Date: Wed Mar 12 12:14:51 2014 -0400 - - Fix whitespace tabs to spaces, indent by 4, modelines - - Change-Id: I8bb64a879d1aa779c9ac85db306cbd34d1188243 - Reviewed-on: https://code.wireshark.org/review/617 - Reviewed-by: Evan Huus - -commit e548219 -Author: Alexis La Goutte -Date: Wed Mar 12 15:43:05 2014 +0100 - - Fix indent (Remove space and use tabs) - - Change-Id: I9cc33a43e0f06dfad3f9fb53ad0df636f2ea7020 - Reviewed-on: https://code.wireshark.org/review/615 - Reviewed-by: Evan Huus - -commit db1fddb -Author: Hadriel Kaplan -Date: Tue Mar 11 11:52:48 2014 -0400 - - Fix Bug 9873: 'Qt: right-clicking on toolbars only shows checkmarks' - - Add the text descriptions for the two toolbars: "Main Toolbar" and - "Display Filter", so the right-click context menu shows what you're - removing/adding. And add a View->Toolbar sub-menu, with checkable - "Main Toolbar" and "Display Filter" entries, which enable you to - show/hide the toolbars via the menu. - - If someone has/prefers better names for these things, I'm all ears. - - Change-Id: I55b9fbaed2ef6dca3260fa9dfdddd7dad95d05c4 - Reviewed-on: https://code.wireshark.org/review/608 - Reviewed-by: Alexis La Goutte - -commit d89195d -Author: Pascal Quantin -Date: Wed Mar 12 15:16:10 2014 +0100 - - Fix a trivial typo - - Change-Id: Ibb2609b865ebaca14572c480d06ecc6ae7ef73f5 - Reviewed-on: https://code.wireshark.org/review/614 - Reviewed-by: Pascal Quantin - -commit 7e7bf82 -Author: Hadriel Kaplan -Date: Tue Mar 11 22:27:42 2014 -0400 - - Fix Bug 9872: 'SIP status line in 200 OK for de-registration is misleading' - - The status line of the 200 OK during a deregistration is (1 bindings), but it - should be (0 bindings). Wireshark should check the "expires=0" in the contact - header not just count the number of the contact lines. But since it's not - truly valid to have expires=o contacts in responses, this commit adds expert - info warning of such. - - Also, the REGISTER request itself already says "(remove all bindings)" - in the Info column currently if the Contact was a '*', but it didn't - say something similar if only de-registering one or more explicit - contacts. This has been fixed as well. - - Lastly, this fixes three other bugs I found while reading the code and testing: - (1) comma-separated Contact headers will be displayed as a single one if - the first one(s) don't have header params but a subsequent one does; and - (2) the last Contact header param is displayed with the trailing '\r\n' - header separator; and (3) the SIP REGISTER response code displayed contact - binding info for responses other than 2xx, which isn't logical. - - Since all of these are in the same area and not critical, I'm lumping these - all together. - - A test capture file used for testing is attached to the bug. - - As an aside, the SIP header parsing code needs to be refactored. Most SIP - headers follow a common ABNF pattern, and should be parsed using a common - function(s) so these issues don't crop up for specific headers. - - Change-Id: I16c531fcb244dc121fc0e8046908e475b41489f9 - Reviewed-on: https://code.wireshark.org/review/612 - Reviewed-by: Anders Broman - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 1ab950c -Author: Alexis La Goutte -Date: Wed Mar 12 11:07:10 2014 +0100 - - Enhance VXLAN dissector - - * Fix modelines (no CR after modelines) - * Add UDP Port (Attributed in draft 04 Port 4789) - * Update link to last draft (no specify change) - - Change-Id: I4cd89719ae00eb64ce4c234c39b9e18cdc1b8b93 - Reviewed-on: https://code.wireshark.org/review/613 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 2a92943 -Author: Alexis La Goutte -Date: Tue Jan 14 19:37:40 2014 +0100 - - Add Export PDU Dialog (Wireshark Qt) - - Rebase with last change and add Logcat export - - Change-Id: Idc9b444b1bf14b95ff60e8466e94f7eecd875b47 - Reviewed-on: https://code.wireshark.org/review/14 - Reviewed-by: Anders Broman - -commit 5af5f16 -Author: Martin Kaiser -Date: Tue Mar 11 17:40:56 2014 +0100 - - fix the SSL decryption using the master secret - this was broken in 21aa7168c7565445ee544ee78fb6c836a63cd4ed - - to be on the safe side, we assue that return value >= 0 means success, - < 0 means failure - - Change-Id: I1d03000e6b6d70fac6bef8766d28990d953c8e27 - Reviewed-on: https://code.wireshark.org/review/609 - Reviewed-by: Martin Kaiser - -commit 0f73f79 -Author: Balint Reczey -Date: Tue Mar 11 12:02:23 2014 +0100 - - GTK_STOCK_PRINT_ERROR was missing in GTK+ < 2.14, too - - Change-Id: I1be141c58252b8bb0db2ffff2edbb80f92c69cd6 - Reviewed-on: https://code.wireshark.org/review/606 - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - -commit 42971dc -Author: Balint Reczey -Date: Tue Mar 11 09:52:11 2014 +0100 - - Don't use some stock icons missing in old (< 2.16) versions in GTK+ - - Change-Id: I2716a8a25627de9c3945fbf5117edcb4859aa95f - Reviewed-on: https://code.wireshark.org/review/605 - Reviewed-by: Anders Broman - -commit c45a15f -Author: Lukas Emersberger -Date: Mon Mar 10 08:23:36 2014 +0100 - - EPL: Support SyncReq and SyncResp Frames - - - For PollResponse-Chaining SyncReq and SyncResp frames were introduced. - Those frame-types are not recognized by Wireshark yet. - - - Currently only the FeatureFlags 0-13 where interpreted by Wireshark. - Flags 14-15 and all extended flags where missing. - - 14 = SDO Read/Write All by Index - 15 = SDO Read/Write Multiple Parameter by Index - 16 = Multiple-ASend Support (TRUE = Device supports Multiple-ASend; FALSE = Device doesn’t support Multiple-ASend) - 17 = Ring Redundancy (TRUE = MN supports ring redundancy; FALSE = MN does not support ring redundancy) - 18 = PResChaining (TRUE = Device supports PResChaining; FALSE = Device does not support PResChaining) - 19 = Multiple PReq/PRes (TRUE = Device supports Multiple PReq/PRes; FALSE = Device does not support Multiple PReq/PRes) - 20 = Dynamic Node Allocation (TRUE = Device supports DNA; FALSE = Device does not support DNA) - - Signed-off-by: Lukas Emersberger - Change-Id: I9ac19f8b71b1be1094f410141c0f806996b1cb25 - Reviewed-on: https://code.wireshark.org/review/589 - Reviewed-by: Roland Knall - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 00be1d3 -Author: Balint Reczey -Date: Fri Feb 21 14:09:52 2014 +0100 - - Migrate GTK icon handling to GTK 3.10 API - - GtkStockItem usage is deprecated with all the GTK_STOCK_.* stock ids. - We keep a stock id based approach but without relying on GTK's - GtkStockItem system. - - We create our own internal stock ids for {icon, label} tuples and keep - the original GTK stock id #define-s and values to preserve backward - compatibility. - - Change-Id: Ia0b35a5903f079e92c8026e3df21bbf0be2d06b0 - Reviewed-on: https://code.wireshark.org/review/302 - Reviewed-by: Gerald Combs - Reviewed-by: Anders Broman - -commit 234ab5b -Author: Alexis La Goutte -Date: Mon Mar 10 22:36:47 2014 +0100 - - Replace (int)sizeof(guint*) by value - guint8 => 1 - guint16 => 2 - guint32 => 4 - guint64 => 8 - - Change-Id: I23ae863115522779d99cfadeb698ed43ca626667 - Reviewed-on: https://code.wireshark.org/review/597 - Reviewed-by: Anders Broman - -commit aabb002 -Author: Alexis La Goutte -Date: Sun Mar 9 11:40:56 2014 +0100 - - Add value string (type and data rate) from omnipeek - - Change-Id: I1ed387f1cb8d207c32c5202b578bd452cef4401c - Reviewed-on: https://code.wireshark.org/review/594 - Reviewed-by: Anders Broman - -commit 1cde337 -Author: Alexis La Goutte -Date: Mon Mar 10 22:30:18 2014 +0100 - - Fix incorrect file in epan/Makefile.am when build with ENABLE_STATIC - - Change-Id: I7f76e3e3d2d6f3edd2a658fccd5953393ef74ed7 - Closed-bug: 9871 - Reviewed-on: https://code.wireshark.org/review/596 - Reviewed-by: Anders Broman - -commit 9961ee3 -Author: Hadriel Kaplan -Date: Mon Mar 10 15:18:24 2014 -0400 - - Fix Bug 9870 'Lua: trying to call/get an invalid name results in a get-loop error' - - Due to the change I made previously for how methods are accessed, if you try - to access one that doesn't exist (for example mistype it or whatever), you get - an internal Lua error about a loop in table get, as opposed to the right error - message about the field not existing. - - That's because I had set the class' metatable __index metamethod to point to - the class table, which of course has the metatable with the __index - metamethod, causing a lookup loop. Blech. - - Change-Id: I20d3717feadd45f652c2640e1671846184e7082d - Reviewed-on: https://code.wireshark.org/review/593 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit f4de2a2 -Author: Yaniv Kaul -Date: Mon Mar 10 21:04:30 2014 +0200 - - packet-scsi.c minor changes - add WWN dissection and fix a typo - Change-Id: I0ef84e088988f1a40863ab54b722faace8bacc31 - Reviewed-on: https://code.wireshark.org/review/592 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit 8e50897 -Author: Gerald Combs -Date: Mon Mar 10 16:16:23 2014 -0700 - - Try to fix -Wparentheses-equality errors. - - Clang in XCode 5.0 currently fails with - - error: equality comparison with extraneous parentheses - [-Werror,-Wparentheses-equality] - - Change-Id: I7ca2e81959e777f923bdff1273aca6c56b100f6c - Reviewed-on: https://code.wireshark.org/review/600 - Reviewed-by: Gerald Combs - -commit adc0871 -Author: Martin Kaiser -Date: Mon Mar 10 23:01:39 2014 +0100 - - dissect the CertificateVerify handshake message - - Change-Id: I0f6887c86afeb5b4ae8b9910688863c7dc866a99 - Reviewed-on: https://code.wireshark.org/review/599 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 21aa716 -Author: Martin Kaiser -Date: Sun Mar 9 20:41:16 2014 +0100 - - SSL/TLS payload decryption: - don't make private key and keylog file mutually exclusive - - if we find a private key that does not match or is not usable for - getting the pre-master secret (e.g. because we're using an ephemeral - cipher suite), don't give up and exit with an error - - continue reading the keylog file and search for our master secret there - - Change-Id: I59fb460339e3e606a077b3a902fa1f9777b5e118 - Reviewed-on: https://code.wireshark.org/review/590 - Reviewed-by: Martin Kaiser - -commit 5de268a -Author: Evan Huus -Date: Mon Mar 10 08:25:31 2014 -0400 - - Replace "see copyright notice in" message with full license - - Should make the licensecheck buildbot happy. - - Also add "Public domain MIT/X11 (BSD like)" to the list of permitted licenses, - since it is a combination of two permitted licenses. - - Change-Id: Ibc4ead09af89e9225c4e0589a2b7d06dcee6a44e - Reviewed-on: https://code.wireshark.org/review/581 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Evan Huus - -commit 0e3956d -Author: Bill Meier -Date: Mon Mar 10 09:16:22 2014 -0400 - - Remove 1 duplicate #include and several unneeded #include's. - - Change-Id: Iab434edd114082586cc13f05b38e6a9d256a74c5 - Reviewed-on: https://code.wireshark.org/review/588 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 99b55eb -Author: Bill Meier -Date: Sun Mar 9 18:33:29 2014 -0400 - - Fix a typo in a comment; use consistent indentation matching that specified by the editor modelines. - - Change-Id: I6d4ad3675ec9099913c8a32ad1f2758316158f68 - Reviewed-on: https://code.wireshark.org/review/587 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 3003f1c -Author: Bill Meier -Date: Sun Mar 9 17:38:07 2014 -0400 - - Use tvb_length() instead of tvb_reported_length_remaining() for a heuristics length check. - - Change-Id: I197fe3d401ffb2d5894c823690a11f4a68fb7268 - Reviewed-on: https://code.wireshark.org/review/585 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit fced2dd -Author: Bill Meier -Date: Sun Mar 9 16:11:43 2014 -0400 - - Do various minor changes - - - Remove _U_from a function param; - document usage of the param; - add a DISSECTOR_ASSERT for the param; - - Remove a few unneeded variable initalizers; - - Use -1 iso tvb_length() in proto_tree_add_protocol_format(..); - - Add editor modelines. - - Change-Id: I7d7a8ea1176a26ea319d9fc0dab5d3a51050edd5 - Reviewed-on: https://code.wireshark.org/review/584 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 784808c -Author: Martin Mathieson -Date: Mon Mar 10 14:04:30 2014 +0100 - - PDCP LTE: various fixes related to security handling - - - fixes the wrap multiplier (for COUNT) for 12-bit sequence numbers - - fixes dissection of non-ciphered IP payloads - - adds a way for private protocols to set keys. The ueid->key lookup is now broken out into a separate function, and these settings are used in preference to the UAT ones - - Change-Id: I723307df3ee20425897b82beb9b431a0860075cf - Reviewed-on: https://code.wireshark.org/review/583 - Reviewed-by: Pascal Quantin - -commit b996e8a -Author: Evan Huus -Date: Mon Mar 10 08:27:31 2014 -0400 - - Add two more casts to satisfy OSX10.6 buildbot - - Change-Id: Ia9d289d241d6117fdeb89db122b1813eed537631 - Reviewed-on: https://code.wireshark.org/review/582 - Reviewed-by: Evan Huus - -commit c3b012a -Author: Anders Broman -Date: Mon Mar 10 11:49:48 2014 +0100 - - Fix Windows x64 build failure - - Change-Id: I7b71ead00b09e583e51fe45cf6b0bdfe75c3da98 - Reviewed-on: https://code.wireshark.org/review/580 - Reviewed-by: Pascal Quantin - -commit af36d77 -Author: Pascal Quantin -Date: Mon Mar 10 10:19:47 2014 +0100 - - MBIM: add sanity checks to bulk packets - - Change-Id: I425f4ecd03f5ae0ec27b77b1437366d66107342f - Reviewed-on: https://code.wireshark.org/review/579 - Reviewed-by: Pascal Quantin - -commit cfebfd7 -Author: Martin Kaiser -Date: Mon Mar 10 09:55:15 2014 +0100 - - remove $Id$ - add newline at the end of the file - - Change-Id: I9a10751977260bd24497734f3788b5e794a3dd8d - Reviewed-on: https://code.wireshark.org/review/578 - Reviewed-by: Martin Kaiser - -commit 3b47668 -Author: Martin Kaiser -Date: Mon Mar 10 09:32:50 2014 +0100 - - add explicit casts to fix compilation on Linux - - Change-Id: I3b87e156ab35e14e3c6e3800ee2058b1a6be57d6 - Reviewed-on: https://code.wireshark.org/review/577 - Reviewed-by: Martin Kaiser - -commit 09af140 -Author: Michael Mann -Date: Sun Mar 9 09:23:27 2014 -0400 - - Add PDC dissector - - Change-Id: I6eee13cda755b1f1d1a61288a6314fcebb681efb - Reviewed-on: https://code.wireshark.org/review/180 - Reviewed-by: Michael Mann - Reviewed-by: Anders Broman - -commit ea46cdc -Author: Hadriel Kaplan -Date: Sat Feb 22 00:44:00 2014 -0500 - - Add GLib's regex library into Lua - - While Lua's built-in pattern support is ok for simple things, many people end - up wanting a real regex engine. Since Wireshark already includes the GLib - Regex library (a wrapper for PCRE), it makes sense to expose that library to - Lua scripts. This has been done using Lrexlib, one of the most popular regex - bindings for Lua. Lrexlib didn't support binding GLib's Regex in particular - - it does for PCRE but GLib is a different API - so I've done that. A fairly - thorough testsuite came along with that, which has been incorporated into the - wireshark wslua testuites as well in this commit. - - Change-Id: I05811d1edf7af8d7c9f4f081de6850f31c0717c7 - Reviewed-on: https://code.wireshark.org/review/332 - Reviewed-by: Anders Broman - -commit 81c0091 -Author: Guy Harris -Date: Sun Mar 9 15:40:31 2014 -0700 - - Try to improve the "Kerberos requested but not OpenSSL" message. - - At least one person didn't realize that it meant that you have to - specify --with-ssl when configuring, so try saying that a bit more - explicitly. - - Change-Id: If15a9cfaeaf7d4aca2c570602fc09ff3ae489d35 - Reviewed-on: https://code.wireshark.org/review/575 - Reviewed-by: Guy Harris - -commit ac739ca -Author: Martin Kaiser -Date: Sun Mar 9 19:01:24 2014 +0100 - - add the CLIENT_RANDOM format to the tooltip - - Change-Id: I8fe6ceb148ec8145a1e71002d42bbdace58edbb6 - Reviewed-on: https://code.wireshark.org/review/574 - Reviewed-by: Martin Kaiser - -commit 80772d3 -Author: Evan Huus -Date: Sat Mar 8 14:34:44 2014 -0500 - - Remove a warning, add a comment guessing the intent - - Discovered investigating bug #9833, not the cause of that bug. - - Change-Id: I53ee5c792eba8429d2c203c03e2f359a433ca262 - Reviewed-on: https://code.wireshark.org/review/562 - Reviewed-by: Evan Huus - -commit c2b762f -Author: Gerald Combs -Date: Sun Mar 9 08:06:26 2014 -0700 - - [Automatic manuf, services and enterprise-numbers update for 2014-03-09] - - Change-Id: Iadbd9fb43228b9723195bfc6e7326d64e9a92412 - Reviewed-on: https://code.wireshark.org/review/569 - Reviewed-by: Evan Huus - -commit fa61734 -Author: Martin Kaiser -Date: Mon Feb 24 09:23:30 2014 +0100 - - add the CC protocol name to the info column - - Change-Id: Ic57c2a36c88a7528c4e37681bc5db4309174019d - Reviewed-on: https://code.wireshark.org/review/463 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 839b5b2 -Author: Michael Mann -Date: Sun Mar 9 11:02:30 2014 +0100 - - Update documentation about p_[add|get]_proto_data (new argument: scope) - - Change-Id: Ic27b0e601967c90567fac58447d28b10c02a3888 - Reviewed-on: https://code.wireshark.org/review/564 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit a6ed603 -Author: Anders Broman -Date: Sun Mar 9 11:06:17 2014 +0100 - - IE chosen channel on Lb interface decoded incorrectly - - IE "chosen channel" in message "perform location request" on Lb interface (BSC <-> SMLC) is decoded incorrectly. IE "chosen channel" on Lb interface is decoded as 2 octets data. - It should be 3 octet IE on Lb interface (IEI, length and data). - - Change-Id: Ic815a7b4ac08a035c5b292985c64d14e986fe8d7 - Closed-bug: 9531 - Reviewed-on: https://code.wireshark.org/review/565 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit 8a9bba8 -Author: Hadriel Kaplan -Date: Sat Mar 8 18:57:04 2014 -0500 - - Fix Bug 9853: 'Lua: trying to get/access a Preference before its registered causes a segfault' - - Accessing a pref before it's registered causes a segfault, because prefs_p->next - is not being checked for NULL in wslua_proto.c:Prefs__index(). - - Change-Id: I270978ddb9238a9e8d2c533a96fc01ee0df385c7 - Reviewed-on: https://code.wireshark.org/review/563 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit ff6cc9b -Author: Balint Reczey -Date: Tue Mar 4 14:59:39 2014 +0100 - - Add pkg-config file - - Change-Id: Ia55a2e560aef8d2f9a3cede18af4555507656047 - Reviewed-on: https://code.wireshark.org/review/500 - Reviewed-by: Evan Huus - Tested-by: Balint Reczey - Reviewed-by: Balint Reczey - -commit ed1528d -Author: Evan Huus -Date: Sat Mar 8 10:43:39 2014 -0500 - - Ensure that the input to strtoul ends with a null. - - Otherwise it runs past the end of the array into stack memory. Should fix the - intermittent DVB-CI decryption test suite failures. - - Change-Id: Ice17497e661c8579baf3a546efcb5529beda6b49 - Reviewed-on: https://code.wireshark.org/review/559 - Tested-by: Martin Kaiser - Reviewed-by: Martin Kaiser - -commit ddd9d27 -Author: Evan Huus -Date: Sat Mar 8 12:37:50 2014 -0500 - - Tight array index guard in packet-umts_fp.c - - Fixes bug #9828. - - Change-Id: I69b02a0d51921bae77850b599144f35a4fe9ee33 - Reviewed-on: https://code.wireshark.org/review/560 - Reviewed-by: Anders Broman - -commit 5f16578 -Author: Hauke Mehrtens -Date: Fri Dec 13 16:48:36 2013 +0100 - - ssl: add more ciphers for decryption - - This patch adds some more ciphers to the list of ciphers that can be - decrypted by wireshark. Most of them are PSK based ciphers. To do the a - actually decryption in most cases the TLS pre master secret or the - master secret is needed. - - In the changed lines just a comment with the name of the cipher was - added. - - This was generated with the help of Peter Wu's generate-wireshark-cs - script from https://git.lekensteyn.nl/peter/wireshark-notes.git . - - Signed-off-by: Hauke Mehrtens - - Change-Id: I347dc5a530380a04cc00418640f00bbda0db8de8 - Reviewed-on: https://code.wireshark.org/review/558 - Reviewed-by: Anders Broman - -commit a14266d -Author: Pascal Quantin -Date: Sat Mar 8 10:01:53 2014 +0100 - - Add BTLE RF dissector to release notes - - Change-Id: Idccb6b0e6bf8ae603377dce43c9d266d4c101374 - Reviewed-on: https://code.wireshark.org/review/557 - Reviewed-by: Pascal Quantin - -commit 3be0768 -Author: AndersBroman -Date: Sat Mar 8 09:52:41 2014 +0100 - - Omitting SubscriberData makes CONTENT OF fail and InsertSubscriberDataArg will not get all its tags - - Change-Id: I2ace2271d9ce5650e5239c12e64080463aae9367 - Reviewed-on: https://code.wireshark.org/review/556 - Reviewed-by: Pascal Quantin - -commit 15b95ba -Author: Michal Labedzki -Date: Wed Mar 5 12:37:30 2014 +0100 - - Do not try to use unknown/non-existent webbrowser - - Some systems do not have webbrowser or have strange browser. - Do not try to use it and dislayed URL for user information. - - Change-Id: I3f5bcca6701b20cafa942629cbee78aa1fc689b1 - Reviewed-on: https://code.wireshark.org/review/516 - Reviewed-by: Evan Huus - -commit f3178a1 -Author: Alexis La Goutte -Date: Fri Mar 7 16:53:29 2014 +0100 - - Remove trailing (tab)whitespace... - - Change-Id: I26325e40d6100dcd4f3e72080476a82e93edf28d - Reviewed-on: https://code.wireshark.org/review/550 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 6c831d6 -Author: Alexis La Goutte -Date: Fri Mar 7 16:47:53 2014 +0100 - - Fix indent (use tabs) and modelines info - - (Need to continue on other packet-dcerpc-* file...) - - Change-Id: I536d52017940cac9c810693045649a67e77a336a - Reviewed-on: https://code.wireshark.org/review/549 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit a6809ce -Author: Hadriel Kaplan -Date: Fri Mar 7 07:32:23 2014 -0500 - - Fix bytes view pane showing non-ASCII chars - - The bytes view pane in Qt is showing non-ASCII characters in the right-hand - side. That's because the code is using isprint(), which is locale specific - and frequently includes non-ascii charscters such as the copyright symbol and - such. I wouldn't care, except some of those non-ASCII characters affects - the font height and makes it looks sloppy (the display output is set to a - fixed *width* font, but not fixed height font apparently). - - Change-Id: Idd471c5fb769d3d67aa08bc507d168e686d48098 - Reviewed-on: https://code.wireshark.org/review/548 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit ee07cd9 -Author: Alexis La Goutte -Date: Fri Mar 7 08:18:32 2014 +0100 - - Make buildbot happy : packet-btle.c:275:16: error: declaration of 'index' shadows a global declaration [-Werror=shadow] - - Change-Id: I94e1da9f12c257fa4e2c597f29a200d35e2d5d0d - Reviewed-on: https://code.wireshark.org/review/546 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 1b2559d -Author: cbontje -Date: Thu Mar 6 13:21:58 2014 -0700 - - Fix DNP3 Dissector DNP3 Read Requests and Direct Op No ACKs - - This corrects a couple issues with the DNP3 Dissector: - - Refactored Read Object String lookups to use value_string - - Corrected issue with multiple object types in a single read not being processed - - Added processing for Direct Operate No ACK Messages - - Fixes issues noted in Bug 9839 - - Change-Id: I9895e509a8d3931c805ce53b718a4951f8f8039e - Reviewed-on: https://code.wireshark.org/review/538 - Reviewed-by: Anders Broman - -commit 419ee94 -Author: Stefan Metzmacher -Date: Mon Aug 13 17:51:21 2012 +0200 - - packet-smb2: setup decryption keys for kerberos session setups - - Change-Id: I1a641da6f85e047984631c4dec158718fd7d011d - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/365 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 7f9acb5 -Author: Stefan Metzmacher -Date: Wed Oct 3 23:01:12 2012 +0200 - - packet-smb-direct.c: add support for reassembling of fragments - - Change-Id: I6b66867774f369fa49c9ee45a6792a6ad4d4c6e2 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/59 - Reviewed-by: Anders Broman - -commit ef94a80 -Author: Christopher Kilgour -Date: Fri Feb 21 23:39:45 2014 -0800 - - Introduces two new Bluetooth DLTs for RF-based captures. - - Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing - BTLE dissector. - - Fixes BTLE dissector to correctly extract packet CRC. - - Adds CRC checking to BTLE dissector. - - Provides optional context to BTLE dissector that allows RF captures to provide - link-layer hints for dissection details. Significantly, parameters for - determining CRC correctness are provided, as well as Access Address validity - information. - - Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb - Reviewed-on: https://code.wireshark.org/review/310 - Reviewed-by: Anders Broman - -commit 825ce03 -Author: Michal Labedzki -Date: Mon Mar 3 08:51:46 2014 +0100 - - Bluetooth: A2DP/VDP: Display SEIDs used in conversation - - Change-Id: I855ccbee2248cafcc9b1d32245894e2933ca745a - Reviewed-on: https://code.wireshark.org/review/474 - Reviewed-by: Evan Huus - -commit d0132ad -Author: Michal Labedzki -Date: Mon Feb 24 11:50:37 2014 +0100 - - Bluetooth: AVDTP: Fix trees and distinguish local and remote SEPs - - When there is more then one interface or adapter then AVDTP dissector - incorrectly mixing it data together. Patch extends keys to support - multiple interfaces/adapters. Also do little simplification on trees. - - There are two device, both use SEPs to configuration and - it is possible to use the same SEID. SetConfiguration use - remote "ACP" SEID and local "INT" SEID, so there is need to - distinguish them and please remember then INT SEID types can be - unknown in most case. - - Change-Id: I150f3625f532386a1078deb8d0ac70a1c05c3f04 - Reviewed-on: https://code.wireshark.org/review/473 - Reviewed-by: Evan Huus - -commit 058527f -Author: Hadriel Kaplan -Date: Thu Mar 6 04:22:31 2014 -0500 - - Fix bug 9835 disabled second media stream disables all media streams - - When a single media line is rejected in an SDP answer, for example a second - 'm=video' line, wireshark disables ALL media sessions, instead of just that - one. But per the RFCs, all it should do is disable just the one RTP media - session the m= line represents. This commit fixes that, so that a disabled - media session (one with a m= port of 0) in the SDP answer only disables its - associated/paired media stream in the offer. - - Change-Id: I9bd0d3fc88b8eaa55207c9bf3f3e37da7746fd14 - Reviewed-on: https://code.wireshark.org/review/526 - Reviewed-by: Anders Broman - Reviewed-by: Evan Huus - -commit 4fbcfc1 -Author: Bill Meier -Date: Thu Mar 6 23:55:37 2014 -0500 - - (Benign) Don't use "address-of" operator on arg of VALS() (not that it makes any actual difference).. - - Change-Id: I0766d0f130648aaa5a58d9f4062fa24e898cbdc3 - Reviewed-on: https://code.wireshark.org/review/545 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit fc2be9e -Author: Michal Labedzki -Date: Mon Mar 3 08:51:27 2014 +0100 - - Bluetooth: HCI_EVT: Fix empty advertising data - - LE Advertising Report with length 0 is valid, so check - it before dissecting adverising data. - - Change-Id: I4937ec2de5d703b05c6e5f5bac7f81d153e49b40 - Reviewed-on: https://code.wireshark.org/review/475 - Reviewed-by: Anders Broman - -commit aac1e0a -Author: Martin Kaiser -Date: Thu Mar 6 21:10:52 2014 +0100 - - add the (not yet official) TLS channel_id extension that's used by Chrome - - Change-Id: Ib8779b0db790a78fff8bd1970a7240bbd8f49f75 - Reviewed-on: https://code.wireshark.org/review/537 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit f4591ef -Author: Michal Labedzki -Date: Mon Mar 3 12:12:03 2014 +0100 - - Bluetooth: Avoid using find_dissector() - - Also remove SVN $Id$ lines. - - Change-Id: I4f2925e6ad8dcfe4a62d879a2cef44447f8ae916 - Reviewed-on: https://code.wireshark.org/review/476 - Reviewed-by: Anders Broman - -commit 78ff87e -Author: Peter Hatina -Date: Mon Mar 3 12:53:14 2014 +0100 - - Reorganize Capture Options dialog - - Opening Capture Options dialog on low resolution displays (e.g. 1366x768) in GNOME-shell makes user unable to see the bottom of the dialog - - Change-Id: Icc39d5ca89f98edb3ff246cd23ab9663a3dfbd1e - Reviewed-on: https://code.wireshark.org/review/453 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Anders Broman - -commit 2256bbc -Author: Alexis La Goutte -Date: Thu Mar 6 21:04:22 2014 +0100 - - Remove unused include header - - Change-Id: Ia8d5da43b1ab2db3aa508863fc94ca758cdff37d - Reviewed-on: https://code.wireshark.org/review/536 - Reviewed-by: Anders Broman - -commit 0cd28d0 -Author: Martin Kaiser -Date: Thu Mar 6 17:28:16 2014 +0100 - - fix invalid offset for URI's EMI - - Change-Id: I397eeed3008d91aeb6c025c9146b9ed6d98881a6 - Reviewed-on: https://code.wireshark.org/review/535 - Reviewed-by: Martin Kaiser - -commit 49394d3 -Author: Alexis La Goutte -Date: Thu Mar 6 18:00:43 2014 +0100 - - Update Wireshark pre-commit tools (Add check for trailing whitespace based from git pre-commit.sample) - - Change-Id: If8f5f48dfd96c3657036f7b59b6ca905c9d24043 - Reviewed-on: https://code.wireshark.org/review/531 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit dbff30b -Author: Alexis La Goutte -Date: Thu Mar 6 17:58:39 2014 +0100 - - Cosmetic fix about openCaptureFile... (in Wireshark Qt) - - Change-Id: I9f62b8393f33a964ec54a673f30d5d9a77d02f2c - Reviewed-on: https://code.wireshark.org/review/530 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit bf3f471 -Author: Alexis La Goutte -Date: Thu Mar 6 17:50:01 2014 +0100 - - Fix startup warning when launch Wireshark Qt - - QObject::connect: No such signal WiresharkApplication::openCaptureFile(QString&,QString&,unsigned int) in main.cpp:502 - QObject::connect: (receiver name: 'MainWindow') - - Change-Id: I0d6283c1b55619fa6878161d0a74db1ec9107bf2 - Reviewed-on: https://code.wireshark.org/review/529 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit eef0fa6 -Author: Pascal Quantin -Date: Thu Mar 6 14:19:13 2014 +0100 - - Add OSC dissector to release notes - - Change-Id: I135d9f8321b4d42ffaa1d1571ac43f61a364d1ed - Reviewed-on: https://code.wireshark.org/review/528 - Reviewed-by: Pascal Quantin - -commit 93a59e7 -Author: Hanspeter Portner -Date: Mon Mar 3 14:06:58 2014 +0100 - - Open Sound Control dissector. - - Dissector for specification at http://opensoundcontrol.org/spec-1_0. - - - use value_string - - add integer oferflow protection - - remove trailing white space - - add capture file to bug tracker: Bug 9837 - - fix warnings by tools/fix-encodings-args.pl - - make use of VALS - - dissect MIDI controller messages separately - - Change-Id: Iab0dc01d4bf1c08eac175b6af1dd07809090c35a - Reviewed-on: https://code.wireshark.org/review/454 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit c9dd46c -Author: Michal Labedzki -Date: Mon Mar 3 08:50:53 2014 +0100 - - Bluetooth: Make Source/Destination BD_ADDRs and names filterable - - Source/Destination BD_ADDRs and name are filterable. - Also simplify code around wmem trees, and enable commented "data" - field in unreassembled case and fix btl2cap offsets - (discovered by enabling "data" field). - - Change-Id: Ic28c9bf19bcd6281b652be538b221da74df4bb76 - Reviewed-on: https://code.wireshark.org/review/471 - Reviewed-by: Evan Huus - -commit 248c284 -Author: Michal Labedzki -Date: Mon Mar 3 08:51:04 2014 +0100 - - Bluetooth: Fix interface_id - - Interface ID should correspond to the Wireshark Interface Id - to avoid mixing data from various interfaces in dissectors. - - Change-Id: Ibaa3ddab7f0ebd0985efea74439b94a5881145a7 - Reviewed-on: https://code.wireshark.org/review/472 - Reviewed-by: Evan Huus - -commit e2ed48a -Author: Guy Harris -Date: Sat Feb 8 19:09:41 2014 -0800 - - Have NFLOG TLV type and length be in host byte order. - - When capturing, they'll be in host byte order. The top of the libpcap - trunk and 1.5 branch, when reading a file, will, if necessary, byte-swap - the type and length values so that they're in the byte order of the host - reading the file (rather than the host that wrote the file). - - Do the same when we read a file, and have the NFLOG dissector assume - host byte order for those fields. - - Change-Id: I493aed1e07b626af1157d75f3bc293b0a694ad07 - Reviewed-on: https://code.wireshark.org/review/148 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit dc7d5f9 -Author: Jeff Morriss -Date: Wed Mar 5 16:34:13 2014 -0500 - - Add a few grouped AVP definitions for 3GPP-Slh - - ... as suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9793#c5 - - Also remove trailing white space. - - Change-Id: Ic83ad7e4c7792a78a9d11eef25f1edf92bd22ddb - Reviewed-on: https://code.wireshark.org/review/521 - Reviewed-by: Anders Broman - -commit 7a4702d -Author: Bill Meier -Date: Wed Mar 5 21:20:40 2014 -0500 - - Ue TFS & VALS macros for certain 'fieldconvert' fields. - - Change-Id: I8d7468e62d5de99eb68b554134be71b17d1b87c8 - Reviewed-on: https://code.wireshark.org/review/525 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit be0b4b9 -Author: Evan Huus -Date: Wed Mar 5 13:14:26 2014 -0500 - - Add test to dump glossaries. - - All it checks is that they don't crash, but this is enough to catch malformed - extended value strings and other oddities. - - Change-Id: If853e8e2b19517a784daa4bbb8e41eddc7c7ddd9 - Reviewed-on: https://code.wireshark.org/review/520 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 970197c -Author: Widok -Date: Wed Mar 5 14:18:39 2014 +0100 - - Corrected mrp decoding of link up and down - Added DCP decoding of reset to factory - removed unused value_strings - corrected decoding of PDSubFrameBlock - most of the length display added a dec_hex display - - - Signed-off-by: Widok - Change-Id: I17b59b45eff37b65047a7a3e5e275f01a37ee616 - Reviewed-on: https://code.wireshark.org/review/517 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 041f844 -Author: Hadriel Kaplan -Date: Tue Mar 4 06:19:01 2014 -0500 - - Add command-line arg for input file format for tshark/wireshark - - Now that we have the ability to choose input file format type - in the GUI, we might as well have it in the command-line too. - Plus it would help me in test-stuies if we had a commandline. - So I've added a '-X read_format:Foo' for this. Using just - '-X read_format:', or with a bad name, will make it print out - the full list (in tshark); just like the '-F' does for output - file formats. - - Note: I am *not* putting in code for Win32 GUI, - because I can't compile that and I wouldn't have even - done the GTK one if I could compile Qt originally. (I don't think we need - to add any more features to GTK or Win32, just Qt from now on, - right?) - - Change-Id: I2fe6481d186f63bd2303b9e591edf397a2e14b64 - Reviewed-on: https://code.wireshark.org/review/493 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit f1f0601 -Author: Bill Meier -Date: Wed Mar 5 10:26:11 2014 -0500 - - (Trivial) Fix a typo. - - Change-Id: Ib084b7e9d463c54fc836745833005b1456a82709 - Reviewed-on: https://code.wireshark.org/review/518 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit abc6fb2 -Author: Alexis La Goutte -Date: Wed Mar 5 08:53:22 2014 +0100 - - Fix some code remove by 296591399f90a9d89be958d91047aa724a77ee6d - (Copyright or info about file...) - - Change-Id: I90ba8b1c3ec8406b0c3365a69a8555837fc4bbb1 - Reviewed-on: https://code.wireshark.org/review/515 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 8881f3f -Author: Guy Harris -Date: Tue Mar 4 18:32:00 2014 -0800 - - Don't truncate the options field. - - Create a placeholder protocol tree item under which to put the options, - do the analysis of fields from the fixed-length portion of the TCP - header (such as sequence numbers), and then do a straightforward - dissection of the options, throwing an exception if we run past the end - of the options field. - - This is a bit simpler, and doesn't add confusing notes about - truncation of the options. - - XXX - we're currently not including selective acknowledgments in any of - the SEQ/ACK analysis; should we? That means, of course, that we have to - dissect the options before doing that analysis, and if the options were - cut short by slicing, you lose.... - - Change-Id: I425a6c83f26512b802267f76739cbf40121b3040 - Reviewed-on: https://code.wireshark.org/review/511 - Reviewed-by: Guy Harris - -commit b2689ab -Author: Gerald Combs -Date: Tue Mar 4 11:18:26 2014 -0800 - - Add gitversion.h. - - Change-Id: Ia1609a20b060cb535a366c96be5618dccb6e055f - Reviewed-on: https://code.wireshark.org/review/507 - Reviewed-by: Gerald Combs - -commit 083ea63 -Author: Gerald Combs -Date: Tue Mar 4 11:15:46 2014 -0800 - - Add a cast. - - Change-Id: Ib1885bcbe061942ecba55b90e6b1d9b20f033f41 - Reviewed-on: https://code.wireshark.org/review/505 - Reviewed-by: Gerald Combs - -commit 6a40495 -Author: Michal Labedzki -Date: Wed Feb 26 16:27:20 2014 +0100 - - win32: Implement format type selector in open file dialog - - Change-Id: Idef1829fcc2b7b08783e5288bb6486ce19c4779b - Reviewed-on: https://code.wireshark.org/review/405 - Reviewed-by: Evan Huus - Reviewed-by: Pascal Quantin - -commit e6a4500 -Author: Evan Huus -Date: Tue Mar 4 12:20:52 2014 -0500 - - One more fix from g2965913 - - Change-Id: I68d5bd33a44783c42a75e8244ef53c73a4f484f9 - Reviewed-on: https://code.wireshark.org/review/503 - Reviewed-by: Evan Huus - -commit 35098d2 -Author: Evan Huus -Date: Mon Mar 3 23:44:12 2014 -0500 - - Fix memory-alignment in the block allocator. - - The previous macro gave the correct alignment, but there was one case where it - would add a whole block of unnecessary ALIGN_SIZE bytes. The new one is also - slightly faster to compute. - - Benchmark win of about 3%. - - Change-Id: I5d8bad0f78dc0e383e14c2c7a951328a06400020 - Reviewed-on: https://code.wireshark.org/review/492 - Reviewed-by: Evan Huus - -commit 75a67e6 -Author: Pascal Quantin -Date: Tue Mar 4 17:36:59 2014 +0100 - - Fix warnings introduced in g2965913 - - Change-Id: I7b0fedf0c508404b3f2dea789f50b7b5db4e2eb7 - Reviewed-on: https://code.wireshark.org/review/502 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit 02c741b -Author: Pascal Quantin -Date: Tue Mar 4 16:43:25 2014 +0100 - - Fix compilation broken by g2965913 - - Change-Id: I5af8c0ae049bb3d2caed04bd3229c11a81f7b5b9 - Reviewed-on: https://code.wireshark.org/review/501 - Reviewed-by: Pascal Quantin - -commit 2965913 -Author: Alexis La Goutte -Date: Tue Mar 4 13:14:53 2014 +0100 - - Remove all $Id$ from top of file - - (Using sed : sed -i '/^ \* \$Id\$/,+1 d') - - Fix manually some typo (in export_object_dicom.c and crc16-plain.c) - - Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 - Reviewed-on: https://code.wireshark.org/review/497 - Reviewed-by: Anders Broman - -commit 01467c2 -Author: Evan Huus -Date: Tue Mar 4 08:11:57 2014 -0500 - - Remove assertions from block allocator. - - It has been extremely well-tested at this point, and is a very hot code path so - the performance gain is measurable (~1-2% on most captures I tried). - - Change-Id: I2f5e03d2f348f56e740bf0dfbc83a4fd9cc8c5a9 - Reviewed-on: https://code.wireshark.org/review/499 - Reviewed-by: Anders Broman - -commit 3a4b311 -Author: Pascal Quantin -Date: Tue Mar 4 12:32:50 2014 +0100 - - When dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSM - - Fixes bug 9829 - - Change-Id: Ib56bc7dc79ca27667fb89691817f6e568006d3a8 - Reviewed-on: https://code.wireshark.org/review/494 - Reviewed-by: Anders Broman - -commit 7a008e4 -Author: Michal Labedzki -Date: Tue Mar 4 12:39:52 2014 +0100 - - cmake: Add missing exported_pdu dissector - - Change-Id: I9a6a91b11555e2b271b3d359f26bf97796d6742f - Reviewed-on: https://code.wireshark.org/review/495 - Reviewed-by: Anders Broman - -commit ad76c35 -Author: Martin Kaiser -Date: Sun Mar 2 00:08:42 2014 +0300 - - replace label_mark_truncated_start() with a macros that calls - label_mark_truncated() - - Change-Id: I7ede5f9776d26ebce2ccf427cf6ff5dec56814cd - Reviewed-on: https://code.wireshark.org/review/465 - Reviewed-by: Martin Kaiser - -commit dec951e -Author: Bill Meier -Date: Mon Mar 3 21:52:11 2014 -0500 - - (Trivial) Fix 2 typos; Reformat some long lines. - - Change-Id: If7d009b7764e858bd210d613ac9af219e9e20464 - Reviewed-on: https://code.wireshark.org/review/491 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 83b9949 -Author: Guy Harris -Date: Mon Mar 3 14:49:20 2014 -0800 - - Show ymsg.content as bytes; it's not a simple string. - - The content of a YMSG message is a sequence of lines, each one of which - contains a text string (in some ASCII-based encoding) for a key, a - 0xc080 separator, and a text string (in some ASCII-based encoding) for a - value. That's not a string in any ASCII-based encoding I know of - 0xc0 - 0x80 is not, for example, a valid UTF-8 sequence (it's a too-long - sequence for NUL). - - This should fix bug 9832: - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9832 - - by avoiding the general "GTK+ on Windows crashes when asked to copy - something that's not valid UTF-8" problem. - - Fix some field descriptions while we're at it. - - Change-Id: I4084dabc89b0186ecd1a7329452ca2f1cb48f1c0 - Reviewed-on: https://code.wireshark.org/review/488 - Reviewed-by: Guy Harris - -commit f94674d -Author: Martin Kaiser -Date: Sat Mar 1 13:25:47 2014 +0300 - - truncate UTF-8 strings only at the boundary between two characters - - Change-Id: Ib3ffc1593e877f4f7c708712b82209cf969cecff - Reviewed-on: https://code.wireshark.org/review/464 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 4ddd7a6 -Author: Bill Meier -Date: Mon Mar 3 16:10:35 2014 -0500 - - Create/use extended value_strings; add editor modelines as needed. - - Change-Id: I36ebee937ddd1c5ccbfa36f284a4794bc63631dc - Reviewed-on: https://code.wireshark.org/review/482 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 1795b40 -Author: Bill Meier -Date: Mon Mar 3 13:27:24 2014 -0500 - - Move value_string defs from .h file; create/use extended value_string; Other minor changes. - - - Multiple value string arrays were defined in packet-fcels.h (which was included - in two differnt .c files). Only one of the arrays was actually used in two - different .c files. All the value_string arrays (and most of the #defines) - moved to packet-fcels.c. - - - Other: - Use -1 instead of tvb_length() for the length param of several proto_tree_add...() calls. - Add editor modelines. - - Change-Id: Idc642caf1c8d62b658147a234d5560b8f2fd0630 - Reviewed-on: https://code.wireshark.org/review/479 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 1f2f2ba -Author: Bill Meier -Date: Mon Mar 3 11:17:57 2014 -0500 - - Create/use an extended value-string; Move value-string array from .h file; Do other misc. - - - Value string arrrays should never be defined in a .h file (especially one - included in multiple .c files). - So: a. The value_string array (and associated #defines) was moved from the .h file - to packet-rtp_events.c - b. A public extended value_string was created in packet-rtp_events.c - and declared as external in packet-rtp_events.h - - - Other: - Remove a few unneeded initializers; - Add editor modelines. - - Change-Id: Ib580c3e50ab5ce79484c9c6af57f62ca604b57d1 - Reviewed-on: https://code.wireshark.org/review/468 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 69a8881 -Author: Bill Meier -Date: Mon Mar 3 01:53:50 2014 -0500 - - Create/use several extended value-strings; Do several other small changes. - - - Move setting COL_PROTO & clearing COL_INFO to before a tvb fetch which - could cause an exception; - - Remove some unneeded initializers; - - Fix up some long-lines and whitespace; - - Use a consistent indentation; - - Add editor modelines. - - Change-Id: I8a8015a65d5dc581ed02cbd134231481b9f96263 - Reviewed-on: https://code.wireshark.org/review/467 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 40e9465 -Author: Bill Meier -Date: Mon Mar 3 00:43:39 2014 -0500 - - Create/use an extended value_string; Do other misc minor changes. - - - Localize some vars; - - Use a consisten 4-space indentation & whitespace style; - - Add editor modelines; - - Change-Id: I0d6270eea3fae804788a56557d3c7e171afa8aaa - Reviewed-on: https://code.wireshark.org/review/466 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 5fc9db8 -Author: Pascal Quantin -Date: Sun Mar 2 18:25:31 2014 +0100 - - SSL: dynamically allocate session ticket storage area to avoid buffer overflow - - Fixes bug 9825 - - Change-Id: I20ae65331ec11b2f6774054df4c026fd5fa76d3a - Reviewed-on: https://code.wireshark.org/review/447 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit 2ab7268 -Author: Martin Kaiser -Date: Fri Feb 28 11:58:11 2014 +0300 - - show if the current service is scrambled or free - - Change-Id: I9e50920fbc09fdf0650be3a63fee8153ce0fd3df - Reviewed-on: https://code.wireshark.org/review/462 - Reviewed-by: Martin Kaiser - -commit c8b62c9 -Author: Martin Kaiser -Date: Mon Feb 24 09:50:49 2014 +0100 - - add cleartext values for retention limit - - Change-Id: I8ecfdb1c366310d224660e89c99136a0a9f4a067 - Reviewed-on: https://code.wireshark.org/review/461 - Reviewed-by: Martin Kaiser - -commit f91f433 -Author: Martin Kaiser -Date: Mon Feb 24 09:23:04 2014 +0100 - - move URI dissection to a separate function - - Change-Id: Ia1db91ef9344e46a3f32204bbf9cdbcc514980ce - Reviewed-on: https://code.wireshark.org/review/460 - Reviewed-by: Martin Kaiser - -commit 64ee293 -Author: Martin Kaiser -Date: Tue Feb 25 11:06:22 2014 +0300 - - use tvb_memdup() instead of tvb_get_ptr() - - Change-Id: I1e9ff715c3e315c9e36abb69fb5f441b71477501 - Reviewed-on: https://code.wireshark.org/review/459 - Reviewed-by: Martin Kaiser - -commit 2286437 -Author: Martin Kaiser -Date: Tue Feb 25 21:41:27 2014 +0300 - - remove unnecessary if (tree) check - - Change-Id: I1542d715594b1b90e2442edb6f220ddc4dd99675 - Reviewed-on: https://code.wireshark.org/review/458 - Reviewed-by: Martin Kaiser - -commit e6d2415 -Author: Martin Kaiser -Date: Wed Feb 26 13:21:09 2014 +0300 - - skip empty service provider name and empty service name - - Change-Id: I355600320865a9c7c17093d37fc693b02f0a7f0c - Reviewed-on: https://code.wireshark.org/review/457 - Reviewed-by: Martin Kaiser - -commit 0156add -Author: Martin Kaiser -Date: Wed Feb 26 12:10:02 2014 +0300 - - service provider name is a DVB-SI string - - Change-Id: Idea44f0e4678f738336215f4a250b9e9d9a60fbc - Reviewed-on: https://code.wireshark.org/review/456 - Reviewed-by: Martin Kaiser - -commit 070ae30 -Author: Martin Kaiser -Date: Tue Feb 25 22:04:19 2014 +0300 - - service name is a DVB-SI string - - Change-Id: I81ef4cd363acf6cff99fd0f75b135962c4c22f53 - Reviewed-on: https://code.wireshark.org/review/455 - Reviewed-by: Martin Kaiser - -commit a79fbf0 -Author: Evan Huus -Date: Sun Mar 2 09:58:49 2014 -0500 - - Don't pass an invalid length to proto_item_set_len - - Fixes bug #9818. - - Change-Id: I4fb4cf2b5b31ed6efc55a48df67f2ec4949d47c3 - Reviewed-on: https://code.wireshark.org/review/442 - Reviewed-by: Evan Huus - -commit 9afdd44 -Author: Evan Huus -Date: Sun Mar 2 10:19:41 2014 -0500 - - Improve SCTP association lookup. - - It's still O(n) in the worst case since the comparison function doesn't appear - to be suitable for use in a tree or hash-table, but at least we no longer spend - O(n) by default just finding the end of the list so we can iterate backwards. - - Discovered while investigating bug #9823, but probably not the cause of that - bug. - - Change-Id: Ib6c3691cff8e7fa49703df7c75635ef797c8fbe8 - Reviewed-on: https://code.wireshark.org/review/443 - Reviewed-by: Anders Broman - -commit 0f2014b -Author: Gerald Combs -Date: Sun Mar 2 12:11:37 2014 -0800 - - Scan-build didn't like the fixes in g79ef36a5f. - - Change-Id: I1083136f9e4fb38b55e9b9c2fec74ddec35f198e - Reviewed-on: https://code.wireshark.org/review/452 - Reviewed-by: Gerald Combs - -commit 26e0635 -Author: Bill Meier -Date: Sun Mar 2 14:27:43 2014 -0500 - - Remove unneeded line of code. - - Change-Id: Ic2769d5c125d8db7d32b6ad3ab0e4363f513f599 - Reviewed-on: https://code.wireshark.org/review/451 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 122f99a -Author: Bill Meier -Date: Sun Mar 2 14:11:51 2014 -0500 - - Clear INFO column at the beginning of the dissector. - - Change-Id: Iea901674e1d9c4745b891ac4330bd781d5eb76ec - Reviewed-on: https://code.wireshark.org/review/450 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit add1213 -Author: Bill Meier -Date: Sun Mar 2 13:43:06 2014 -0500 - - tvb_length() --> tvb_reported_length() in several cases + other misc changes. - - Misc changes: - - sort entries in an enum by value; - - add some XXX notes as to possible missing entries in a value-string array; - - remove an unneeded initializer; - - 0 --> FALSE for several boolean values; - - whitespace. - - Change-Id: I6c8f1c1f37edad120d979fcd2d7278e7981ca5a7 - Reviewed-on: https://code.wireshark.org/review/449 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 988a184 -Author: Josip Medved -Date: Sun Mar 2 09:23:36 2014 -0800 - - Added Cisco Starent Diameter dictionary entries. - - Change-Id: Ib7fa98639b6de965148349948ccf86d8c8641fb1 - Reviewed-on: https://code.wireshark.org/review/438 - Reviewed-by: Anders Broman - -commit 14c8c64 -Author: Bill Meier -Date: Sun Mar 2 12:33:25 2014 -0500 - - Clear INFO col; Create/use extended value-string; Do other minor changes - - - val_to_str() -> val_to_str_const() in a few cases; - - localize some vars; - - remove some unneeded initializers; - - convert "4 space tabs" indentation to "4 spaces"; - revise editor modelines to match; - - do some whitespace changes. - - Change-Id: Ic91df02022971c973b27c71e6127395ed3ef06d3 - Reviewed-on: https://code.wireshark.org/review/448 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 58c3c7e -Author: Gerald Combs -Date: Sun Mar 2 08:06:15 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-03-02] - - Change-Id: Ie382028102569030ac00084125a26d49a05432b9 - Reviewed-on: https://code.wireshark.org/review/444 - Reviewed-by: Evan Huus - -commit 0a202bc -Author: Alexis La Goutte -Date: Sun Feb 23 19:19:32 2014 +0100 - - Fix packet-h223.c:842:18: error: will never be executed [-Werror,-Wunreachable-code] - - Change-Id: I8255a3841add78eaa167ef631effe58d9fb12736 - Reviewed-on: https://code.wireshark.org/review/323 - Reviewed-by: Evan Huus - -commit 5f78d0f -Author: Roland Knall -Date: Wed Feb 26 13:14:01 2014 +0100 - - Fix ui/iface_lists.c - type attribute is not copied - - temp is a clone of the local if_info, but the type - attribute is not copied correctly - - Additionally, the if_type member is exposed via the - capture options - - Change-Id: Id53f0dfd1e127921e1b89bbf78cb431ee257a96c - Reviewed-on: https://code.wireshark.org/review/404 - Reviewed-by: Roland Knall - Reviewed-by: Alexis La Goutte - -commit 9c62ea4 -Author: Hadriel Kaplan -Date: Tue Feb 25 10:44:39 2014 -0500 - - Fix text2pcap.c: Argument with 'nonnull' attribute passed null (clang analyzer) - - Clang scan analysis reports API error for text2pcap.c. - - Change-Id: Ie0861d75888e258d9fd928d5d7441e1e3a8279ba - Reviewed-on: https://code.wireshark.org/review/367 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - -commit 111c077 -Author: Bill Meier -Date: Sat Mar 1 16:26:07 2014 -0500 - - Create/use two extended value-strings & do other minor changes. - - - Use VALUE_STRING_ENUM/VALUE_STRING_ARRAY macros to create one of the - value string arrays instead of using the usual separate #defines & array definition; - - Remove a few unneeded initializers; - - prefs_register_protocol() need not be called under 'if (gp_zbee_prefs == NULL)' - - Do some minor whitespace changes; - - Add editor modelines. - - Change-Id: I33669b25fa18ecc452b83a0d88a6c0b33aae904a - Reviewed-on: https://code.wireshark.org/review/441 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 54cf849 -Author: Jeff Morriss -Date: Fri Feb 28 14:47:56 2014 -0500 - - Add the PPID for 3GPP Pua. Move the (unregistered) M2TP PPID into that dissector. - - Also put a note in sctpppids.h saying that only IANA-registered PPIDs should go - in that file. Inspired by the rejection of - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4332 - - Change-Id: I763aad7d1b69e9d36c798061473438ce3cb66ca1 - Reviewed-on: https://code.wireshark.org/review/434 - Reviewed-by: Evan Huus - Reviewed-by: Anders Broman - Tested-by: Anders Broman - -commit 79ef36a -Author: Gerald Combs -Date: Sat Mar 1 11:13:08 2014 -0800 - - Fix some scan-build warnings. - - Fix a modeline while we're at it. - - Change-Id: Ief6d5edbe33456170059cfab4f436f0844de32a1 - Reviewed-on: https://code.wireshark.org/review/440 - Reviewed-by: Gerald Combs - -commit 0cb4b4e -Author: Niels de Vos -Date: Wed Feb 26 17:41:52 2014 +0100 - - GlusterFS: add support for ZEROFILL fop - - Implementation details in http://review.gluster.org/5327 - - BUG: 9812 - Change-Id: Ib1650fb7ca8221def4e9c6a323008847dc7b5f62 - Signed-off-by: Niels de Vos - Reviewed-on: https://code.wireshark.org/review/429 - Reviewed-by: Evan Huus - Reviewed-by: Pascal Quantin - -commit 104a6ed -Author: Gerald Combs -Date: Thu Feb 27 15:31:10 2014 -0800 - - Disable IPv4 checksum verfification to match TCP and UDP. - - Offloading seems to be very common nowadays and having this option - enabled by default generates a lot of false positives. Suggested by - Laura Chappell. - - Change-Id: I285f218efb3c9f164d8ad7a6d6de8270e442ffff - Reviewed-on: https://code.wireshark.org/review/426 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit 616ed71 -Author: Bill Meier -Date: Fri Feb 28 13:55:43 2014 -0500 - - Fix bug which (somewhat) randomly caused UAT pref to not display on a proto pref page. - - Introduced in ga2b2dd4b (SVN #53880) - - Change-Id: I3dd24ab5e1b45367b03b8096a5892f346782217f - Reviewed-on: https://code.wireshark.org/review/433 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit d14abec -Author: Jeff Morriss -Date: Fri Feb 28 13:51:59 2014 -0500 - - Add 3GPP Slh AVPs 2400, 2405, 2407 and 2409-2411. - - This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9793 - - Change-Id: Ia104767d2c1b3c26da851887c08973485f99f58b - Reviewed-on: https://code.wireshark.org/review/432 - Reviewed-by: Jeff Morriss - Tested-by: Jeff Morriss - -commit d085868 -Author: Florian Fainelli -Date: Fri Feb 28 01:40:42 2014 +0100 - - packet-homeplug-av: use HOMEPLUG_AV_MMVER_1_1 consistently - - The HomePlug AV dissector was not consistently using the - HOMEPLUG_AV_MMVER_1_1 constant and was sometimes using it and sometimes - using mmver == 1 directly. Make sure we use that constant throughout the - code to help clarifiying which version tests are applying to. - - Change-Id: I602413163e4e44dedfbf3e2364448a951fa70f54 - Signed-off-by: Florian Fainelli - Reviewed-on: https://code.wireshark.org/review/428 - Reviewed-by: Evan Huus - -commit e6277bd -Author: Florian Fainelli -Date: Fri Feb 28 01:37:00 2014 +0100 - - packet-homeplug-av: fix missing reserved byte for station dump - - dissect_homeplug_av_nw_info_sta() was processing stations - information correctly, except that after the first station dump, all - dumps would be off-by-one byte because we were not reserving a missing - byte at the end of the station dump. Fixes #9798. - - Change-Id: Iff3afd5ff536ae718fa446de3c59cd5e9851ff20 - Signed-off-by: Florian Fainelli - Reviewed-on: https://code.wireshark.org/review/427 - Reviewed-by: Evan Huus - -commit 54cccef -Author: Evan Huus -Date: Thu Feb 27 16:59:08 2014 -0500 - - Fix build with recent lua changes. - - Use FT_NONE instead of 0 to initialize an enum. - Drop use of lround/llround since they are not available on Windows. - - Change-Id: I3961c1921304bafc090c763f0d6de8532f0b3510 - Reviewed-on: https://code.wireshark.org/review/425 - Reviewed-by: Evan Huus - -commit 655f2e4 -Author: Hadriel Kaplan -Date: Tue Feb 25 12:57:52 2014 -0500 - - Fix prefs.c: Argument with 'nonnull' attribute passed null (redux) - - Change-Id: I795df36039278283008132d647aaf51e76dbe218 - Reviewed-on: https://code.wireshark.org/review/424 - Reviewed-by: Gerald Combs - -commit c826191 -Author: Hadriel Kaplan -Date: Wed Feb 26 23:42:15 2014 -0500 - - Fix coverity warnings for all wslua files. (redux) - - This fixes/addresses all the coverity warnings shown by - the buildbots. (I hope) - - Change-Id: Ic2722df97c577d274e3cf3f0cbdca1902edde047 - Reviewed-on: https://code.wireshark.org/review/423 - Reviewed-by: Gerald Combs - -commit c875dc8 -Author: Hadriel Kaplan -Date: Tue Feb 25 11:25:47 2014 -0500 - - Fix dumpcap.c: Assigned value is garbage or undefined (clang analyzer) - - Change-Id: I61dbf5e1e206b1c0d2e594bfba38e83e51e8f09c - Reviewed-on: https://code.wireshark.org/review/371 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 1828c34 -Author: Evan Huus -Date: Wed Feb 26 19:11:12 2014 -0500 - - Ensure ieee802154_packet struct is initialized. - - A malformed capture could cause the zbee-nwk-gp and 6lowpan heuristics to be - called with an incompletely-initialized structure, leading to valgrind errors. - - Change-Id: Iaea6daecdca6856466b58071f095930e68c6e159 - Closes-Bug: #9735 - Reviewed-on: https://code.wireshark.org/review/418 - Reviewed-by: Jeff Morriss - Reviewed-by: Evan Huus - -commit 9733917 -Author: Guy Harris -Date: Wed Feb 26 16:58:22 2014 -0800 - - Sherman, set the Wayback Machine for 1997. - - The URLs for the CRC-10 code are dead; use Wayback Machine URLs. - - Change-Id: I3924e9cabb3b49b0e1abb31fbffa9b89f95cd0ce - Reviewed-on: https://code.wireshark.org/review/419 - Reviewed-by: Guy Harris - -commit 46d8abe -Author: Guy Harris -Date: Wed Feb 26 14:25:38 2014 -0800 - - Document tvb_memdup() in more detail. - - Change-Id: Iec94342b7d033fb6e8597bbffea563128182316b - Reviewed-on: https://code.wireshark.org/review/417 - Reviewed-by: Guy Harris - -commit df77e26 -Author: Evan Huus -Date: Wed Feb 26 17:22:22 2014 -0500 - - Fix some wmem-related documentation. - - Discovered while reviewing Ibd3efb92a203861f507ce71bc8d04d19d9d38a93 - - Change-Id: Ie4dfc1b9b7a99f14657148ed5a935bbb079c2b4e - Reviewed-on: https://code.wireshark.org/review/415 - Reviewed-by: Evan Huus - -commit a8ef66f -Author: Guy Harris -Date: Wed Feb 26 14:24:24 2014 -0800 - - Regularize the formatting of some comments. - - Change-Id: I1009c75d5a4f074767dbc3600e7a6edfd0031460 - Reviewed-on: https://code.wireshark.org/review/416 - Reviewed-by: Guy Harris - -commit 5de2dac -Author: Guy Harris -Date: Wed Feb 26 14:20:58 2014 -0800 - - Fix a copy-and-pasteo. - - Change-Id: Ied8830e2e7a689197870a4d839fd08b36546c75f - Reviewed-on: https://code.wireshark.org/review/414 - Reviewed-by: Guy Harris - -commit 910949c -Author: Guy Harris -Date: Wed Feb 26 14:14:16 2014 -0800 - - Some g_free() -> wmem_free() changes missed in earlier checkins. - - Change-Id: I5858e0ee8fc8584b35145c943e19e8e5f7dba77c - Reviewed-on: https://code.wireshark.org/review/413 - Reviewed-by: Guy Harris - -commit 8d234a0 -Author: Guy Harris -Date: Sun Feb 23 14:16:24 2014 -0800 - - More tvbuff API deprecation, comment expansion, and documentation updates. - - Do with tvb_get_stringz() what was done with tvb_get_string(). - - Redo the comments for the string get routines to try to give more detail - in a fashion that's a bit less hard to read. - - Warn, in comments, of the problems with using - tvb_get_string()/tvb_get_stringz() (i.e., if your strings are non-ASCII, - all bytes with the 8th bit set are going be replaced by the Unicode - REPLACEMENT CHARACTER, and displayed as such). - - Warn, in a comment, of the problems with tvb_get_const_stringz() (i.e., - it gives you raw bytes, rather than guaranteed-to-be-valid UTF-8). - - Update documentation and release notes appropriately. - - Change-Id: Ibd3efb92a203861f507ce71bc8d04d19d9d38a93 - Reviewed-on: https://code.wireshark.org/review/327 - Reviewed-by: Guy Harris - -commit 1dff4e3 -Author: Bill Meier -Date: Wed Feb 26 14:29:17 2014 -0500 - - Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors. - - Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4 - Reviewed-on: https://code.wireshark.org/review/412 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit b485014 -Author: Bill Meier -Date: Wed Feb 26 14:27:36 2014 -0500 - - Remove a trailing space from a line of generated code. - - Change-Id: Ib95c0db932c54f5664905bde9286aad7a195570f - Reviewed-on: https://code.wireshark.org/review/411 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 0d2f290 -Author: Bill Meier -Date: Wed Feb 26 12:40:51 2014 -0500 - - Create/use an extended value_string. - - Change-Id: I1cd20d68ebb50d11ecfa00bf76e9be7c47a45860 - Reviewed-on: https://code.wireshark.org/review/410 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 15a3a44 -Author: Bill Meier -Date: Wed Feb 26 12:30:01 2014 -0500 - - (Minor) Use col_add_str() iso col_set_str(). - - Change-Id: I3d430e7e6a6bbdcb518f0110bd81ab32f88c17f0 - Reviewed-on: https://code.wireshark.org/review/409 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 5ae7c2f -Author: Bill Meier -Date: Tue Feb 25 22:18:37 2014 -0500 - - Create/use some extended value-strings. Do some whitespace changes. - - Change-Id: Iee5cb12d3b6669c7e45e18352ebcd151db721ad3 - Reviewed-on: https://code.wireshark.org/review/408 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 2c09745 -Author: Hadriel Kaplan -Date: Tue Feb 25 12:15:05 2014 -0500 - - Fix capture_sync: Assigned value is garbage or undefined (clang analyzer) - - I'm not 100% positive this fix is the right way to handle this condition, - but it seems the safest way without changing a lot of other code. - - Change-Id: Icaa8d6f38bc03177162f046d1e7ca55d87bad6a6 - Reviewed-on: https://code.wireshark.org/review/373 - Reviewed-by: Evan Huus - Reviewed-by: Balint Reczey - Tested-by: Balint Reczey - -commit ea1d5c1 -Author: Guy Harris -Date: Wed Feb 26 02:16:27 2014 -0800 - - Use proto_tree_add_item() for most string encodings. - - We support ISO 8859-1 and 8859-8, so use proto_tree_add_item() for them. - That leaves only EUC-KR. - - Change-Id: Ie61f69af43be03e5abeb84b95601a407900fb79b - Reviewed-on: https://code.wireshark.org/review/403 - Reviewed-by: Guy Harris - -commit 85885f4 -Author: Guy Harris -Date: Wed Feb 26 02:12:53 2014 -0800 - - Use tvb_get_string_enc(..., ENC_ASCII|ENC_NA) for 8-bit encoding. - - If there are 8-bit "extended ASCII" encodings, either one should be - wired in or there should be a preference for them. - - Change-Id: Id62381b2579e8edf3719bd92959821c21f7ba223 - Reviewed-on: https://code.wireshark.org/review/402 - Reviewed-by: Guy Harris - -commit 985d334 -Author: Pascal Quantin -Date: Wed Feb 26 10:21:32 2014 +0100 - - Replace tabs by spaces - - Change-Id: Ib7b97c415fdf924783637bfe566f1e7d21e28369 - Reviewed-on: https://code.wireshark.org/review/401 - Reviewed-by: Pascal Quantin - -commit b84d6be -Author: Stefan Metzmacher -Date: Fri Jan 31 15:24:34 2014 +0100 - - packet-smb-direct: register as a infiniband subdissector - - This is implemented based on the documentation, I sadly don't - have a capture to verify this. - - Change-Id: Ia7dc371cb5b17ea42be0e686c97797f8c06ccabd - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/358 - Reviewed-by: Pascal Quantin - -commit 8242756 -Author: Stefan Metzmacher -Date: Fri Jan 31 15:23:06 2014 +0100 - - packet-infiniband: pass a struct infinibandinfo to subdissectors - - Change-Id: I187a1a91f34b1b758cad03bd9902ba132272cd3a - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/357 - Reviewed-by: Pascal Quantin - -commit f012f1d -Author: Stefan Metzmacher -Date: Fri Jan 31 16:20:12 2014 +0100 - - packet-smb-direct: only handle RDMA_SEND_* messages - - Change-Id: I08fa1092e2722c108bf6f847f8fc230f131e584b - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/356 - Reviewed-by: Pascal Quantin - -commit 6efd2c7 -Author: Stefan Metzmacher -Date: Fri Jan 31 16:16:48 2014 +0100 - - packet-iwarp-ddp-rdmap: pass struct rdmapinfo with opcode to the subdissectors - - Change-Id: I51bb8a3047bbc16d55d0c089fe869c7534d4c0b5 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/355 - Reviewed-by: Pascal Quantin - -commit 98cc3d6 -Author: Guy Harris -Date: Tue Feb 25 23:56:48 2014 -0800 - - We don't use EBCDIC_to_ASCII(), so we don't need to include . - - Change-Id: Ief609f48493f406ba0818ed3e6febe9a8ef0aaf2 - Reviewed-on: https://code.wireshark.org/review/400 - Reviewed-by: Guy Harris - -commit f8f4ebb -Author: Guy Harris -Date: Tue Feb 25 23:50:22 2014 -0800 - - Use tvb_get_string_enc() to get UCS-2 strings. - - Also, note that the "8-bit" encoding is "user-defined". - - Change-Id: Ic4786873150d837d8793d2d3d20af50cd0003cc7 - Reviewed-on: https://code.wireshark.org/review/399 - Reviewed-by: Guy Harris - -commit 136b730 -Author: Joerg Mayer -Date: Wed Feb 26 00:52:36 2014 +0100 - - As long as the NEWS file is part of the source distribution it really - needs to be updated every time the file docbook/release-notes.asciidoc - get changed. - - Change-Id: Idea130c883b3b3645d696b830e25fe052f889860 - Reviewed-on: https://code.wireshark.org/review/398 - Reviewed-by: Jörg Mayer - -commit d75d5a1 -Author: Gerald Combs -Date: Tue Feb 25 15:41:14 2014 -0800 - - Fix indentation and numbering. - - Change-Id: Ic1b528db9128420e106affcc8b3639d2d5fc65c0 - Reviewed-on: https://code.wireshark.org/review/397 - Reviewed-by: Gerald Combs - -commit 65bac03 -Author: Joerg Mayer -Date: Tue Feb 25 23:29:48 2014 +0100 - - Remove the line that causes the following message: - asciidoc: WARNING: developer-guide.asciidoc: line 25: include file not found: /home/jmayer/work/wireshark/git/docbook/wsdg_src/WSDG_chapter_.asciidoc - - Change-Id: I65c035da7e44e0bca7aa9fe26a9d77da5238e205 - Reviewed-on: https://code.wireshark.org/review/394 - Reviewed-by: Alexis La Goutte - Reviewed-by: Jörg Mayer - -commit bac680c -Author: Gerald Combs -Date: Tue Feb 25 14:43:04 2014 -0800 - - Get Windows build working again. - - Change 16 / g579e7e1 introduced a breaking change in - capture_file_dialog.cpp on Windows. This works around the problem - temporarily until we come up with a proper fix. - - Fix a Q_OS_WIN check while we're at it. - - Change-Id: I552d60720e4a45c5144e0047ee3c1fcc7e64f4eb - Reviewed-on: https://code.wireshark.org/review/396 - Reviewed-by: Gerald Combs - -commit a7de012 -Author: Pascal Quantin -Date: Tue Feb 25 23:36:24 2014 +0100 - - Add a few more dissectors to release notes - - Change-Id: I9d3262fe8205d21baf46b7a7389ca0154a16d165 - Reviewed-on: https://code.wireshark.org/review/395 - Reviewed-by: Pascal Quantin - -commit fcb0837 -Author: Stefan Metzmacher -Date: Wed Sep 19 20:21:49 2012 +0200 - - packet-smb: register a dissector on top of smb_direct - - Change-Id: I316b958c6a91dc333bcdb468368f2c19fe8845d6 - Old-Change-Id: I26a3088df12de9d74cf6c224b938003417b758f5 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/58 - Reviewed-by: Evan Huus - (cherry picked from commit d0d83e5b85173cd9fdc9001a2efb2f596124e2a2) - Reviewed-on: https://code.wireshark.org/review/389 - -commit 5d0be58 -Author: Stefan Metzmacher -Date: Wed Sep 19 20:21:49 2012 +0200 - - packet-smb2: register a dissector on top of smb_direct - - Change-Id: I6a87c57d513af9c8ce9dff783988f7242f5257d0 - Old-Change-Id: If52130f7f9e9783a8ecc8b8b3c01d86a02e4f946 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/57 - Reviewed-by: Evan Huus - (cherry picked from commit cd9f6e077fdbdde2462acea6b7906e153c8c4864) - Reviewed-on: https://code.wireshark.org/review/390 - -commit 8fe9187 -Author: Stefan Metzmacher -Date: Wed Sep 19 16:21:21 2012 +0200 - - packet-smb-direct.c: add initial implementation - - See [MS-SMBD] http://msdn.microsoft.com/en-us/library/hh536346.aspx - - Change-Id: If2cf719bdf5da82bc5f5e086dd69d02caff2166a - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/55 - Reviewed-by: Evan Huus - -commit 621a9c5 -Author: Gerald Combs -Date: Tue Feb 25 13:57:28 2014 -0800 - - Add back an anchor removed in gc55c57a. - - Change-Id: I9795278b759d1a965abd9b22dc023c70fce19b77 - Reviewed-on: https://code.wireshark.org/review/391 - Reviewed-by: Gerald Combs - -commit 9db0e02 -Author: Stefan Metzmacher -Date: Mon Aug 13 14:45:58 2012 +0200 - - packet-kerberos: remember in what frame a key was learned - - Change-Id: Icd05d4941fdacac44094fafbad07f08ec4cbe976 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/364 - Reviewed-by: Alexis La Goutte - -commit 98e6bb1 -Author: Stefan Metzmacher -Date: Mon Aug 13 08:59:22 2012 +0200 - - asn1/kerberos: remember in what frame a key was learned - - Change-Id: I8e64e1d02ee8b4dff3845e1b9ec8f56174e76fbf - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/363 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit d5c437e -Author: Evan Huus -Date: Tue Feb 25 16:44:29 2014 -0500 - - Fix function prototypes. - - Functions with no parameters must be written func(void). Fixes (some) of the - buildbots. - - Change-Id: I1a6e5c0553e032e99419fe67eb4b573bbdfe7fe6 - Reviewed-on: https://code.wireshark.org/review/388 - Reviewed-by: Evan Huus - -commit 7955654 -Author: Hadriel Kaplan -Date: Tue Feb 25 11:10:50 2014 -0500 - - Fix mergecap.c: Dereference of null pointer (clang analyzer) - - Change-Id: I89076388db8522c5fbdf72505f50e1380f1ab391 - Reviewed-on: https://code.wireshark.org/review/369 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit bd36fe1 -Author: Hadriel Kaplan -Date: Fri Feb 21 01:11:41 2014 -0500 - - Fix bug 6357: Lua all_field_infos() broken within tap/listener - - The current API for Lua provides a global function - "all_field_infos()" which returns all the populated field_info nodes - in the current proto_tree. - - By default all_field_infos() "works", in the literal sense: it returns - exactly the fields the previous dissectors of the packet have - populated at that instant of time. But of course dissectors don't - populate all the applicable fields most of the time, because of the - TRY_TO_FAKE_THIS_ITEM optimization where they don't fill in things - that aren't needed at the time by a display, color, or tap's dfilter. - - So this commit offers a way to force the dissectors to populate - all the applicable field_infos in the tree, by setting the proto_tree - to be visible. Obviously that is going to impact performance, since - it basically bypasses the TRY_TO_FAKE_THIS_ITEM optimization; so the - patch only does this if the Lua script author told it to explicitly, - by adding an argument to Listener.new() and register_postdissector(). - - Change-Id: I11d3559fbe8c14fbadf1b51415a3701dc1200b7b - Reviewed-on: https://code.wireshark.org/review/286 - Reviewed-by: Alexis La Goutte - -commit 860747e -Author: Hadriel Kaplan -Date: Tue Feb 18 10:03:04 2014 -0500 - - Adds some Lua helper functions: some commonly used functions, and to help troubleshooting Lua scripts - - There are some common things people need to do, such as convert to/from hex or get - the raw binary string in a ByteArray/Tvb/TvbRange. These have been added, as well - as some tests for them in the testsuites. Also, functions have been added to allow - a script to get all the available tap types and filter fields, since they are - not exactly what one can see in the Wireshark gui. - - Change-Id: I92e5e4eae713bb90d79b0c024eaa4e55b99cc96b - Reviewed-on: https://code.wireshark.org/review/249 - Reviewed-by: Alexis La Goutte - -commit 907a825 -Author: Hadriel Kaplan -Date: Tue Feb 25 11:05:17 2014 -0500 - - Fix file.c: Dereference of null pointer (clang analyzer) - - Change-Id: Ib96e5ffb284234562c2883c13e93109173e22179 - Reviewed-on: https://code.wireshark.org/review/368 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 5478483 -Author: Jeff Morriss -Date: Tue Feb 25 15:46:11 2014 -0500 - - Install git-review too. - - Change-Id: I65c98fe8e120ac3b416ca6749eb2b44c47664fb5 - Reviewed-on: https://code.wireshark.org/review/386 - Reviewed-by: Alexis La Goutte - -commit 11b5c15 -Author: Bill Meier -Date: Tue Feb 25 15:42:35 2014 -0500 - - Remove trailing whitespace - - Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 - Reviewed-on: https://code.wireshark.org/review/385 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit c55c57a -Author: Gerald Combs -Date: Tue Feb 25 12:22:50 2014 -0800 - - Add Git+Gerrit command line instructions. - - Add a Git+Gerrit command line example to the Developer's Guide. Convert - some Subversion text to Git. - - Skip building the Developer's Guide if we don't have a2x. - - Change-Id: I62e9e71eb3ffc07d8677df35b4b197f53f77b4f2 - Reviewed-on: https://code.wireshark.org/review/384 - Reviewed-by: Gerald Combs - -commit 34933eb -Author: Alexis La Goutte -Date: Tue Feb 25 19:46:17 2014 +0100 - - 802.11 : Add channel number custom (to display info when report channel number is 0 or 255) - - Fix also indent for other custom... - - Change-Id: Ic95b65d5217a0d1e967892ac2694f3ba749242fb - Reviewed-on: https://code.wireshark.org/review/379 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit f5ebc08 -Author: Alexis La Goutte -Date: Tue Feb 25 18:58:53 2014 +0100 - - 802.11: Regulatory Class => Operating Class (changed in 802.11-2012) - - Fix also typo for hf_ieee80211_tag_measure_request_regulatory_class wrong hf name... - - Change-Id: I49e582c7683e58abb8785958dcc043789fd79a26 - Reviewed-on: https://code.wireshark.org/review/378 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 2da9162 -Author: Michael Pergament -Date: Fri Feb 21 16:26:46 2014 +0100 - - Enhance BGP Dissector - Add - * BGP MPLS Based Ethernet VPN dissector (draft-ietf-l2vpn-evpn-05) - * PMSI Tunnel Attribut dissector (RFC6514) - - Change-Id: I02caa67fc371bbc9666f343e20fa678e8b029a59 - Reviewed-on: https://code.wireshark.org/review/296 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 75015e4 -Author: Guy Harris -Date: Tue Feb 25 11:53:44 2014 -0800 - - Can't register in a non-existent dissector table. - - This will have to wait until the SMB Direct dissector is actually - committed. There's no point in getting a bunch of "OOPS: dissector - table "smb_direct" doesn't exist" messages every time you run Wireshark - or TShark. - - Change-Id: I9772eb3f119822fbeaa78876570798d49bb4cab9 - Reviewed-on: https://code.wireshark.org/review/382 - Reviewed-by: Guy Harris - -commit 1084b88 -Author: Guy Harris -Date: Tue Feb 25 11:04:00 2014 -0800 - - Fix indentation. - - Change-Id: I2105c24a196ddd108925fd3ea29180aa8245dc1b - Reviewed-on: https://code.wireshark.org/review/381 - Reviewed-by: Guy Harris - -commit 1b046b7 -Author: Guy Harris -Date: Tue Feb 25 10:59:31 2014 -0800 - - The UMTS GTP QoS Profile is a UTF-8-encoded string. - - So use tvb_get_string_enc() with ENC_UTF_8|ENC_NA. - - Use tvb_reported_length() while we're at it. - - Change-Id: I75bfa9abb23ca411dca5844dd56fe062d16319e0 - Reviewed-on: https://code.wireshark.org/review/380 - Reviewed-by: Guy Harris - -commit 95e5a1d -Author: Evan Huus -Date: Tue Feb 25 13:37:58 2014 -0500 - - Use correct macro to really fix MacOSX buildbot - - Change-Id: Ibb7b13c0c9c5699642cda48522b34ace34c28b46 - Reviewed-on: https://code.wireshark.org/review/377 - Reviewed-by: Evan Huus - -commit 8ce395d -Author: Evan Huus -Date: Tue Feb 25 13:08:43 2014 -0500 - - Include old-gtk-compat.h to fix build. - - Change-Id: I3614e11fb0e76625b2b9686be423bf421c295e6f - Reviewed-on: https://code.wireshark.org/review/376 - Reviewed-by: Evan Huus - -commit 5a1aa01 -Author: Jeff Morriss -Date: Tue Feb 25 09:29:28 2014 -0500 - - Get rid of a few more Subversion remnants. - - Change-Id: I35ff651017e355f92b4f9e6388e90d446f245d0a - Reviewed-on: https://code.wireshark.org/review/361 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit cd02def -Author: Jeff Morriss -Date: Tue Feb 25 11:20:22 2014 -0500 - - Clean up some more subversion references in the documentation. - - Change-Id: Id6cf1a617bff3e09e47933a69d505393502874d1 - Reviewed-on: https://code.wireshark.org/review/370 - Reviewed-by: Pascal Quantin - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit cd9f6e0 -Author: Stefan Metzmacher -Date: Wed Sep 19 20:21:49 2012 +0200 - - packet-smb2: register a dissector on top of smb_direct - - Change-Id: If52130f7f9e9783a8ecc8b8b3c01d86a02e4f946 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/57 - Reviewed-by: Evan Huus - -commit d0d83e5 -Author: Stefan Metzmacher -Date: Wed Sep 19 20:21:49 2012 +0200 - - packet-smb: register a dissector on top of smb_direct - - Change-Id: I26a3088df12de9d74cf6c224b938003417b758f5 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/58 - Reviewed-by: Evan Huus - -commit 04bd19d -Author: Stefan Metzmacher -Date: Tue Sep 15 01:54:18 2009 +0200 - - packet-dcerpc-nt.c: fix a crash bug - - Change-Id: Ia8d167afc79c4fa1b2fa05b78152120203462b67 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/362 - Reviewed-by: Evan Huus - -commit 579e7e1 -Author: Michal Labedzki -Date: Sat Jan 18 15:20:02 2014 +0100 - - Wireshark: Add option to choose format type of capture file - - The best heuristic can fail, so add possibility to manually choose - capture file format type, so not correctly recognize file format can be - loaded in Wireshark. - - On the other side now it is possible to open capture file - as file format to be dissected. - - Change-Id: I5a9f662b32ff7e042f753a92eaaa86c6e41f400a - Reviewed-on: https://code.wireshark.org/review/16 - Reviewed-by: Michal Labedzki - Reviewed-by: Hadriel Kaplan - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit b6aae8d -Author: Hadriel Kaplan -Date: Tue Feb 25 09:17:00 2014 -0500 - - Change libsmi url and Lua version in macosx-setup.sh - - The libsmi url in macosx-setup.sh was dead, it's now an https site not ftp. - Also we were pulling down Lua 5.1.5 but should be pullsing down 5.2.3. - Lastly, macosx-setup cerates macosx-support-libs directory, which needs - to be ignored. - - Change-Id: I79dc833dbc54fda8b237c5ada64f3564ce4f4cde - Reviewed-on: https://code.wireshark.org/review/360 - Reviewed-by: Alexis La Goutte - -commit 605d9bb -Author: Jeff Morriss -Date: Tue Feb 25 09:44:28 2014 -0500 - - Delete tools/svnadd: it seems git doesn't need all this fancy properties stuff. - - Change-Id: Ibb1c713ba9e9b09f062753c232d006b3afd682f0 - Reviewed-on: https://code.wireshark.org/review/366 - Reviewed-by: Alexis La Goutte - -commit 93fe4d5 -Author: Bill Meier -Date: Tue Feb 25 11:27:32 2014 -0500 - - Remove trailing whitespace. - - Change-Id: Ia03a1cd4590aceda30ead4aa93ad413d90c6aea6 - Reviewed-on: https://code.wireshark.org/review/372 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 7db4bed -Author: Alexis La Goutte -Date: Sun Feb 23 18:59:16 2014 +0100 - - Fix packet-devicenet.c:619:17: error: will never be executed [-Werror,-Wunreachable-code] - - Change-Id: I3e7cc60e1844dcb1eab87060f6338bd4ba08e9b3 - Reviewed-on: https://code.wireshark.org/review/322 - Reviewed-by: Evan Huus - Reviewed-by: Jeff Morriss - -commit d3e03e9 -Author: Alexis La Goutte -Date: Sun Feb 23 19:23:33 2014 +0100 - - Fix packet-ieee80211.c:13115:7: error: will never be executed [-Werror,-Wunreachable-code] - - Change-Id: I0a87e6a2e9a819148a816ad1bc9da008b8cc1518 - Reviewed-on: https://code.wireshark.org/review/324 - Reviewed-by: Evan Huus - Reviewed-by: Jeff Morriss - -commit 7af7c87 -Author: Alexis La Goutte -Date: Sun Feb 23 19:26:05 2014 +0100 - - Fix packet-ipv6.c:585:13: error: will never be executed [-Werror,-Wunreachable-code] - - Change-Id: Ic2696aac59e001db1e4f62942680150a065ebbb1 - Reviewed-on: https://code.wireshark.org/review/326 - Reviewed-by: Evan Huus - Reviewed-by: Jeff Morriss - -commit 42188b9 -Author: Alexis La Goutte -Date: Sun Feb 23 19:25:21 2014 +0100 - - Fix packet-ip.c:579:9: error: will never be executed [-Werror,-Wunreachable-code] - - Change-Id: Id368fdb7025260cb1fc261f844eae8c018c65edd - Reviewed-on: https://code.wireshark.org/review/325 - Reviewed-by: Evan Huus - Reviewed-by: Jeff Morriss - -commit 692e7a2 -Author: Jeff Morriss -Date: Mon Feb 24 16:16:14 2014 -0500 - - Install git instead of subversion. - - Change-Id: I5da2c129fa120e461d4bb3199c1ec0e0b52c28a4 - Reviewed-on: https://code.wireshark.org/review/337 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Reviewed-by: Jeff Morriss - -commit 2f23977 -Author: Evan Huus -Date: Mon Feb 24 19:26:08 2014 -0500 - - More explanation of example heuristic code. - - Approach suggested by Jeff seems right to me: - https://www.wireshark.org/lists/wireshark-dev/201402/msg00198.html - - Change-Id: I3d54cb49e2f0027ee79f68a633f57382101241b5 - Reviewed-on: https://code.wireshark.org/review/350 - Reviewed-by: Evan Huus - -commit 42ce748 -Author: Guy Harris -Date: Tue Feb 25 02:00:29 2014 -0800 - - Just use proto_tree_add_item() for an EBCDIC string. - - Change-Id: Ic385926b5f4110253e3ab47984589d646707afa0 - Reviewed-on: https://code.wireshark.org/review/353 - Reviewed-by: Guy Harris - -commit 9815a25 -Author: Guy Harris -Date: Tue Feb 25 01:07:19 2014 -0800 - - Fix crash when exporting dissection summaries to a CSV file. - - The while loop in question ends with tmp_str being NULL; the next loop - processes the same string, so you have to set tmp_str to csv_str before - looping. - - Fix some comments while we're at it. - - Change-Id: I69dd7dc276e0cb11226eceee7921be87e3cc7534 - Reviewed-on: https://code.wireshark.org/review/352 - Reviewed-by: Guy Harris - -commit 92a369e -Author: Pascal Quantin -Date: Mon Feb 24 23:08:50 2014 +0100 - - Remove a few wrong use of tvb_get_string() - - Change-Id: I7095e12439fd8c0c5cd3ce14d19662efa3fd841f - Reviewed-on: https://code.wireshark.org/review/339 - Reviewed-by: Evan Huus - Reviewed-by: Pascal Quantin - -commit 53deb52 -Author: Alexis La Goutte -Date: Sun Feb 23 20:11:19 2014 +0100 - - Neighbor report (802.11k) may be have no subelement (len == 13) - - Fix some malformed frame from sample on Bug 9724 - - Change-Id: I0874c2aab57799426f13e18123b05a7e73c6a75f - Partialy-Bug:9724 - Reviewed-on: https://code.wireshark.org/review/340 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 5704884 -Author: Gerald Combs -Date: Mon Feb 24 15:58:47 2014 -0800 - - "tools" updates. - - Remove backport-change. It didn't work as well as I had hoped. Remove - backport-rev since we don't use Subversion any more. Remove DocBook - code from gen-bugnote. - - Change-Id: I70f39444c6cdd380301691f64d27147ac09e5cae - Reviewed-on: https://code.wireshark.org/review/348 - Reviewed-by: Gerald Combs - -commit 58db464 -Author: Pascal Quantin -Date: Mon Feb 24 23:27:52 2014 +0100 - - Remove executable bit from a few files - - Change-Id: Ib9be221e3d325379c8b665ab73d976254bb23bb6 - Reviewed-on: https://code.wireshark.org/review/342 - Reviewed-by: Pascal Quantin - -commit b7bd4ff -Author: Alexis La Goutte -Date: Sun Feb 23 17:09:30 2014 +0100 - - Fix -Wunused-const-variable found by Clang - - Change-Id: I57cfafea0e3110553ef03a34baad217f8109942d - Reviewed-on: https://code.wireshark.org/review/320 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 780cd80 -Author: Pascal Quantin -Date: Mon Feb 24 21:03:01 2014 +0100 - - Add ADB CS and Logcat dissectors to release notes - - Change-Id: I063cc38c156505922fa31eb67c176dc1cd6ecfa7 - Reviewed-on: https://code.wireshark.org/review/336 - Reviewed-by: Pascal Quantin - -commit 9b6f139 -Author: Alexis La Goutte -Date: Sun Feb 23 17:52:39 2014 +0100 - - Fix -Wunused-const-variable found by Clang - - Change-Id: I7fb2e6477cea26a5ee13dcc0610f7522ce211ae2 - Reviewed-on: https://code.wireshark.org/review/321 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit bf43e31 -Author: Tobias Brunner -Date: Mon Feb 24 15:39:27 2014 +0100 - - Use correct hash algorithms in ISAKMP (IKEv2) dissector - - Change-Id: Ia448f3cc5f5ffc8eafad73fdb0c3f3dd647342ef - Reviewed-on: https://code.wireshark.org/review/335 - Reviewed-by: Alexis La Goutte - -commit 7bd1467 -Author: Alexis La Goutte -Date: Sun Feb 23 20:05:04 2014 +0100 - - Fix Called C++ object pointer is null found by Clang - - Change-Id: I2263b4ac16945be6d87eaa8c963f7b03e437d724 - Reviewed-on: https://code.wireshark.org/review/319 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit dd4e5fc -Author: Pascal Quantin -Date: Sun Feb 23 23:36:11 2014 +0100 - - NAS EPS: fix dissection of CS service notification message - - Fixes bug 9789 - - Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee - Reviewed-on: https://code.wireshark.org/review/330 - Reviewed-by: Pascal Quantin - -commit a8676c2 -Author: Pascal Quantin -Date: Sun Feb 23 23:32:03 2014 +0100 - - Fix dissection of BCD numbers - - Do not use of tvb_get_string(): what we really want is the byte string, not an ASCII string - - Change-Id: I8b9a8b7ccacbdaf6d9525771ff8ed883ba01ad34 - Reviewed-on: https://code.wireshark.org/review/329 - Reviewed-by: Pascal Quantin - -commit 1678b0a -Author: Pascal Quantin -Date: Sun Feb 23 23:23:40 2014 +0100 - - Remove deprecated TVB APIs - - Change-Id: I87216c3bd2061c12ce486c752d4381ab722db95e - Reviewed-on: https://code.wireshark.org/review/328 - Reviewed-by: Pascal Quantin - -commit bdfa3e8 -Author: Gerald Combs -Date: Sun Feb 23 08:05:52 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-02-23] - - Change-Id: Ib8cee06ff9420f16566696ca7dd0efc97036c7dc - Reviewed-on: https://code.wireshark.org/review/316 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 83fc346 -Author: Evan Huus -Date: Sat Feb 22 14:16:44 2014 -0500 - - Documentation updates - - Change-Id: I6bd7fa40726fe7ffd68b9341c640874f2a0f1c7c - Reviewed-on: https://code.wireshark.org/review/314 - Reviewed-by: Alexis La Goutte - Reviewed-by: Christopher Maynard - Reviewed-by: Evan Huus - -commit 41fc5a5 -Author: Hadriel Kaplan -Date: Sat Feb 22 14:56:25 2014 -0500 - - Add note to .gitignore on how to ignore locally-specific files - - Also, this removes a couple locally-specific files I had previously added. - - Change-Id: Ib93e0dc5aeb062321e47f77a084b0581f87046c6 - Reviewed-on: https://code.wireshark.org/review/315 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit ce932fb -Author: Evan Huus -Date: Sat Feb 22 10:00:45 2014 -0500 - - Add some simple ISAKMP heuristics - - Hopefully fixes bug 9800. - - Change-Id: I69e1a0e39763a6e25eb18aed6b4a6a6217e22d14 - Reviewed-on: https://code.wireshark.org/review/312 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 88c34ec -Author: Alexis La Goutte -Date: Fri Feb 21 21:57:03 2014 +0100 - - Fix Called function pointer is null (null dereference) found by Clang - - ../../asn1/h248/packet-h248-template.c:1222:31: warning: Value stored to 'prop' is never read - if (!prop->dissector) prop = &no_param; - - Change-Id: I6d380fbb5fef9dc548385b0b470aea1cb3c34df1 - Reviewed-on: https://code.wireshark.org/review/301 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit cfeae2f -Author: Hadriel Kaplan -Date: Fri Feb 21 16:07:20 2014 -0500 - - Fix clang warning regarding null pointer use in packet-sip.c. - - In malformed sip-sec header fields, missing spi-c/spi-s values will - cause thie 'value' pointer to remain NULL, leading to bad things. - This fix checks for that and adds an expert warning about malformed - sip-sec mechanism. - - Change-Id: Ia7d1741fc8d829dd14e5c68f21fa99282eddbeab - Reviewed-on: https://code.wireshark.org/review/299 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 22149c5 -Author: Evan Huus -Date: Sat Feb 22 08:39:57 2014 -0500 - - TVB API deprecations and cleanup - - - rename tvb_length and similar to tvb_captured_length and similar; leave - #defines in place for backwards-compat, but mark them clearly as deprecated in - code comments and in checkAPI - - remove tvb_get_string as C code and just leave a #define in place for - backwards-compat; mark it clearly as deprecated in code comment and checkAPI - - update READMEs and sample dissector for all of the above - - while in the neighbourhood, make checkAPI skip (and warn) for missing files - instead of bailing on the whole check, so subsequent files still get checked - - Change-Id: I32fc437896ca86ca73e9b49d5f50400adf8ec5ad - Reviewed-on: https://code.wireshark.org/review/311 - Reviewed-by: Evan Huus - -commit 00cc94b -Author: Guy Harris -Date: Fri Feb 21 16:47:55 2014 -0800 - - Add bug 9492. - - Change-Id: I412d5c56848f2a19c8bf2c2e50f1ad1db86ce793 - Reviewed-on: https://code.wireshark.org/review/306 - Reviewed-by: Guy Harris - -commit 504eee7 -Author: Guy Harris -Date: Fri Feb 21 15:55:13 2014 -0800 - - Cleanup the automatically-generated fields to match the rest. - - Change-Id: I217d5c390c806dfa28c7e9ff155ef927ed2a9111 - Reviewed-on: https://code.wireshark.org/review/303 - Reviewed-by: Guy Harris - -commit 4b28a98 -Author: Gerald Combs -Date: Fri Feb 21 13:27:57 2014 -0800 - - Update the "latest version" URL in manuf/manuf.tmpl. - - Regenerate manuf. I *really* wish Gitweb URLs were less ugly. - - Change-Id: I51eabe1a028999859499466a9369106f465dec80 - Reviewed-on: https://code.wireshark.org/review/300 - Reviewed-by: Gerald Combs - -commit 7f07436 -Author: Hadriel Kaplan -Date: Thu Feb 20 21:12:25 2014 -0500 - - Fix bug 9790: Lua: wslua allows duplicate field registration - - As discussed in bug 3513 and 9709, one can register more than one new ProtoFields for - the same field name. Of course C-code can do that too, and does a LOT apparently, but - if they're not similar ftypes then things can get scrweed up in display filters. - - So this change prevents duplicate field registration of dissimilar ftypes. The - similarity is based on the discussion on the mailing list, and the listing in - README.developer has been updated to refelect that as well. - - Also, this change adds a testscript for Proto/ProtoFields. - - Change-Id: I43bd323f785245941a21289647332a19adec2a9d - Reviewed-on: https://code.wireshark.org/review/285 - Reviewed-by: Evan Huus - -commit 1b210e9 -Author: Alexis La Goutte -Date: Fri Feb 21 20:08:30 2014 +0100 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I05ca21d94bbaa8c92a33f02ceb100c206c198052 - Reviewed-on: https://code.wireshark.org/review/298 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit e009dc9 -Author: Alexis La Goutte -Date: Fri Feb 21 19:53:15 2014 +0100 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: Ic3a240a2e751700f653287dd84fe58016adab9e2 - Reviewed-on: https://code.wireshark.org/review/297 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit e1b2655 -Author: Matthieu Texier -Date: Fri Feb 21 15:36:07 2014 +0100 - - Moving custer list/cluster id attribut to items - - Change-Id: If23c530b10c67613311aa8a8a1b1a8acf95f3c48 - Reviewed-on: https://code.wireshark.org/review/294 - Reviewed-by: Evan Huus - -commit 95190e4 -Author: Roland Knall -Date: Fri Feb 21 10:02:34 2014 +0100 - - EPL + openSAFETY: Better handling of guint in EPL - - This is a permanent solution for bug #9786. guint overflows - are now prevented, and the remaining length is queried from - tvb and taken into consideration. - - As a side-effect, the fix brought up two bugs in the openSAFETY - dissector, which where fixed as well. - - Upd: Remove stdio.h and fix one encoding error found by - fix-encoding-args.pl - - Change-Id: Ic2d478a8ea15b0bcfd2536a074c217daf610fe08 - Reviewed-on: https://code.wireshark.org/review/291 - Reviewed-by: Roland Knall - Reviewed-by: Evan Huus - -commit caaac7e -Author: Alexis La Goutte -Date: Fri Feb 21 17:25:07 2014 +0100 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I329fd1cec092e425dd0f6c2c1992d278dcdba743 - Reviewed-on: https://code.wireshark.org/review/293 - Reviewed-by: Alexis La Goutte - -commit 696353c -Author: Hadriel Kaplan -Date: Mon Feb 17 11:45:57 2014 -0500 - - Add test suite for verifying Lua global variables/tables of previous releases have not disappeared. - - Several bugs have been introduced due to changing of perl scripts or #define names, such - that things exported into Lua have dissapeared or changed unintentionally. This commit - adds a test suite which compares the Lua global table with the ones from previous - releases (1.8 and 1.10), to verify nothing has gone missing. New items can be added, but - old ones cannot go away. The added script to verify these things, called 'verify_globals.lua', - also has the ability to display what's new - i.e., what was not in the olrder releases. - - Lastly, this commit also fixes a bug: MENU_STAT_ENDPOINT became MENU_STAT_ENDPOINT_LIST - due to a change in the make-init-lua.pl perl script in this 1.11 release. - - Change-Id: Iba143d1a436e706970635a5f8cc2b317955392bf - Reviewed-on: https://code.wireshark.org/review/284 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit fe64c46 -Author: Guy Harris -Date: Thu Feb 20 23:33:13 2014 -0800 - - And we need wslua_internals.obj as well. - - Sort the list to match the .c list while we're at it, to make it easier - to check for errors. - - (Why isn't this done with a Makefile.common file?) - - Change-Id: I239964d53be9e48bddbd6180aabe118b5cac1fd0 - Reviewed-on: https://code.wireshark.org/review/287 - Reviewed-by: Guy Harris - -commit 8d64656 -Author: Guy Harris -Date: Thu Feb 20 19:05:14 2014 -0800 - - Need to include wslua_internals.c here as well. - - Change-Id: Ibae7e4473ad0131e399423ee9faba5ad759feaed - Reviewed-on: https://code.wireshark.org/review/283 - Reviewed-by: Guy Harris - -commit 431dc82 -Author: Guy Harris -Date: Thu Feb 20 18:59:44 2014 -0800 - - Fix warnings - index() is declared as a function in some systems. - - Change-Id: If9ee9f0decc0a9d7971095109e1012b015a9dc96 - Reviewed-on: https://code.wireshark.org/review/282 - Reviewed-by: Guy Harris - -commit 3f2be6d -Author: Evan Huus -Date: Fri Feb 21 02:16:43 2014 +0000 - - Revert "Add test suite for verifying Lua global variables/tables of previous releases have not disappeared." - - This reverts commit 5b7f00178f45149ecdce204f1c71c1598ceedac1. - - Change-Id: Idf09d25270847970713b67d02bcd7cbc411a4e9c - Reviewed-on: https://code.wireshark.org/review/280 - Reviewed-by: Evan Huus - -commit 5b7f001 -Author: Hadriel Kaplan -Date: Mon Feb 17 11:45:57 2014 -0500 - - Add test suite for verifying Lua global variables/tables of previous releases have not disappeared. - - Several bugs have been introduced due to changing of perl scripts or #define names, such - that things exported into Lua have dissapeared or changed unintentionally. This commit - adds a test suite which compares the Lua global table with the ones from previous - releases (1.8 and 1.10), to verify nothing has gone missing. New items can be added, but - old ones cannot go away. The added script to verify these things, called 'verify_globals.lua', - also has the ability to display what's new - i.e., what was not in the olrder releases. - - Lastly, this commit also fixes a bug: MENU_STAT_ENDPOINT became MENU_STAT_ENDPOINT_LIST - due to a change in the make-init-lua.pl perl script in this 1.11 release. - - Change-Id: Ic46172904256dc535b0fe4543237c07dddb3b9b5 - Reviewed-on: https://code.wireshark.org/review/242 - Reviewed-by: Evan Huus - -commit 9246a70 -Author: Hadriel Kaplan -Date: Wed Feb 19 03:22:55 2014 -0500 - - Cleanup on aisle 5: normalizes the Lua code to follow common schema/model - - Over time the various wslua classes/functions have gotten moldy, with different - ways of doing similar things. Some of it can't be changed without breaking - backwards compatibility for Lua scripts, so I didn't do that. But I did what - I could. The biggest change is a refactoring of how accessors/attributes - are handled in the code, so that most of them work the same way using the - same code. - - Specific changes made: - * Added null/expired checking macro to class declarations for many classes - * Removed extraneous pointer/expired checking, since checkFoo() does that already - * Fixed "errors" reported by clang static analyzer; they were false positives, but it was easier to get it to stop complaining by changing the code - * Moved internal wslua functions from wslua_utils.c into a new 'wslua_internals.c' file - * Changed Listener/NSTime/Pinfo/Proto to use a common setter/getter accessor/attribute code model, instead of each of them doing their own - * Fixed some API doc mistakes, mostly around attributes that were documented as read-only but were actually read-write - - Change-Id: Idddafc5fbd3545ebff29e063acc767e1c743a1a9 - Reviewed-on: https://code.wireshark.org/review/271 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit c65fbff -Author: Guy Harris -Date: Thu Feb 20 17:50:52 2014 -0800 - - Force "printing" if -T is specified, even if -w is also specified. - - Just as "tshark ... -P -w xxx" writes raw packets to xxx *and* writes - text packet summaries to the standard output, and just as "tshark ... - -V -w xxx" writes raw packets to xxx *and* writes text packet details to - the standard output, so should "tshark ... -T fff -w xxx" write raw - packets to xxx *and* write whatever "-T fff" (and any "-e" options) - specifies to the standard output. - - Change-Id: I28ab3a4d48531f297533ec4dfb3742031eb69885 - Reviewed-on: https://code.wireshark.org/review/278 - Reviewed-by: Guy Harris - -commit dd4daf5 -Author: Evan Huus -Date: Thu Feb 20 18:51:46 2014 -0500 - - Try a simpler method of fixing 32/64 issues - - It appears we're only working on four chars anyways, so the cast to gint should - be safe. - - Reverts 602d7d3d39f26b06bcfa25bf9580cfd652a7eee7 - - Change-Id: Ice101fea7dd7fe4cc65f0d673210c0c791cbe1c5 - Reviewed-on: https://code.wireshark.org/review/277 - Reviewed-by: Evan Huus - -commit 3b57455 -Author: Evan Huus -Date: Thu Feb 20 18:14:58 2014 -0500 - - Fix more 32/64 casting errors - - Change-Id: I13a3a19738dd5933d9e19045fc188bb8e2f04fe0 - Reviewed-on: https://code.wireshark.org/review/275 - Reviewed-by: Evan Huus - -commit 602d7d3 -Author: Evan Huus -Date: Thu Feb 20 18:06:15 2014 -0500 - - g_ascii_strtoull returns a gint64 - - fixes build errors on certain 32-bit systems - - Change-Id: I6476107aa753b670df6bede0ce15ea6760e52aeb - Reviewed-on: https://code.wireshark.org/review/274 - Reviewed-by: Evan Huus - -commit b7985c5 -Author: Evan Huus -Date: Thu Feb 20 17:16:08 2014 -0500 - - Fix mode for lua test suite - - Change-Id: If516472ca9c4a0ae84da22a0ecfc9449f0495cbb - Reviewed-on: https://code.wireshark.org/review/273 - Reviewed-by: Evan Huus - -commit 4c100fe -Author: Peter Lemenkov -Date: Thu Feb 20 15:50:09 2014 +0400 - - Initial basic RTPproxy-ng dissector - - Initial basic RTPproxy-ng dissector which uses bencode packing. - - Change-Id: I5b3e9f6e745977b3df12263c3a9f4ee9a3e1445e - Signed-off-by: Peter Lemenkov - Reviewed-on: https://code.wireshark.org/review/268 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit b14cf15 -Author: Michal Labedzki -Date: Sun Feb 9 16:32:08 2014 +0100 - - Android: Add support for ADB Client-Server protocol - - ADB Client-Server Protocol is protocol between adbd - (ADB Daemon aka Server) and adb client (aka adb). - Typically you can find it on "lo" interface over TCP protocol. - - Change-Id: Iad008560c983f5ede554e1eaa728d703aae95eed - Reviewed-on: https://code.wireshark.org/review/233 - Reviewed-by: Evan Huus - -commit 5ae2326 -Author: Bill Meier -Date: Thu Feb 20 16:44:56 2014 -0500 - - Fix "off by 1" bug in dissection of OPTION_AFTR_NAME introduced in 0548a7d5. - - Change-Id: I461601cd952f1c4d27a004c0a65cfefe82dc0f49 - Reviewed-on: https://code.wireshark.org/review/272 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit fe769e7 -Author: Hadriel Kaplan -Date: Thu Feb 20 10:12:33 2014 -0500 - - Add 4 more test scripts for Lua, and its own testsuite menu - - This adds test scripts for verifying Pinfo, Address, Field, FieldInfo, NSTime - and Listener classes/functions. It also moves Lua test scripts out of - unittests and into its own new testsuite. - - Change-Id: I65c238fd459efb96db3f8f9145842cd038dea7c7 - Reviewed-on: https://code.wireshark.org/review/270 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit d574fd8 -Author: Michal Labedzki -Date: Sun Feb 16 17:01:45 2014 +0100 - - Add support for Bluetooth Linux Monitor - - BlueZ 5/Linux Kernel introduced new way to sniffing Bluetooth interfaces. - We are ready to use it. Libpcap provide new interface called - "bluetooth-monior". - - Also fix trivial typos. - - Change-Id: Ic608a3d8553bbebbb21f2733ec92c758cbf8f707 - Reviewed-on: https://code.wireshark.org/review/253 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 9a05640 -Author: Hadriel Kaplan -Date: Thu Feb 20 09:55:46 2014 -0500 - - Fix Bug 9792: 'Lua: setting pinfo.dst_port actually sets src_port' - - Setting the Pinfo.dst_port to a value actually changes the src_port's value, - due to a bug in wslua_pinfo.c, where both src_port and dst_port attributes use - the PARAM_PORT_SRC for their setter type enum. - - Change-Id: I1b84ba8b343ec857d04a2d0809e16f17ba2a43e8 - Reviewed-on: https://code.wireshark.org/review/269 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 1fd434e -Author: Michal Labedzki -Date: Tue Feb 18 13:07:16 2014 +0100 - - Add missing SBC library to cmake build - - Change-Id: I4eb2dacc196b8feef62ff633322c53c04f78fc92 - Reviewed-on: https://code.wireshark.org/review/252 - Reviewed-by: Michal Orynicz - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 2e1f112 -Author: Alexis La Goutte -Date: Tue Feb 18 14:45:33 2014 +0100 - - Enhance pre-commit tools to avoid false positive - - Limit check to file with extension *.c or *.h - - Change-Id: I6e237e6fd053083d271924120973a6b07e2d4e53 - Reviewed-on: https://code.wireshark.org/review/247 - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit 64b4746 -Author: Matthieu Texier -Date: Wed Feb 19 19:16:02 2014 +0100 - - BGP : clean up of unused define and adding amount of ext-communities in community item - - Change-Id: I55793e522d0bdaee0f19ca020a8ef0097f5fb5f1 - Reviewed-on: https://code.wireshark.org/review/255 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit b26c445 -Author: Irene Rüngeler -Date: Wed Feb 19 15:39:13 2014 +0100 - - Limit the range to the TSNs provided. - - Change-Id: Ibf72fb60d06baa7a9590a303f2e10e5a86c61093 - Reviewed-on: https://code.wireshark.org/review/254 - Reviewed-by: Michael Tüxen - -commit dc53a65 -Author: Bill Meier -Date: Wed Feb 19 23:44:14 2014 -0500 - - Fix minor bug; Use a consistent whitespace & formatting style; add extended value-string. - - Bug fix: don't call col_...() under 'if (tree)' - - Change-Id: I5f586f16f0e64b30da49fbbb0bb8e41b04ba8833 - Reviewed-on: https://code.wireshark.org/review/267 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 9e00e02 -Author: Martin Kaiser -Date: Wed Feb 19 23:16:38 2014 +0100 - - fix endless loop - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9786 - - Change-Id: I336f2bcc14596d64ad2e3f3e8140269996e077f5 - Reviewed-on: https://code.wireshark.org/review/260 - Reviewed-by: Martin Kaiser - -commit 2bb54d5 -Author: Bill Meier -Date: Wed Feb 19 15:51:23 2014 -0500 - - Create/Use some extended value strings. - - Change-Id: I750d04a25a4f7d600e4156aaac4a4580a1f7a345 - Reviewed-on: https://code.wireshark.org/review/259 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 5a775b1 -Author: Bill Meier -Date: Wed Feb 19 15:48:56 2014 -0500 - - Fix incorrect definition and use of a val64_string which caused a crash. - - Change-Id: Ib15ddef167c0e2af24938fc5bb68839eac65ca2c - Reviewed-on: https://code.wireshark.org/review/258 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 0548a7d -Author: Bill Meier -Date: Wed Feb 19 12:57:54 2014 -0500 - - Simplify/improve handling of FQDN field in various options; Fix some minor bugs. - - Details: - - Use dhcpv6_domain() to handle dissection of certain FQDN fields: - + OPTION_AFTR_NAME: Don't use get_dns_name(); It allows "compression" - which is not valid forthis field. - + OPTION_CCCV6_IETF_PROV_SRV: Replace use of swap_field_length_with_char(); - Fix bug which caused invalid "expert" message. - + OPTION_CCCV6_KRB_REALM: Remove validation; replace use of swap_field_length_with_char(). - - - Allow filtering for each different FQDN field (rather than using a generic "dhcpv6.domain" - for the various FQDN fields). - - - Fix some bugs in the display of the dissection for NTP_SERVER_OPTION; - - Add some "XXX ToDo" comments. - - Add some comments as the to specific RFC for certain options; - - Note that RFC 4075 is now "deprecated"; - - CL-SP-CANN-DHCP-Reg: version I10 is the latest as Feb 2014. - - Change-Id: I82edafb8293b71037b84629406ce609f9a835f04 - Reviewed-on: https://code.wireshark.org/review/257 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 0d244ee -Author: Bill Meier -Date: Mon Feb 17 00:43:57 2014 -0500 - - Remove code which dissects CableLabs options 17.2170.3 thru 17.2170.9 - inasmuch as these options don't exist per the spec. - - See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9690 - (especially comment #5). - - Change-Id: Iab757a71fe1865bbd0b97443512bf947f027dbe1 - Reviewed-on: https://code.wireshark.org/review/256 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit cfe488b -Author: Widok -Date: Wed Feb 19 14:27:46 2014 +0100 - - Bug 9721 - profinet write doesn't decode the Profidrive value Type correct - removed win-setup.sh.bak - Signed-off-by: Widok - Change-Id: I4ec65ef10ca794cd5b43fa66502edd4533c356d1 - Reviewed-on: https://code.wireshark.org/review/198 - Reviewed-by: Evan Huus - -commit 622d259 -Author: Martin Kaiser -Date: Tue Feb 18 22:48:16 2014 +0100 - - the gif version string is 7bit ASCII - - Change-Id: I1e827ad4d2cf64411c5a87f4710235dc4d6efc35 - Reviewed-on: https://code.wireshark.org/review/250 - Reviewed-by: Martin Kaiser - -commit 9fd19dd -Author: Alexis La Goutte -Date: Tue Feb 18 14:45:07 2014 +0100 - - Fix indent (use tabs) - - Change-Id: I45f5e2ed64090947f1605db10eb6cee0e33782bf - Reviewed-on: https://code.wireshark.org/review/248 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 1115889 -Author: Alexis La Goutte -Date: Tue Feb 18 09:03:50 2014 +0100 - - Fix Branch condition evaluates to a garbage value found by Clang Analyzer - - Change-Id: I745f838a763e5cc89e1b9c0536ad3cb299b00786 - Reviewed-on: https://code.wireshark.org/review/245 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 8a1cead -Author: Alexis La Goutte -Date: Tue Feb 18 14:21:25 2014 +0100 - - Fix typo in name of Radio Type 802.11b (in IEEE802.11 WTP Radio Information) - - Found by Massimo Vellucci - - Change-Id: Ibbe2d0a4d1e421e647028262baf0398d05905c8d - Reviewed-on: https://code.wireshark.org/review/246 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit ff0468f -Author: Michal Labedzki -Date: Sun Feb 9 18:35:08 2014 +0100 - - Add Logcat to Exported PDU - - Logcat can be exported from ADB over USB or ADB over TCP where can occur - multiple Logcat PDUs in one frame. - - Change-Id: I290fa131e5600c62357e5be4e76096ea5c35364b - Reviewed-on: https://code.wireshark.org/review/234 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 4624d6d4 -Author: Michal Labedzki -Date: Sun Feb 9 18:01:41 2014 +0100 - - Android: Add support for Logcat dissector - - Supported is Binary Logcat/Logger, aka adb logcat -Bf /sdcard/log.logcat - - Change-Id: I883c6d746ec4fe67ef4ce15ca4227adce407fb76 - Reviewed-on: https://code.wireshark.org/review/232 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 8c608e6 -Author: Jeff Morriss -Date: Mon Feb 17 22:02:21 2014 -0500 - - Remove $Id$ from the ASN.1 dissectors and regenerate them. - - Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954 - Reviewed-on: https://code.wireshark.org/review/244 - Reviewed-by: Jeff Morriss - Tested-by: Jeff Morriss - -commit ff52d8b -Author: Alexis La Goutte -Date: Mon Feb 17 21:37:03 2014 +0100 - - BGP : Update Capability Codes - - From IANA page: http://www.iana.org/assignments/capability-codes/capability-codes.xhtml - Use decimal value (like iana page) - Fix Dynamic Capability value... - - Change-Id: I9a6e672de840403943792b6ba4d913b186b1d09f - Reviewed-on: https://code.wireshark.org/review/243 - Reviewed-by: Evan Huus - -commit 4cea550 -Author: Alexis La Goutte -Date: Sun Feb 16 19:13:29 2014 +0100 - - R to restart does not work [Wireshark Qt] - - From me : Add reload action - - Change-Id: Ic47e3ff1ae0c1cc0ae8c40e5019dea9906612f90 - Partial-Bug: 9003 - Reviewed-on: https://code.wireshark.org/review/238 - Reviewed-by: Evan Huus - -commit 3aaa131 -Author: Alexis La Goutte -Date: Sun Feb 16 20:13:10 2014 +0100 - - On 'You have unsaved packets' dialog, expected D or D to use as accelerator to discard and S or S of save [Wireshark Qt]. - - From me : Add window title and fix missing text (Do you want to ....) - - Change-Id: I1448d7b85ad9490a92dac7e89d9fd2fdb51a145e - Partial-Bug: 9003 - Reviewed-on: https://code.wireshark.org/review/239 - Reviewed-by: Evan Huus - -commit 7447cd8 -Author: Alexis La Goutte -Date: Sun Feb 16 19:12:10 2014 +0100 - - Menu cannot be reached using accelerators, for example does not open File [Wireshark Qt]. - - Change-Id: I8a67d435510d5604bb501872f264cce4ba23595d - Partial-Bug: 9003 - Reviewed-on: https://code.wireshark.org/review/237 - Reviewed-by: Evan Huus - -commit 5e27a39 -Author: Michal Labedzki -Date: Sun Feb 16 11:12:35 2014 +0100 - - Add Bluetooth SBC Codec support in cmake - - SBC Codec can be optionally linked with Wireshark to provide - ability to playing RTP/SBC stream by RTP Player. - - Change-Id: Iffbae16a741ffbfd0fb55a300064739d2c27c2e5 - Reviewed-on: https://code.wireshark.org/review/223 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 49abfc4 -Author: Alexis La Goutte -Date: Mon Feb 17 12:20:34 2014 +0100 - - Display the number of unknown BGP Path Attribut (use val_to_str) - - Change-Id: I6aed8ee3a92cc08aebfef58372285bed5a62e8bd - Reviewed-on: https://code.wireshark.org/review/240 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 0fd6782 -Author: Bill Meier -Date: Sun Feb 16 13:18:34 2014 -0500 - - Add config.cache to .gitignore - - Change-Id: Ic1a5d06f9a0bea4ea10cd009000d5074541bec2a - Reviewed-on: https://code.wireshark.org/review/236 - Reviewed-by: Bill Meier - Tested-by: Bill Meier - -commit 2038406 -Author: Gerald Combs -Date: Sun Feb 16 08:05:39 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-02-16] - - Change-Id: I94453e0ca00d8eaf6877d1b9c2a529431582f08d - Reviewed-on: https://code.wireshark.org/review/229 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 8c72070 -Author: Michal Labedzki -Date: Sun Feb 16 12:14:40 2014 +0100 - - Bluetooth: AVDTP: Fix byte order - - AVDTP does not specify byte order of protocol, but define that at byte level - (MSB/LSB). Moreover: Codec VendorId is in Little Endian and this patch fix that. - - Change-Id: I91d8e9321e9909cb07d92d3df348ab6e1e5b1e1b - Reviewed-on: https://code.wireshark.org/review/222 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit fa02368 -Author: Alexis La Goutte -Date: Sun Feb 16 13:21:33 2014 +0100 - - EDNS0 DO bit in Z field is decode incorrect - - Z field of edns0 in Additinal records is decoded to text description incorrectly (wrong bitmask) - - Found by Jittinan Suwanrueangsri - Closed-Bug: 9767 - - Change-Id: I8171b211cce79cb096a0f354764992f5cb18617c - Reviewed-on: https://code.wireshark.org/review/226 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 1995e42 -Author: Alexis La Goutte -Date: Sun Feb 16 12:41:02 2014 +0100 - - Stack overflow after selecting data when filter is applied that has no results (Wireshark Qt) - - Fix - 0x00000000004a480e in PacketList::contextMenuEvent (this=0xbbb460, event=0x7fffffffd270) - at ui/qt/packet_list.cpp:485 - 485 if (cap_file_->edt->pi.ipproto == IP_PROTO_SCTP) - - Closed-bug : 9769 - - Change-Id: I1a657d7208a10c829b2dfe90abb168eff93cd268 - Reviewed-on: https://code.wireshark.org/review/224 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 4ca528f -Author: Evan Huus -Date: Sun Feb 16 09:05:19 2014 -0500 - - Add explicit casts to fix OSX10.5 Buildbot - - Change-Id: I13fa3d6af3d0fddc367835fc05efdbe106b991e6 - Reviewed-on: https://code.wireshark.org/review/228 - Reviewed-by: Evan Huus - -commit 4f7d3ea -Author: Alexis La Goutte -Date: Sun Feb 16 14:41:07 2014 +0100 - - Fix indent (use tabs) and add modelines info - - Change-Id: I2a25cc406a8c52b14ed5a0fb3cf906b1a8da5a18 - Reviewed-on: https://code.wireshark.org/review/227 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 6010481 -Author: Alexis La Goutte -Date: Sun Feb 16 12:50:44 2014 +0100 - - Rx ACK packets are displayed with transposed Interface MTU and Max MTU fields - - Found by David Howells - - Change-Id: Ic86e44b528069be8e43c1262c68afedcd159de23 - Closed-bug: 9762 - Reviewed-on: https://code.wireshark.org/review/225 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit c0a0805 -Author: Evan Huus -Date: Fri Feb 14 16:49:21 2014 -0500 - - Remove emem tree code entirely, it is unused. - - Depends on I1cedc611c9b7888eb671cf858c6f7819d37afba9 - - Change-Id: I5dda2f7c34eacb6f350473791df1d74ea4b4a749 - Reviewed-on: https://code.wireshark.org/review/220 - Reviewed-by: Michael Mann - -commit f7d2163 -Author: Evan Huus -Date: Fri Feb 14 16:44:08 2014 -0500 - - Replace last use of emem trees with GHashTables - - Change-Id: I1cedc611c9b7888eb671cf858c6f7819d37afba9 - Reviewed-on: https://code.wireshark.org/review/219 - Reviewed-by: Michael Mann - -commit b24339e -Author: Evan Huus -Date: Fri Feb 14 14:10:49 2014 -0500 - - Disable tfshark taps for now. - - Should fix build issue and none of the current taps are relevant to tfshark - anyways. - - Change-Id: I29168e0b296cd64fe3783de63e1fdd2a472ee6d3 - Reviewed-on: https://code.wireshark.org/review/218 - Reviewed-by: Gerald Combs - Reviewed-by: Evan Huus - -commit 7878878 -Author: Evan Huus -Date: Fri Feb 14 11:16:27 2014 -0500 - - Move lua struct license to top of file. - - It isn't picked up by licensecheck at bottom of file. - - Change-Id: Ifa8302f90dc44eacd3722efca2471101902457a0 - Reviewed-on: https://code.wireshark.org/review/217 - Reviewed-by: Evan Huus - -commit 627069c -Author: Roland Knall -Date: Wed Feb 12 16:04:18 2014 +0100 - - openSAFETY: Reduce overload and display gap data - - Up until now, openSAFETY hooked into a heuristic filter for epl - and dissected the whole package, handing back some epl header - information by calling epl again. This was time-consuming and - on a busy network led to an increase in dropped packages and - memory usage, as well as unresponsivness. - - This patch only takes the payload data of epl frames, and - therefore greatly reduces the dissection overhead of openSAFETY. - - On a second note, intergap data between safety frames is now - being displayed as Data, but only if the option for doing so - is specifically enabled in the openSAFETY preferences, as it - changes the behaviour of the dissector output. - - Upd: Because of the gap handling, some frames where marked - as being truncated, although they were not, or did not contain - openSAFETY frames at all. In the course of the fix for this, - the byte copying for the byte swap with MBTCP has been moved - to only occur when needed, and is additionaly guarded. - - Upd2: Identation and comment fixes - - Upd3: Change memcpy to memdup and move find_dissector ( "data" ) - to proto_reg_handoff - - PLK: Store data dissector pointer - - Move the if-clause to proto_reg_handoff as documented - in comment of Change-id: 191 - - Change-Id: I3038ed465900a2b5e63b3a0967abd62a4c66f318 - Reviewed-on: https://code.wireshark.org/review/191 - Reviewed-by: Roland Knall - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 5c1a348 -Author: Alexis La Goutte -Date: Fri Feb 14 16:02:31 2014 +0100 - - Make checkAPI Happy - - Change-Id: I885fb33685eb0ff06a1cf97e6cd671e6b6ee2eaa - Reviewed-on: https://code.wireshark.org/review/215 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 353163c -Author: Alexis La Goutte -Date: Wed Feb 12 22:33:09 2014 +0100 - - Add new IEEE802.11 CAPWAP message type from RFC5416 - * Add WLAN - * Assigned WTP BSSID - * Delete Wlan - - From SmartCAPWAP Bug #9752 - - Change-Id: I22fe8366e824a3ec3d3cd09887f0328141c30a69 - Reviewed-on: https://code.wireshark.org/review/214 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 45c5c6c -Author: Alexis La Goutte -Date: Fri Feb 14 12:50:39 2014 +0100 - - Update list SSL Cipher suite : The Salsa20 Stream Cipher for Transport Layer Security - - http://tools.ietf.org/html/draft-josefsson-salsa20-tls - - Change-Id: I9a31dc0306f71cd57d9c6593ea1f0619398c65c0 - Reviewed-on: https://code.wireshark.org/review/212 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 225c524 -Author: Alexis La Goutte -Date: Fri Feb 14 12:37:40 2014 +0100 - - Update list SSL Cipher suite : ChaCha20Poly1305 for TLS - - http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305 - - Used by Google Chrome and Google Web Server - - Change-Id: I615a821962b5d25190a11c30e2b7717f1d285289 - Reviewed-on: https://code.wireshark.org/review/211 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 3a4f762 -Author: Owen Williams -Date: Thu Feb 13 21:25:17 2014 +0000 - - New RTCP REMB dissector – Bug 9757 - - Change-Id: I0f455f58bdec8dc3787da96a3bfc43ac41dc48f8 - Reviewed-on: https://code.wireshark.org/review/202 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit d12011a -Author: Alexis La Goutte -Date: Fri Feb 14 13:36:11 2014 +0100 - - Fix build on Windows - - wslua_struct.c(431) : error C2220: warning treated as error - no 'object' file generated - wslua_struct.c(431) : warning C4244: '=' : conversion from 'lua_Number' to 'size_t', possible loss of data - - Change-Id: Id8b7a77eb123232116223077175d243195c8d4fa - Reviewed-on: https://code.wireshark.org/review/213 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit c4f1777 -Author: Hadriel Kaplan -Date: Sun Feb 2 22:49:30 2014 -0500 - - Adds support for Lua struct library so one can pack/unpack binary structures - - This is based on Roberto Ierusalimschy's struct library, along with additional - options based on Flemming Madsen's patch to the lua-users mailing list, and - some changes I made to support 64-bit integer packing/unpacking. Details - are in the top comments for wslua_struct.c. This also includes a test script. - - Change-Id: Ifcd0116ba013d5c760927721c8d6e9f28965534b - Reviewed-on: https://code.wireshark.org/review/98 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 7a50370 -Author: Jeff Morriss -Date: Thu Feb 13 19:23:04 2014 -0500 - - Add some asn1 files to .gitignore. - - (Now doing "make -C asn1" doesn't result in any untracked changes.) - - Change-Id: I2971407f8227ca6f409cfb60d842d58ff2780500 - Reviewed-on: https://code.wireshark.org/review/206 - Reviewed-by: Evan Huus - -commit 82e2865 -Author: Jeff Morriss -Date: Thu Feb 13 19:17:27 2014 -0500 - - Remove $Id$ and other Subversion leftovers from the tools. - - There are a few things in here which could still use attention. - - Don't regenerate anything now. - - Change-Id: I283c224d3523212144707fca3d6265916cb11792 - Reviewed-on: https://code.wireshark.org/review/205 - Reviewed-by: Jeff Morriss - -commit b6a9b84 -Author: Jeff Morriss -Date: Thu Feb 13 18:58:24 2014 -0500 - - Remove $Id$ and other Subversion leftovers from the doc files. - - Change-Id: I28a376f7e0fd90971f65ae9c1105a3ec85221470 - Reviewed-on: https://code.wireshark.org/review/204 - Reviewed-by: Jeff Morriss - -commit d219887 -Author: Jeff Morriss -Date: Thu Feb 13 17:39:19 2014 -0500 - - Don't complain if files don't have $Id$ in them. - - $Id$ is pretty useless in git so don't enforce it in our source code. - - Change-Id: Ie8b1b9627aabbca72c9c1dd93a9a76901e6967eb - Reviewed-on: https://code.wireshark.org/review/203 - Reviewed-by: Pascal Quantin - Reviewed-by: Guy Harris - -commit 58fe488 -Author: Hadriel Kaplan -Date: Sun Feb 9 14:27:51 2014 -0500 - - Lua: add ability for scripts loaded from command-line to be passed arguments - - This change adds the ability to pass on to lua scripts loaded from the - command-line (tshark or wireshark) additional arguments supplied by the - command-line. This will help us in our testsuites, but also might be - useful for user-created scripts. The additional arguments are passed in - using the '-X' eXtension switch. - - Change-Id: Ib94cdf1ffd194ca84692fee7816665e4ff95efbd - Reviewed-on: https://code.wireshark.org/review/156 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 1eeb33a -Author: Matthieu Texier -Date: Mon Feb 3 23:20:35 2014 +0100 - - Redesign of BGP ext-com in a separate function, alignement with RFC and IANA, use of items instead of add_text - - Change-Id: I4af2ee8e760aa80eeb28f71e93f8948ef5b26eb5 - Reviewed-on: https://code.wireshark.org/review/95 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 7e94ee9 -Author: Jeff Morriss -Date: Thu Feb 13 16:02:13 2014 -0500 - - Enable SCTP reassembly by default. - - This was suggested in: - http://ask.wireshark.org/questions/29660/sctp-protocols-in-frame-problem - - Since desegmentation is enabled by default in TCP, it makes sense to me to do - the same in SCTP as well. - - Change-Id: I3cb4c7900c600d21668d95003149f87b9a006f66 - Reviewed-on: https://code.wireshark.org/review/200 - Reviewed-by: Pascal Quantin - Reviewed-by: Evan Huus - -commit 96583cd -Author: Roland Knall -Date: Wed Feb 12 15:14:56 2014 +0100 - - Powerlink: New heuristic payload dissection - - Up until now, the heuristic dissector for epl allways passed the - complete epl frame. Therefore a lot of information got passed, - which was not needed, resulting in subdissectors to have to call - the epl dissector again, if the epl data had to be dissected. - - This patch adds a second heuristic dissector (not breaking the - way, the existing one is working), which only passes the payload - of the epl frame to a sub-dissector, therefore reducing memory - overhead and increasing dissection speed. - - Upd: Changes according to comments in patchset - - Change-Id: I2ef309310f421f24d96dd1c188e188ccfa5935cd - Reviewed-on: https://code.wireshark.org/review/190 - Reviewed-by: Roland Knall - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 029859a -Author: Gerald Combs -Date: Thu Feb 13 13:04:31 2014 -0800 - - Try to get rid of the big ugly revision history table border. - - Change-Id: Id9505660dd020285be63d2ba17cf34a46aa6084f - Reviewed-on: https://code.wireshark.org/review/201 - Reviewed-by: Gerald Combs - -commit 168f241 -Author: AndersBroman -Date: Thu Feb 13 20:29:20 2014 +0100 - - Expand gtpv2_srvcc_cause_vals with new values from TS 29.280 V11.5.0 - and fix up the msg names. - - Change-Id: If2cc51a99bc236e840fea274d32989a5fe96aa29 - Reviewed-on: https://code.wireshark.org/review/199 - Reviewed-by: Anders Broman - Tested-by: Anders Broman - -commit fd5e882 -Author: Gerald Combs -Date: Wed Feb 12 17:30:41 2014 -0800 - - About box: make sure we read AUTHORS-SHORT as UTF-8. - - Use the application monospace font for the "Authors" and "License" - tabs similar to the GTK+ UI. - - Change-Id: Ibca481562d7a9957ce603441c1e98b564e5bf389 - Reviewed-on: https://code.wireshark.org/review/194 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit a83452c -Author: AndersBroman -Date: Thu Feb 13 07:21:51 2014 +0100 - - Add application/pidf-diff+xml - - Change-Id: I15e4fc59181d9d8fa8dd363cbe4219e21c82f4a9 - Reviewed-on: https://code.wireshark.org/review/197 - Reviewed-by: Anders Broman - Tested-by: Anders Broman - -commit 09f8b31 -Author: AndersBroman -Date: Thu Feb 13 07:03:42 2014 +0100 - - From Michael Lum - Header dissection for EVRC-NW2K - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9691 - - Change-Id: Id068aff15079a199e6ae91e2de65a957bd034ac4 - Reviewed-on: https://code.wireshark.org/review/196 - Reviewed-by: Anders Broman - Tested-by: Anders Broman - -commit a9dc801 -Author: Alexis La Goutte -Date: Wed Feb 12 08:32:27 2014 +0100 - - Add message type from RFC5416 : Section 3 : IEEE 802.11 Specific CAPWAP Control Messages - - Issue found by Massimo Vellucci (SmartCAPWAP) - - Partial-Bug: 9752 - - Change-Id: I6f61a3c8706572e9ea7935e8f00818e6aa9fef7a - Reviewed-on: https://code.wireshark.org/review/193 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit d958ea8 -Author: Alexis La Goutte -Date: Wed Feb 12 08:16:37 2014 +0100 - - Add support of SIP subprotocol for WebSocket - - RFC 7118: The WebSocket Protocol as a Transport for the Session Initiation Protocol (SIP) - - No yet support of auto-detect subprotocol (via Sec-WebSocket-Protocol) - - Change-Id: I16e8ddd37002b3982673bd4a4a7b15f6200a4d85 - Reviewed-on: https://code.wireshark.org/review/192 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 337b2f7 -Author: Yasuyuki Tanaka -Date: Wed Feb 12 17:46:55 2014 +0900 - - Add support for two AVPs newly defined in RFC 6786 - - Encryption-Encap AVP (AVP code 12) - - Encryption-Algorithm AVP (AVP code 13) - - Change-Id: I9a4245b526bc59c2ffa228ce46c80ce3250ef0b6 - Reviewed-on: https://code.wireshark.org/review/189 - Reviewed-by: Alexis La Goutte - -commit 6ebd552 -Author: Evan Huus -Date: Tue Feb 11 20:56:50 2014 -0500 - - Fix nmake build - - Change-Id: I5583e3c01aa40e07d153f57d72eff92766a755df - Reviewed-on: https://code.wireshark.org/review/185 - Reviewed-by: Evan Huus - -commit 1bbe5cf -Author: Evan Huus -Date: Tue Feb 11 20:45:31 2014 -0500 - - Add correct license headers for reedsolomon code. - - I got in contact with the original author (thanks to Didier for digging up his - current email address) and verified that we could license this under the GPLv2+. - - Licensecheck finally passes! - - Change-Id: I6660ef9a961626bbc4dad53e8bf767b5b9e0b3fa - Reviewed-on: https://code.wireshark.org/review/183 - Reviewed-by: Evan Huus - -commit 10084c3 -Author: Michal Labedzki -Date: Fri Sep 14 15:08:17 2012 +0200 - - RTP: Add support for SBC codec in RTP Player - - Add optional dependancy to libsbc to play Bluetooth SBC in - A2DP payload. Also simplify RTP Player and extent codec interface. - - Change-Id: I52e1fce9c82e2885736354fe73c6c37168a4fda3 - Reviewed-on: https://code.wireshark.org/review/19 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit ab3348e -Author: Gerald Combs -Date: Tue Feb 11 14:04:38 2014 -0800 - - Comment out the .asciidoc → .xml rule for now. - - Change-Id: I174fdb875030e10cee641e936d3fa9a7e66a23b2 - Reviewed-on: https://code.wireshark.org/review/181 - Reviewed-by: Gerald Combs - -commit 619dfeb -Author: Pascal Quantin -Date: Tue Feb 11 23:15:56 2014 +0100 - - Update new protocols list - - Change-Id: I960f857d59230e88bf8042148e5c8cec86d81161 - Reviewed-on: https://code.wireshark.org/review/182 - Reviewed-by: Pascal Quantin - -commit 30b53c3 -Author: Gerald Combs -Date: Tue Feb 11 11:57:44 2014 -0800 - - Try to fix dist. Change the .asciidoc.xml inference rule to a pattern - rule specific to wsug_src similar to the nmake change in gedc06c1. - - Change-Id: I6d4bffc5391bd84a83fca8acb6a3688805e05de6 - Reviewed-on: https://code.wireshark.org/review/179 - Reviewed-by: Gerald Combs - -commit 114d051 -Author: Guy Harris -Date: Tue Feb 11 11:49:24 2014 -0800 - - Fix crash when doing "tshark -2 -r file -w newfile". - - We were using cf->buf in some places and a local variable buf in others; - consistenly use the local variable. - - Have a local variable for the struct wtap_pkthdr while we're at it; with - some work we may be able to get rid of the struct wtap_pkthdr and the - Buffer in the capture_file structure. - - Change-Id: I4762e22e11ef576be6bf9015450d1a270dd3d16b - Reviewed-on: https://code.wireshark.org/review/178 - Reviewed-by: Guy Harris - -commit 6487694 -Author: Gerald Combs -Date: Tue Feb 11 11:45:30 2014 -0800 - - Fix a Qt version comparison. - - Change-Id: I7df90d53a2d8f29042994bd0c2bc7bf4450fab10 - Reviewed-on: https://code.wireshark.org/review/177 - Reviewed-by: Gerald Combs - -commit edc06c1 -Author: Gerald Combs -Date: Tue Feb 11 10:54:17 2014 -0800 - - Make sure the .asciidoc.xml inference rule only applies to the wsug_src - directory. This keeps us from trying to clobber GPL_appendix.xml if - GPL_appendix.asciidoc has a more recent timestamp. - - Change-Id: I37962c7a6c5357709a4dd269340c333673d44539 - Reviewed-on: https://code.wireshark.org/review/176 - Reviewed-by: Gerald Combs - -commit d49485e -Author: David Ameiss -Date: Sat Feb 8 12:37:41 2014 +0100 - - Statistics->Flow Graph in qtshark crashes with a segfault - - What appears to be happening is SequenceDiagram::draw() is iterating over the stored seq_analysis_item_t elements - but at the same time SequenceDialog::fillDiagram() is running - which destroys the old seq_analysis_info_t (which SequenceDiagram has stored a copy of and is referencing items in the list) then reloads it. - - I'll attach a patch to SequenceDialog::fillDiagram() which fixes the problem - essentially calling sequence_analysis_list_get() with a new seq_analysis_info_t, calling SequenceDialog::setData() with the new one, then destroying the current seq_analysis_info_t and replacing it with the new on - - Change-Id: I14f7b5dc64018ba5b81fe8d874a701e021401859 - Closed-bug:9506 - Reviewed-on: https://code.wireshark.org/review/175 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 5e3113e -Author: Gerald Combs -Date: Sun Feb 9 11:01:49 2014 -0800 - - Finish converting the Developer's Guide to AsciiDoc. - - Add developer-guide-docinfo.xml, which lets us carry over DocBook front - matter. Remove the meta_info chapter. Most of its contents are now in - developer-guide-docinfo.xml. Add a DocBook revision history based on - hints from the Git/SVN/CVS revision history. - - Comment out or note makefile content that's no longer necessary for - converting the Developer's Guide but will be useful for converting the - User's Guide. Fix building the release notes with CMake. Other minor - changes. Tested with Autotools, nmake, and CMake. - - Change-Id: Ib6d50c821ca906fff50a84ad4d6af3212ebdff0a - Reviewed-on: https://code.wireshark.org/review/155 - Reviewed-by: Gerald Combs - Tested-by: Gerald Combs - -commit bed30b8 -Author: Gerald Combs -Date: Tue Feb 11 08:56:15 2014 -0800 - - Fix the host entry. - - Change-Id: Ia76b5585c38eebdec6c275c6e1aadabb3862cf2b - Reviewed-on: https://code.wireshark.org/review/172 - Reviewed-by: Gerald Combs - -commit dd64517 -Author: Peter Lemenkov -Date: Sat Dec 21 00:31:40 2013 +0400 - - Add expert info about skipped notify IP address - - - Add expert info about skipped notify IP address - - Add a couple of comments (cosmetic) - - Change-Id: I6caa904cf16b304724c5da1933531cf865daf619 - Signed-off-by: Peter Lemenkov - Reviewed-on: https://code.wireshark.org/review/171 - Reviewed-by: Pascal Quantin - -commit 0e120c1 -Author: Alexis La Goutte -Date: Mon Feb 10 23:30:27 2014 +0100 - - Fix warnings in packet-parlay.c - - packet-parlay.c:53643:9: warning: passing argument 2 of 'get_CDR_wchar' from incompatible pointer type [enabled by default] - - packet-parlay.c:53667:9: warning: passing argument 2 of 'get_CDR_wstring' from incompatible pointer type [enabled by default] - - Change-Id: I027809139e74b563e759f28e2e141951166e53d0 - Reviewed-on: https://code.wireshark.org/review/170 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Anders Broman - Tested-by: Anders Broman - -commit 0e3081a -Author: Alexis La Goutte -Date: Mon Feb 10 23:10:24 2014 +0100 - - Fix indent (Use 4 spaces and modelines info) - - Change-Id: I1cae6fd52f84a4d2f101357adddfda010da847e0 - Reviewed-on: https://code.wireshark.org/review/168 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 38b7e2e -Author: Alexis La Goutte -Date: Mon Feb 10 23:10:54 2014 +0100 - - Fix indent (Use 4 spaces and modelines info) - - Change-Id: I833b6f33a66ab911fd0c5f5ce4e35f590918f85f - Reviewed-on: https://code.wireshark.org/review/167 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 667bc7f -Author: Alexis La Goutte -Date: Mon Feb 10 23:11:57 2014 +0100 - - Fix indent (use 4 spaces and modelines info) - - Change-Id: Ib5c57a8302ca065233dd7d827605f8dc333d220c - Reviewed-on: https://code.wireshark.org/review/166 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 9a6e032 -Author: Alexis La Goutte -Date: Mon Feb 10 23:11:37 2014 +0100 - - Fix indent (use 4 spaces and modelines info) - - Change-Id: Iace874e7ccb5a3b8d0429f4627e6137abe8fbf21 - Reviewed-on: https://code.wireshark.org/review/169 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 80e807f -Author: Alexis La Goutte -Date: Mon Feb 10 23:11:11 2014 +0100 - - Fix indent (Use 4 spaces and modelines info) - - Change-Id: If816b474634dd72ad75931e8803ba1bdfb6b1143 - Reviewed-on: https://code.wireshark.org/review/165 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 48d421e -Author: David Tapuska -Date: Mon Feb 10 15:33:59 2014 -0500 - - Enable DTLS "Decrypting" of all the NULL cipher suites. Previously - it only did the RSA MD5/SHA1 ones. - - Change-Id: I7b16c7245dd1646f68479095540a8bef191d5fb2 - Reviewed-on: https://code.wireshark.org/review/160 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 2a5618b -Author: Gerald Combs -Date: Mon Feb 10 11:56:53 2014 -0800 - - Qt 5.2.1 for Mac has QtMacExtras but not QMacNativeToolBar. - - Change-Id: I55e68a7fd84d36b50e6084cd82b51df7c91c6476 - Reviewed-on: https://code.wireshark.org/review/159 - Reviewed-by: Gerald Combs - Tested-by: Gerald Combs - -commit 129bc4c -Author: Pascal Quantin -Date: Mon Feb 10 20:59:33 2014 +0100 - - VP8 RTP: fix Windows build failure - - Fix Windows build errors: - packet-vp8.c(179) : error C2220: warning treated as error - no 'object' file generated - packet-vp8.c(179) : warning C4101: 'vp8_payload_tree' : unreferenced local variable - packet-vp8.c(291) : warning C4101: 'ti' : unreferenced local variable - packet-vp8.c(599) : warning C4101: 'vp8_name_handle' : unreferenced local variable - While we are at it, remove useless _U_ modifiers and NULL assignments. - - Change-Id: I3d28de7f27a8019cc5424dafc4264107742d7c86 - Reviewed-on: https://code.wireshark.org/review/158 - Reviewed-by: Pascal Quantin - -commit 3d9547a -Author: Peter Lemenkov -Date: Fri Dec 13 22:10:21 2013 +0400 - - Use IP types instead of plain strings where possible - - Change-Id: Ia4a78e1ef3a7c45761cc271ecc17e7868b8456d9 - Signed-off-by: Peter Lemenkov - Reviewed-on: https://code.wireshark.org/review/157 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 5eb4b62 -Author: Owen Williams -Date: Wed Feb 5 23:40:07 2014 +0000 - - VP8 RTP dissector - - Change-Id: Ic21d13bf8ca77ff37c2d2d229c4e8c9d8f053677 - Reviewed-on: https://code.wireshark.org/review/124 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit f5a1786 -Author: Hadriel Kaplan -Date: Thu Feb 6 03:14:11 2014 -0500 - - Add test suite for Lua dissector-related functions - - This isn't super-fancy, but it runs a simple protocol dissector and verifies the tshark output - matches what it expects. Things like Proto, ProtoField, Field, Tvb, TvbRange, etc., are used - in an example dissector script - it dissects DNS... partially. Enough to make sure things - aren't fundamentally broken. This provides something to add on top of later as well. - - Change-Id: Icf3c8e9534944bcf4c4f6150f02a9a43f999cd75 - Reviewed-on: https://code.wireshark.org/review/126 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit fe0ed97 -Author: Gerald Combs -Date: Sun Feb 9 08:05:27 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-02-09] - - Change-Id: I8ca5845c85a086cd88af5b95bb9fee09e9b05850 - Reviewed-on: https://code.wireshark.org/review/151 - Reviewed-by: Gerald Combs - -commit 4e8832b -Author: Hadriel Kaplan -Date: Sun Feb 9 02:49:44 2014 -0500 - - Fix bug 9736 'Lua: new Int64/UInt64 functions don't prevent division by zero' - - OK, in all fairness this does a bit more than just fix that bug. It also - adds a 'Int64()' and 'UInt64()' __call metamethods. I generally dislike - using __call metamethods, because they're often unintuitive (for example - the wireshark Field and FielInfo use this in a bizarre fashion). But this - happens to be a perfect use for it, and very natural, imho. Another change - is to make the metatables of classes visible to scripts. There was never - really a good reason not to make them visible, and they have to be visible - to do things like use __call on a plain table... not to mention I need them - to be visible to run test scripts verifying evrything is kosher. - - I also updated the test suite to test for the div/mod by zero. - - Change-Id: Ia4c594c8f59d4e799090716bd032ba2815df032f - Reviewed-on: https://code.wireshark.org/review/149 - Reviewed-by: Evan Huus - -commit 0353c9a -Author: Hadriel Kaplan -Date: Thu Feb 6 14:32:59 2014 -0500 - - Fix Bug 6489 to stop compiler warning on gcrypt deprecated delcarations - - The libgcrypt library has several deprecated functions exported, that we don't use. - Unfortunately the GCC compiler warns about these deprecated functions regardless, - which is quite annoying. This commit makes clang/gcc ignore the deprecated attribute, - for gcrypt.h only. The danger with this is if gcrypt ever deprecates a function - we actually *use*, then we won't see the warning. So I'm not sure if it's a good or - bad idea to do this change, but it's really annoying to see the warnings and makes - finding real warnings difficult. - - Change-Id: I03e80a6e7e4833ce0f709088c9ab4af98193db3d - Reviewed-on: https://code.wireshark.org/review/128 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 3fd9a5e -Author: Evan Huus -Date: Sat Feb 8 09:29:10 2014 -0500 - - Licensecheck improvements, just two errors left. - - Spawned from https://www.wireshark.org/lists/wireshark-dev/201402/msg00024.html - - Add some ignore rules for files that can't/shouldn't include a license header. - - Reorganize some ignore rules to group rules with similar motivations. - - Add a header to autogen.sh and attribute it to just "The Wireshark Authors" - since while Gilbert wrote the original version it's gone through so many changes - over the years that sorting out proper authorship is unnecessarily complex. - - Add headers to Graeme Hewson's two files as verified by private email, and - update his address in the AUTHORS file per his request. - - Add header to one of Ulf Lamping's files, as verified by private email. - - Only remaining problem is the reedsolomon code. - - Change-Id: Ifb7de8c4b4d79012553e29d459a0145d39f51df5 - Reviewed-on: https://code.wireshark.org/review/145 - Reviewed-by: Evan Huus - -commit 183e038 -Author: Alexis La Goutte -Date: Sat Feb 8 15:46:59 2014 +0100 - - Fix typo about encoding in MIP6 dissector... - - Change-Id: Id0b50ddacf2e3cae008590456316586d262e6029 - Reviewed-on: https://code.wireshark.org/review/146 - Reviewed-by: Alexis La Goutte - -commit f2f94d9 -Author: Alexis La Goutte -Date: Sat Feb 8 15:28:53 2014 +0100 - - Fix some typo in MIP6 dissector - Fix indent (use 4 spaces) - Add modelines info - Fix warning found by fix encoding args tools - - Change-Id: I4de8e3c0729c550eeceddd8e1a67fb6aa063844a - Reviewed-on: https://code.wireshark.org/review/144 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit f555415 -Author: Hadriel Kaplan -Date: Fri Feb 7 23:36:31 2014 -0500 - - Fix bug 9733 ' Lua: wtap_filetypes.TSPREC_ variable names are missing from the Lua global table' - - The fix for bug 9712, which involved changing the make-init-lua.pl perl script - to handle the new C-code define names for filetypes in release 1.11, - unfortunately also stopped matching against the timestamp define names. - - Arguably the timestamp ones should never have been matched to begin with, at - least not by the same regex function, because they're not "filetypes". But - they've been matched and exported into the Lua table forever, so we'll break - backward-compat if we don't keep doing it. Ugh. - - The good news is I caught this bug using a new test script I wrote which - verifies previous release's Lua stuff didn't disappear. I'll submit that - separately when I get a chance to clean it up, hopefully next week. - - Change-Id: Ibf1d1da0dc4ed62cc1bacf345742dccf8ec40e30 - Reviewed-on: https://code.wireshark.org/review/143 - Reviewed-by: Alexis La Goutte - -commit 9a26416 -Author: Guy Harris -Date: Thu Feb 6 13:46:41 2014 -0800 - - Have macros to handle the range check and byte swapping. - - Combine the check for whether the field is within the packet data and - the swapping of the field into macros that do both, and use them. - - Change-Id: I1db4c5fd76172edd44abc9fb111d79a2537c6c9d - Reviewed-on: https://code.wireshark.org/review/130 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - -commit 991bd3d -Author: Hadriel Kaplan -Date: Fri Feb 7 14:23:41 2014 -0500 - - Fix bug 9732: ' Lua: recent commit changed some MENU_ key names in init.lua' - - A recent fix (made by me) for bug 9707, in Change-Id: - If4ee1906aa60dd37366cf2ef9bc4168e0ea024b6, made the perl regex grab too much - of the menu name. It changed MENU_STAT_CONVERSATION, MENU_STAT_RESPONSE, and - MENU_ANALYZE_CONVERSATION's key names into their longer C-code names. Ugh. - - The fix for this is a bit brittle, but I think it's impractical to avoid it - being brittle, due to needing to support legacy Lua scripts. I put comments - in stat_menu.h to warn of the danger. - - Change-Id: I41408e9d4f5b5bd73e2871fccabff81c7cbd242d - Reviewed-on: https://code.wireshark.org/review/140 - Reviewed-by: Alexis La Goutte - -commit 8d7b600 -Author: Gerald Combs -Date: Fri Feb 7 16:46:05 2014 -0800 - - "origin" appears to be a safer bet than "@{upstream}". - - Change-Id: Icd00c62d9b908771bf2b73b8e5b49d519570ff8b - Reviewed-on: https://code.wireshark.org/review/142 - Reviewed-by: Gerald Combs - -commit f966980 -Author: Gerald Combs -Date: Fri Feb 7 11:14:52 2014 -0800 - - Replace "svn" with "git" all over the place. - - Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. - Rename "svnversion.h" to "version.h" as Evan suggested. Update some - URLs. In make-version.pl, make sure we don't set an improper upstream - branch name. Use the number of commits + short hash from `git describe` - for package names by default. - - Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 - Reviewed-on: https://code.wireshark.org/review/139 - Reviewed-by: Gerald Combs - -commit 217f9fd -Author: Hadriel Kaplan -Date: Thu Feb 6 01:33:12 2014 -0500 - - Fix Bug 9728 'Lua: ProtoField.bool() VALUESTRING argument is not optional but was supposed to be' - - Similar to bug 9725 and ProtoField.new(), the way the VALUESTRING argument is being checked - in the code for ProtoField.bool() ends up making it non-optional. This patch fixes that, - along with some minor API documentation fixes (text). - - Change-Id: Iadb9a8ace9c5514fc623d882301fe16b637fe4ce - Reviewed-on: https://code.wireshark.org/review/125 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 373bf9b -Author: Pascal Quantin -Date: Fri Feb 7 16:35:33 2014 +0100 - - Parse SIP sec-mechanism - - From Anders Broman: parse security mechanism as specified in RFC 3329 - - Change-Id: I37300aa45740a11679149550943b3a1614ac8423 - Reviewed-on: https://code.wireshark.org/review/138 - Reviewed-by: Anders Broman - Tested-by: Anders Broman - -commit 04959a0 -Author: Pascal Quantin -Date: Fri Feb 7 12:40:09 2014 +0100 - - Register SSH dissector by name - - Change-Id: Ia9ad45ce9196486129897cd616707d622778e9dd - Reviewed-on: https://code.wireshark.org/review/137 - Reviewed-by: Pascal Quantin - -commit a7b1567 -Author: Guy Harris -Date: Thu Feb 6 18:46:05 2014 -0800 - - Qt 5.2.1 - now with added native OS X toolbar! - - To quote - - https://qt.gitorious.org/qt/qtbase/source/62feb088a30045e7fbd2a3074c64d18035b84a97:dist/changes-5.2.1 - - "**************************************************************************** - * Platform Specific Changes - * - **************************************************************************** - - ... - - OS X - ---- - - - [QTBUG-34411] Implemented QMainWindow::setUnifiedTitleAndToolBarOnMac." - - Also get rid of a commented-out setting of QT_VERSION to 5.1.1 while - we're at it. - - Change-Id: I957fdfecb70954723cfd3160f40758f722dc56c8 - Reviewed-on: https://code.wireshark.org/review/136 - Reviewed-by: Guy Harris - -commit ff85833 -Author: Bill Meier -Date: Thu Feb 6 17:58:43 2014 -0500 - - Fix Bug #9690: DHCPv6 Packet dissector incorrectly handling FQDN in option 17.2171.6 - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9690 - - Change-Id: I606bb73f4a226cbf1eb56cc0a27b926b97a453a0 - Reviewed-on: https://code.wireshark.org/review/131 - Reviewed-by: Bill Meier - -commit 02b5bf9 -Author: Gregor Jasny -Date: Thu Feb 6 20:47:02 2014 +0100 - - Extend RTMPT video types table - - Change-Id: Ic97edfa64bb2d69b97295564e2f11cd07a0fe54c - Reviewed-on: https://code.wireshark.org/review/129 - Reviewed-by: Alexis La Goutte - -commit 63479ad -Author: Guy Harris -Date: Wed Feb 5 00:33:45 2014 -0800 - - Make some routines take a struct wtap_pkthdr * as an argument. - - For some routines that take multiple arguments that come from a struct - wtap_pkthdr, pass a pointer to the struct wtap_pkthdr in question, - rather than the separate arguments. Do this even if we're passing - expressions that were earlier assigned to the struct wtap_pkthdr fields - in question. This simplifies the calling sequences and ensures that the - right values are picked up by the called routine; in at least one case - we were *not* passing the right values (the code to handle Simple Packet - Blocks in pcap-ng files). - - Also, call the byte-swapping routines for pseudo-header fields only if - we need to do byte-swapping. - - Change-Id: I3a8badfcfeb0237dfc1d1014185a67f18c0f2ebe - Reviewed-on: https://code.wireshark.org/review/119 - Reviewed-by: Evan Huus - Reviewed-by: Guy Harris - -commit 1dc06a2 -Author: Gerald Combs -Date: Thu Feb 6 09:16:33 2014 -0800 - - Convert the user interface chapter to AsciiDoc. - - Start mentioning Qt. Update and add HIG links. - - Change-Id: Iac984045b03a96862981d58ff63c9ee6bcdbbce8 - Reviewed-on: https://code.wireshark.org/review/127 - Tested-by: Wireshark Buildbot - Reviewed-by: Gerald Combs - -commit b1bea54 -Author: Pascal Quantin -Date: Tue Feb 4 22:24:56 2014 +0100 - - Introduce end-of-line normalization - - Change-Id: Ie6991af2432b193fbdc23bbbd335f83c091f14e8 - Reviewed-on: https://code.wireshark.org/review/114 - Reviewed-by: Evan Huus - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit 60ea645 -Author: didier -Date: Wed Feb 5 17:21:55 2014 +0100 - - use the right src dir in git command for svnversion.h - - make-version.pl wasn't using the right source dir for git commands when not compiling from inside source tree. - add --git-dir=$srcdir/.git parameter. - - Change-Id: I45ca4874d96abaed1c559c022d0ace66239652c8 - Reviewed-on: https://code.wireshark.org/review/122 - Reviewed-by: Evan Huus - Tested-by: Pascal Quantin - Reviewed-by: Pascal Quantin - -commit 32e4d90 -Author: Evan Huus -Date: Wed Feb 5 15:14:04 2014 -0500 - - Two fixes for license headers - - - packet-bencode.c had the wrong FSF address - - wslua_int64.c had the license as a footer instead of a header - - Change-Id: I71204b36a1034af72874d6fe87929c31c9ff03df - Reviewed-on: https://code.wireshark.org/review/123 - Reviewed-by: Guy Harris - Reviewed-by: Hadriel Kaplan - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 5236d89 -Author: Anders Broman -Date: Wed Feb 5 14:29:57 2014 +0100 - - Dissector assert in packet-nbap.c. num_items isn't reset before calling a sequence filling the array. - - Closed-bug #9726 - - Change-Id: Ie4bc538b0788eb32895c9eedf8e0277c6d9ed1b2 - Reviewed-on: https://code.wireshark.org/review/120 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman - Tested-by: Anders Broman - -commit 2c3f022 -Author: Alexis La Goutte -Date: Wed Feb 5 09:23:39 2014 +0100 - - Add Aruba Intant AP dissector - - There is no public spec, based only on analyze of packet - It is more easy to found the address IP of Intant AP - - Change-Id: I3baf205c5e4ad699b954f4a9fbf4b9e65f82cb36 - Reviewed-on: https://code.wireshark.org/review/121 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 2466a7c -Author: Hadriel Kaplan -Date: Wed Feb 5 01:23:25 2014 -0500 - - Fix Bug 9725 'Lua: ProtoField.new() is buggy' - - Using ProtoField.new() is dicey. Many of the optional arguments don't properly check the lua stack - they call lua_isnil() for their index number, instead of lua_gettop() to see the stack size. lua_isnil() may return false in such cases. - - Change-Id: I83ca1e5fc34e71ec35899adbedabcee69571b9fe - Reviewed-on: https://code.wireshark.org/review/118 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit c391d74 -Author: Hadriel Kaplan -Date: Tue Feb 4 18:26:07 2014 -0500 - - Fix wslua docs script to handle module names with digits, like Int64/UInt64 - - The fix in commit 28e028ddd5579c3d405b21523cdc2773c798e32f missed the module - name, which was only grabbing alphabetic characters not numbers. This fixes - that oversight. - - Change-Id: I65a87279024a81b33a8deb83b7a3573ea6eaf139 - Reviewed-on: https://code.wireshark.org/review/117 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 9eaa611 -Author: Hadriel Kaplan -Date: Tue Feb 4 00:45:45 2014 -0500 - - Fix bug 9720 'Lua: bitop library is missing in Lua 5.2' - - In Lua 5.2 the bitop library is missing - it's not getting loaded into - the lua global table as "bit", or anything else for that matter. Lua - 5.2 has its own bit-operations library ("bit32") which is there, but - that one's not as good as bitop and would break back/forward - compatibility for lua scripts anyway. - - Change-Id: I94b7d45bbeb2f637d1c76b0b5c9d8472eebfcaea - Reviewed-on: https://code.wireshark.org/review/100 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - Reviewed-by: Stig Bjørlykke - -commit 953c3ef -Author: Evan Huus -Date: Tue Feb 4 10:28:06 2014 -0500 - - Fix dissection of GTP MM Context RAND field. - - As suggested by Lükő Bálint to fix bug #9722. - - Change-Id: I177f7632a0936f105b1acff5e7c20bcce2328957 - Reviewed-on: https://code.wireshark.org/review/109 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - -commit 5340477 -Author: Jelmer Vernooij -Date: Mon Feb 3 00:36:50 2014 +0000 - - Split out bencode dissector and use it in the bzr dissector. - - Change-Id: I5b2ef173faf7670fad64298d67f2aaf055b8d6d8 - Signed-Off-By: Jelmer Vernooij - Reviewed-on: https://code.wireshark.org/review/82 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 1987306 -Author: Michal Labedzki -Date: Thu Jan 30 08:44:35 2014 +0100 - - Bluetooth: btle: Make RxAdd field reserved in some cases - - Specification: "If the TxAdd or RxAdd fields are not - defined as used in a given PDU then they shall be considered - Reserved for Future Use." - - Change-Id: I767c0df0366afe789624046cda2d49c9875ffe60 - Reviewed-on: https://code.wireshark.org/review/103 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 4ba8609 -Author: Michal Labedzki -Date: Tue Feb 4 11:15:46 2014 +0100 - - Bluetooth: AVDTP: Fix offset in case with Error Code - - Change-Id: I6e97781bfd1775dcc13c4488af11d615ef6594fb - Reviewed-on: https://code.wireshark.org/review/102 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 5fd025e -Author: Alexis La Goutte -Date: Tue Feb 4 13:51:26 2014 +0100 - - Fix indent (Remove tabs and use 4 spaces) - - Change-Id: Ide617723ffbe0c813f08b44804cd4ca52884a875 - Reviewed-on: https://code.wireshark.org/review/107 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 9f96c73 -Author: Alexis La Goutte -Date: Tue Feb 4 13:51:41 2014 +0100 - - Fix indent (Remove tabs and use 4 spaces) - - Change-Id: Ide85336be3dca4059619bb91707bfc49e25af63d - Reviewed-on: https://code.wireshark.org/review/108 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 6d0f3d8 -Author: Alexis La Goutte -Date: Fri Jan 31 15:45:51 2014 +0100 - - Fix indent (Use tabs) - - Change-Id: I5c16950394915091a1dfb76e480ae7f2cba53e3f - Reviewed-on: https://code.wireshark.org/review/106 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit e07e697 -Author: Michal Labedzki -Date: Fri Jan 10 12:51:19 2014 +0100 - - USB: Fix Linux header byte-order - - Linux USB Header should be in Host Endian. - Also add ENC_HOST_ENDIAN to simplify code. - - Change-Id: I95e7d97014633e8fc1d7739d0728780d70c60442 - Reviewed-on: https://code.wireshark.org/review/15 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 4e7e5a6 -Author: Stig Bjørlykke -Date: Mon Feb 3 12:19:58 2014 +0100 - - asn2wrs: Rewrite relative paths in header. - - Change both absolute paths and relative paths generated outside - source directory to paths relative to asn1/ subdir. - - Change-Id: I867d3a31c687b08347b11336ce69fc70db2d7c7b - Reviewed-on: https://code.wireshark.org/review/88 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit 28e028d -Author: Hadriel Kaplan -Date: Mon Feb 3 23:14:47 2014 -0500 - - Fix wslua docs script to handle class names with digits, like Int64/UInt64 - - Change-Id: I555e4401828680cc8d6516b11af21d2ae5c0144d - Reviewed-on: https://code.wireshark.org/review/99 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit 1cd7828 -Author: Evan Huus -Date: Mon Feb 3 19:56:49 2014 -0500 - - Various fixes to the Lua int64 code - - - add casts to pacify certain buildbots - - skip test if lua isn't available - - Change-Id: I614c05dca40cb848c87b361e4b3d3c4e94aafb9e - Reviewed-on: https://code.wireshark.org/review/97 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 2e7f771 -Author: Hadriel Kaplan -Date: Sun Feb 2 22:49:30 2014 -0500 - - Adds support for Lua Int64 and UInt64 operators, functions, and general - usefulness, working around bug #9162 until Lua 5.3 is released. - - The existing Int64 and UInt64 classes provide virtually no - usefullness, other than for creating a string of their value. While - one could then write Lua code to convert the string to Lua numbers and - such, ultimately Lua has no native 64-bit integer support, making such - a task difficult to handle in Lua. This change adds a host of - functions and operators to the existing Int64 (gint64) and UInt64 - (guint64) classes, to enable true 64-bit integer support on par with - native Lua numbers. - - A test script is also provided, which tests the functions/operators. - - Change-Id: I4c5f8f5219b9a88198902283bd32ddf24c346bbe - Reviewed-on: https://code.wireshark.org/review/83 - Tested-by: Evan Huus - Reviewed-by: Evan Huus - -commit caed281 -Author: Guy Harris -Date: Mon Feb 3 15:05:32 2014 -0800 - - Don't use newer shell features, as we now just use /bin/sh. - - /bin/sh in Solaris 10, for example, doesn't understand "${OS#Windows}", - so using /bin/sh broke the Solaris build on the buildbot. Use a case - statement instead. - - Change-Id: Icdec74599c339e19ef6ffc7728f4ae2d5cf98999 - Reviewed-on: https://code.wireshark.org/review/96 - Reviewed-by: Guy Harris - Tested-by: Guy Harris - -commit 8f547d7 -Author: Pascal Quantin -Date: Mon Feb 3 23:11:14 2014 +0100 - - Upgrade RRC dissector to v11.8.0 - - Change-Id: If43fc7ec8b5f997e573a9d84fda03f2ca2bf6dc7 - Reviewed-on: https://code.wireshark.org/review/94 - Tested-by: Evan Huus - Reviewed-by: Pascal Quantin - -commit 4dd6451 -Author: Gerald Combs -Date: Mon Feb 3 10:28:37 2014 -0800 - - Convert the dissection chapter to AsciiDoc. - - Change-Id: Ieccd2ad235576b9ec6013ddb23a8373ccf2f8cdf - Reviewed-on: https://code.wireshark.org/review/92 - Reviewed-by: Gerald Combs - Tested-by: Gerald Combs - -commit 5385259 -Author: Evan Huus -Date: Mon Feb 3 08:39:46 2014 -0500 - - Don't pass tvb_get_ptr to proto_tree_add_string - - If the string doesn't end with a null-terminator in the given length it causes a - read-overflow. Should fix bug #9717. - - Change-Id: I44647ef8ecb856e07d1175777ed603736ec63553 - Reviewed-on: https://code.wireshark.org/review/90 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit f62450f -Author: Peter Hatina -Date: Mon Feb 3 10:51:07 2014 +0100 - - allow tshark reading from pipes - - Change-Id: If20a14b949667911df44f09c6a705b7645d4c49e - Reviewed-on: https://code.wireshark.org/review/85 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 6d2f865 -Author: Evan Huus -Date: Mon Feb 3 08:13:36 2014 -0500 - - Add a cast to fix g4cc694839d. - - Apparently very recent gcc versions *do* complain about the cast from gint to - enum, despite the comment to the contrary. - - Change-Id: I422df9950f1c7c46ca8ea37a0e3abd7aa8fc1c7d - Reviewed-on: https://code.wireshark.org/review/89 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit c93dddd -Author: Alexis La Goutte -Date: Fri Dec 6 15:14:19 2013 +0100 - - Fix (-W)documentation found by Clang - - Convert comment to doxygen type - - Change-Id: Ib7adc2ece99dc4baa8ec3a349896dfa89277e00b - Reviewed-on: https://code.wireshark.org/review/84 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit f9dbf32 -Author: Stig Bjørlykke -Date: Mon Feb 3 12:16:50 2014 +0100 - - Fix one -fstrict-alias warning missed in g4cc69483 - - Change-Id: I99aa593c188ca77dd20dba8e4305cc9ffdf50416 - Reviewed-on: https://code.wireshark.org/review/87 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit 3ba10a7 -Author: Stig Bjørlykke -Date: Mon Feb 3 11:02:43 2014 +0100 - - Apply g4cc69483 to asn1 templates. - - Change-Id: Id44ef17e7293be5d713c5e9e5d55b25194b46016 - Reviewed-on: https://code.wireshark.org/review/86 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit 4cc6948 -Author: Gilbert Ramirez -Date: Thu Jan 30 09:43:52 2014 -0800 - - Fix all -fstrict-alias warnings found by gcc 4.1.2 - - The majority of the fixes are for calls to uat_new(). Instead of - having each caller cast its private data to (void**), we use void* - in the uat_new() API itself. Inside uat_new(), we cast the void* - to void**. - - Some dissectors use val64_string arrays, so a VALS64() macro was - added for those, to avoid using VALS(), which is useful only for - value_string arrays. - - packet-mq.c was changed because dissect_nt_sid() requires - a char**, not a guint**. All other callers of dissect_nt_sid() use - char*'s (and take the address of it) for their local storage. So, - this was changed to follow the other practices. - - A confusion between gint and absolute_time_display_e in packet-time.c - was cleared up. - - The ugliest fix is the addition of ip6_guint8_to_str(), for exactly - one caller. The caller uses one type of ip6 address byte array, - while ip6_to_str() expects another. This new function is in place - until the various address implementations can be consolidated. - - Add VALS64() to the developer documentation. - - Change-Id: If93ff5c6c8c7cc3c9510d7fb78fa9108e4552805 - Reviewed-on: https://code.wireshark.org/review/48 - Reviewed-by: Evan Huus - Reviewed-by: Stig Bjørlykke - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 479d27c -Author: Alexis La Goutte -Date: Sun Feb 2 21:18:17 2014 +0100 - - QUIC dissector : Update from last Design Document and Specification (12/2/2013) - - Changed “GUID” to “CID” (Connection Identifier), as the original term carried common meaning and baggage that was not intended - - Change-Id: I04986331aee33be237dab6963c0ff39accf507cd - Reviewed-on: https://code.wireshark.org/review/81 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 4982d95 -Author: Ville Skyttä -Date: Mon Dec 23 10:32:23 2013 +0200 - - Install SVG icon. - - Closes-Bug: #9590 - - Change-Id: I20b29ccc4237434c4a3d11615fc2cad832c3c685 - Reviewed-on: https://code.wireshark.org/review/80 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit d252d91 -Author: Peter Wu -Date: Sun Feb 2 17:20:52 2014 +0100 - - Fix dissector exception when GUID is empty in flags - - When the GUID (CID or Connection Identifier in a more recent spec) field in Public Flags is 0, a zero-length item would be added. - - This trivial patch prevents a dissector exception by checking the length first. - - Change-Id: Idf6d970bc1b0b3f1a8e47618a8759f6a0cd54c65 - Reviewed-on: https://code.wireshark.org/review/78 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 1b2145d -Author: Gerald Combs -Date: Sun Feb 2 11:00:30 2014 -0800 - - Convert three more WSDG chapters: works, build, and capture. - - Start adding references to Qt and wsutil. Fix a file extension in - CMakeLists.txt. - - Change-Id: I0cbe7e802d88a05effff40b5de72669e22c0df53 - Reviewed-on: https://code.wireshark.org/review/79 - Reviewed-by: Gerald Combs - Tested-by: Gerald Combs - -commit 0651012 -Author: Martin Kaiser -Date: Thu Jan 23 18:10:27 2014 +0100 - - dissector for HDMI (High-Definition Multimedia Interface) - messages on the Data Display Channel (DDC) - - this dissector is available as an option for I2C messages - - it handles EDID messages (Extended Display Identification Data) - and passes HDCP messages on to the HDCP dissector - - Change-Id: Ia8d8e73c36e2a1ad560b911dd4c1c9f34997b5c2 - Reviewed-on: https://code.wireshark.org/review/63 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 3ea0cd7 -Author: Gerald Combs -Date: Sun Feb 2 08:05:35 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-02-02] - - Change-Id: Iad6b1cf37ab39a48ef42fe957724daa4c80ef094 - Reviewed-on: https://code.wireshark.org/review/75 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit d9c0185 -Author: Graham Bloice -Date: Sat Feb 1 16:46:50 2014 +0000 - - Improve windows build - - Allows config.nmake to pick up settings from environment variables. - With the move to git I'm no longer happy with my permanently modified - copy of config.nmake, these changes allow the most often modified - values to be set from environment variables. - - As a bonus, some of the variables are set by the vcvarsall.bat for - Visual Studio 2012 or later - - Change-Id: I681aeaec9519f6b6c9fa2c33abc706ce335585f5 - Reviewed-on: https://code.wireshark.org/review/70 - Reviewed-by: Pascal Quantin - Tested-by: Graham Bloice - Reviewed-by: Alexis La Goutte - -commit 05f54f7 -Author: Edwin Groothuis -Date: Sun Feb 2 11:05:30 2014 +1100 - - Fix build on FreeBSD 10.0 - - Change-Id: I6be0d2dfe3b44f166233b1dd20ef02c10a024f97 - Reviewed-on: https://code.wireshark.org/review/74 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit ec6fc76 -Author: Gerald Combs -Date: Sat Feb 1 11:26:38 2014 -0800 - - Convert the libraries chapter to AsciiDoc. - - Add some docbook-related entries to .gitignore. Whoever maintains the - Windows libraries has done a terrible job of keeping this chapter up to - date. - - Change-Id: Ic6dcbd9e8369eae9f07403bd3f805a515886f542 - Reviewed-on: https://code.wireshark.org/review/72 - Reviewed-by: Gerald Combs - Tested-by: Gerald Combs - -commit bdafbad -Author: Gerald Combs -Date: Fri Jan 31 17:47:21 2014 -0800 - - Convert the tools chapter to AsciiDoc. - - Replace SVN text with Git, other mostly-minor edits. - - Change-Id: I41b602cc9334656dc8e5f37c33fb6cd660043d17 - Reviewed-on: https://code.wireshark.org/review/69 - Reviewed-by: Gerald Combs - Tested-by: Gerald Combs - -commit 42af212 -Author: Evan Huus -Date: Fri Jan 31 18:05:49 2014 -0500 - - Add experimental gitreview file - - Change-Id: I8361e6c2c477eca51e53185527db19993b8ddb94 - Reviewed-on: https://code.wireshark.org/review/66 - Reviewed-by: Gerald Combs - Tested-by: Evan Huus - -commit cf48ff0 -Author: Stefan Metzmacher -Date: Wed Sep 19 20:21:04 2012 +0200 - - packet-iwarp-mpa: give more information if the ULPDU length doesn't match - - Try to dissect even it the size is not as expected. - Windows doesn't use alignment for smb-direct. - - Change-Id: I66c465d331aaab5caf28385a6dd3a43b63af2208 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/56 - Reviewed-by: Alexis La Goutte - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit f30b717 -Author: Martin Kaiser -Date: Fri Jan 31 21:12:37 2014 +0100 - - remove some of the unnecessary if(tree) checks - - Change-Id: Ie1b684327a77c265188d916c1242d335c55aa8cb - Reviewed-on: https://code.wireshark.org/review/65 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit 95477a9 -Author: Martin Kaiser -Date: Fri Jan 31 21:05:58 2014 +0100 - - TABs -> spaces - add editor modelines - - Change-Id: I5433e0d41a30043264a0f60c2166de471c80745c - Reviewed-on: https://code.wireshark.org/review/64 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit dc9c107 -Author: Stefan Metzmacher -Date: Wed Sep 19 15:38:43 2012 +0200 - - packet-iwarp-ddp-rdmap: make it possible to register "iwarp_ddp_rdmap" payload dissectors - - Change-Id: I4621cda936cb54c70de7e294cc760b9baff38961 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/54 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - Reviewed-by: Evan Huus - -commit 7feac74 -Author: Stefan Metzmacher -Date: Fri Jan 3 11:51:04 2014 +0100 - - Revert "In get_unicode_or_ascii_string(), check if the length is odd/even, not the offset. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778 - Volume label field ... is not displayed correctly ..." - - This is wrong it breaks all sort of things. The "Volume label field" - is a special case, which can be fixed by using nopad=TRUE. - - Change-Id: I3cd3f30ff0076d5e31a735391b175fd68e5fa142 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/26 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 505af30 -Author: Stefan Metzmacher -Date: Fri Jan 3 11:50:00 2014 +0100 - - packet-smb.c: real fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778 - - Change-Id: I33308c44791b487844f23db07d152897380d7cf1 - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/25 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 3d59ff9 -Author: Hadriel Kaplan -Date: Fri Jan 31 02:25:42 2014 -0500 - - Fix for Bug-9711 Lua: the Lua stack is growing slightly during initialization. - - Change-Id: I689319c0071fdb42583e8bd7633d8f0660c92f1b - Reviewed-on: https://code.wireshark.org/review/51 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit a94d127 -Author: Hadriel Kaplan -Date: Fri Jan 31 01:22:58 2014 -0500 - - Fix for Bug-9709 Lua: class attribute descriptions in API docs don't say if an attribute is read/write/both. - Also added some minor text to README.wslua for developers. - - Change-Id: I50b36f06710da6920ad98be6dde27d6091d91d54 - Reviewed-on: https://code.wireshark.org/review/50 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit b84d5ac -Author: Alexis La Goutte -Date: Fri Jan 31 17:02:02 2014 +0100 - - Enhance / Update ICMPv6 dissector - - * Update to the last IANA icmpv6-parameters (2014-01-30) - * Update to final draft (for RFC 6743 and RFC 6775) - * Add RFC 7112 (Implications of Oversized IPv6 Header Chains) support (Add new Parameter Problem code) - * Fix a encoding arg - - Change-Id: I90f65dfc54e5c0aff21a0e7ec2c937304aced02d - Reviewed-on: https://code.wireshark.org/review/62 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit b4f90d9 -Author: Alexis La Goutte -Date: Fri Jan 31 16:42:22 2014 +0100 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: Id7bab3a69514f159eda8d1285ca7f8f2d42e34ad - Reviewed-on: https://code.wireshark.org/review/61 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 2516e54 -Author: Alexis La Goutte -Date: Fri Jan 31 16:41:49 2014 +0100 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I695824b95f5e8978c2b58c4e98471d1ed204d686 - Reviewed-on: https://code.wireshark.org/review/60 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 848546e -Author: Stefan Metzmacher -Date: Sat Sep 29 10:35:13 2012 +0200 - - packet-smb2: dissect SMBDirect Buffer Descriptors - - Change-Id: Ie91c19078a92f36044b4eee55c3228e3257bf45d - Signed-off-by: Stefan Metzmacher - Reviewed-on: https://code.wireshark.org/review/53 - Reviewed-by: Alexis La Goutte - Tested-by: Alexis La Goutte - -commit 764cc74 -Author: Hadriel Kaplan -Date: Fri Jan 31 02:57:37 2014 -0500 - - Fix for Bug-9712 Lua: changes to WTAP_FILE_ #define names prevents them being in init.lua - - Change-Id: I0a2ccd686a89ffbc918a7b8b6af4a0ba8a5ab097 - Reviewed-on: https://code.wireshark.org/review/52 - Reviewed-by: Gilbert Ramirez - Tested-by: Gilbert Ramirez - -commit 5c7d57a -Author: Hadriel Kaplan -Date: Wed Jan 29 23:43:31 2014 -0500 - - In .gitignore: added dylib and sublimetext file types to be ignored, plus init.lua from anywhere, and removed the dir-specific entries for it. - - Change-Id: I4b1f9b1603dcbf1e895944a4ccf382ad6ee309b0 - Reviewed-on: https://code.wireshark.org/review/49 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 21e0a63 -Author: Evan Huus -Date: Wed Jan 29 18:04:20 2014 -0500 - - Add remove_last_data_source and fix bug 9169 - - The OP asked 9169 to be reopened because the capture was spewing ~40GB of output - when dissected with tshark. Investigation showed this was because the HTTP - dissector was requesting ONE_MORE_PACKET reassembly a lot, and TCP was adding - each step as a data-source which was being printed by tshark's hex dump. This - was leading to O(n^2) of output. - - To fix, introduce function remove_last_data_source which removes the most recent - data source from the list. If the subdissector in TCP reassembly asks for - ONE_MORE_PACKET, assume it hasn't added any tree items (since it shouldn't have) - and remove the data source since it is unnecessary. - - This may break dissectors which add tree items and *then* return - ONE_MORE_PACKET, since they will have their data source removed out from under - them. I believe those cases should be fixed to not add tree items until they're - sure they have enough data. - - Change-Id: Iff07f959b8b8bd1acda9bff03f7c8684901ba8aa - Reviewed-on: https://code.wireshark.org/review/38 - Reviewed-by: Evan Huus - Tested-by: Evan Huus - -commit 458b835 -Author: Jiri Engelthaler -Date: Thu Jan 30 12:37:57 2014 +0100 - - IEC60870-5-104: Added decoding of integrated totals without time tag, fixed inverted logic of "Overflow" and "Adjusted" bits, some minor code style changes. - - Change-Id: I76af5eabfd08f312f37547bcc10e3ffe10b17f2a - -commit 40c459e -Merge: 436fe9c 88e82bd -Author: Alexis La Goutte -Date: Thu Jan 30 10:36:25 2014 +0000 - - Merge "openSAFETY: Fixing field / byte assignment" - -commit 88e82bd -Author: Roland Knall -Date: Thu Jan 30 10:50:57 2014 +0100 - - openSAFETY: Fixing field / byte assignment - - - SNMT messages where presented in a way, where the value of the - field was not pointing to the correct bytes where it came from - - Sender / Receiver where renamed to be better understandable - - SN send to (Receiver) now comes first as it does in the byte - stream - - Change-Id: I364cb248bed9489c0cf9c7bf9fbd37b0225dbd78 - -commit 436fe9c -Author: Stig Bjørlykke -Date: Wed Jan 29 11:13:47 2014 +0100 - - Lua: Improved running in build directory. - - Load system init.lua from build-directory/epan/wslua - Set Lua datafile_path to source-directory/epan/wslua - Made dofile() search in source-directory/epan/wslua - - Change-Id: I009234eb8193c1ed3260455b245c256c9747930f - -commit 7daae6d -Author: Gerald Combs -Date: Wed Jan 29 17:15:25 2014 -0800 - - Fix Juan Antonio Montesinos' name. - - Change-Id: Ifb948839e92c2228addfbdcb19ed94fc38624bdd - -commit 45fea8e -Author: Evan Huus -Date: Wed Jan 29 18:10:22 2014 -0500 - - Add missing gitignore entries - - Change-Id: Icfdde6bad4aed8dfd5c0b14a04c37395dfbf0395 - -commit 5f91002 -Author: Martin Kaiser -Date: Wed Jan 29 23:24:47 2014 +0100 - - replace spaces with a TAB - - Change-Id: I8340b4af524b5c4ffb1a10b0eccd809f1d6b1e9f - -commit 1c09d04 -Merge: 8f15d3a 2c28c5d -Author: Martin Kaiser -Date: Wed Jan 29 22:20:47 2014 +0000 - - Merge "MIME: Rename image dissectors to file dissectors." - -commit 2c28c5d -Author: Michal Labedzki -Date: Fri Jan 24 15:45:43 2014 +0100 - - MIME: Rename image dissectors to file dissectors. - - Change-Id: Ie160733ceeed23ff96ddccfbf0ca2e7694789ff8 - -commit 8f15d3a -Author: Pascal Quantin -Date: Wed Jan 22 14:49:38 2014 +0100 - - Fix display of right arrow in CSV export - - Changeset 1d8a895fa4d7c16d213bda50b1177eccbb54326e introduced the use of UTF-8 righ arrow to indicate the direction in TCP dissector. - While it displays nicely in Wireshark GUI or in a text export of packets, an export to CSV results in an escaped string. - This patch is a naive attempt to display the right arrow in a more friendly way when exporting to CSV. - Any smarter fix is welcome. - - Change-Id: Ife787268696fa69dafc24a5cf9706af4c4832831 - -commit d1fb817 -Merge: f97d6f3 82c5bfd -Author: Gerald Combs -Date: Wed Jan 29 19:56:48 2014 +0000 - - Merge "We have a usable tag now. There's no need to fake a version number." - -commit f97d6f3 -Author: Hadriel Kaplan -Date: Wed Jan 29 14:02:33 2014 -0500 - - Fix for Bug 9707 'Lua: init.lua has multiple 'MENU_STAT_TELEPHONY' values' - - Change-Id: If4ee1906aa60dd37366cf2ef9bc4168e0ea024b6 - -commit 82c5bfd -Author: Gerald Combs -Date: Wed Jan 29 11:53:04 2014 -0800 - - We have a usable tag now. There's no need to fake a version number. - - Change-Id: Ic6a704013b38e9be130be40098e9293e9196bfec - -commit 60a1931 -Merge: 5982c61 e4a140c -Author: Stig Bjørlykke -Date: Wed Jan 29 18:29:59 2014 +0000 - - Merge "Lua: Added a utility function file_exists()." - -commit 5982c61 -Merge: 6167a0f 7649011 -Author: Alexis La Goutte -Date: Wed Jan 29 17:44:54 2014 +0000 - - Merge "Apply layouts in Qt Creator. Fix a tooltip." - -commit 6167a0f -Author: Stefan Metzmacher -Date: Wed Oct 31 13:06:09 2012 +0100 - - packet-smb2: fix lease epoch fields - - Bug: 9703 - - Change-Id: I1955360adaee53846f084434c59180d715e19fcd - Signed-off-by: Stefan Metzmacher - -commit cac3024 -Merge: a5b2a9c fc21610 -Author: Alexis La Goutte -Date: Wed Jan 29 17:42:10 2014 +0000 - - Merge "smb2: Lease Epoch is only 16 bit" - -commit fc21610 -Author: Volker Lendecke -Date: Tue Jan 28 11:27:14 2014 +0100 - - smb2: Lease Epoch is only 16 bit - - See [MS-SMB2] 2.2.14.2.12 - - Bug: 9703 - - Change-Id: Ia9c9c658bd5020e0dad84fc74617fed60ce7df06 - Signed-off-by: Volker Lendecke - Reviewed-by: Stefan Metzmacher - -commit a5b2a9c -Merge: a20d788 05a7306 -Author: Alexis La Goutte -Date: Wed Jan 29 17:39:22 2014 +0000 - - Merge "smb2: Fix a typo" - -commit e4a140c -Author: Stig Bjørlykke -Date: Wed Jan 29 16:05:48 2014 +0100 - - Lua: Added a utility function file_exists(). - - This function can be used to check for files before calling dofile(), - which will fail for non-existing files. - - Change-Id: Iae7b7ef6d8eb6e0e18f98fee7c740d2a5705eef3 - -commit a20d788 -Author: Gilbert Ramirez -Date: Wed Jan 29 04:59:10 2014 -0800 - - Add newlines at end of files that are missing them. - - gcc 4.1.2 complained with: - No newline at end of file - - Change-Id: I813af88737e725a328713eea4a7096d28942f9b2 - -commit 05a7306 -Author: Volker Lendecke -Date: Tue Jan 28 11:12:09 2014 +0100 - - smb2: Fix a typo - - Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9703 - - Change-Id: I8ebb20a48e1131fcf14ee55e5e1822a8dcd713d2 - Signed-off-by: Volker Lendecke - Reviewed-by: Stefan Metzmacher - -commit 447c963 -Author: Martin Kaiser -Date: Sat Jan 25 19:06:25 2014 +0100 - - tree variables don't have to be initialized - - Change-Id: Ic87133b143170d0146cd3a8fb23f8d0b33ec6502 - -commit 221878b -Merge: 58bb472 2df4f47 -Author: Gerald Combs -Date: Tue Jan 28 19:13:40 2014 +0000 - - Merge "[Automatic manuf, services and enterprise-numbers update for 2014-01-26]" - -commit 58bb472 -Author: Bill Meier -Date: Tue Jan 28 03:09:03 2014 +0000 - - Comment out a lot more hf[] entries and related. - (Found by checkhf). - - Note: There's quite a large amount of hf[] entries which are - commented out. I wonder if there are "top-level" entries - missing from the "parse-tree" arrays ? - - - svn path=/trunk/; revision=54990 - -commit 9d0207e -Author: Bill Meier -Date: Tue Jan 28 03:06:03 2014 +0000 - - Comment out unused hf[] entries and related found by checkhf. - - svn path=/trunk/; revision=54989 - -commit c1e53e7 -Author: Bill Meier -Date: Tue Jan 28 03:02:37 2014 +0000 - - Re-arrange #if 0/#endif related to an hf[] entry so that checkhf doesn't complain. - - svn path=/trunk/; revision=54988 - -commit 953d54b -Author: Evan Huus -Date: Tue Jan 28 00:48:23 2014 +0000 - - From Marko Hrastovec via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9697 - - Architectural support for multiple version of the same Asterix categories. - Includes implementation of CAT064 v.0.17. - - svn path=/trunk/; revision=54987 - -commit a40f824 -Author: Anders Broman -Date: Mon Jan 27 19:22:10 2014 +0000 - - Make it easier to try GTK 3.6 - - svn path=/trunk/; revision=54986 - -commit 257e301 -Author: Gerald Combs -Date: Mon Jan 27 18:43:57 2014 +0000 - - Convert the quick setup chapter to AsciiDoc and start converting its - content to Git. - - svn path=/trunk/; revision=54985 - -commit 5c9c6cd -Author: Bill Meier -Date: Mon Jan 27 18:22:39 2014 +0000 - - Fix hf[] entries with refs to range_string arrays - to add missing BASE_RANGE_STRING and to use RVALS instead of VALS. - - Fixes crashes in 'tshark -G values' and presumably also fixes - crashes when used in a dissection. - - Introduced in SVN #54449. - - (I suspect that ' convert_proto_tree_add_text.pl' may need some work - to handle range_strings). - - - - svn path=/trunk/; revision=54984 - -commit 80b5c57 -Author: Bill Meier -Date: Mon Jan 27 17:20:44 2014 +0000 - - Fix: value string specified as a BASE_VAL64_STRING in - an hf[] entry but defined as a 'value_string' intead of - as a 'val64_string'. - - Caused 'tshark -G values' to crash - (and presumably would also cause a crash when the value-string - is referenced in a dissection): - - Introduced in svn #54728 - - (Note: There's still another 'tshark -G values' crash to to found & fixed) - - - svn path=/trunk/; revision=54983 - -commit dfb3d16 -Author: Bill Meier -Date: Mon Jan 27 14:33:54 2014 +0000 - - (Trivial) Fix spellling in a comment. - - svn path=/trunk/; revision=54982 - -commit dab2768 -Author: Evan Huus -Date: Mon Jan 27 13:42:34 2014 +0000 - - From Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612 - - Fix possibly-uninitialized variable caught by valgrind fuzzing in AMQP. - - svn path=/trunk/; revision=54981 - -commit 2338fde -Author: Evan Huus -Date: Mon Jan 27 13:12:59 2014 +0000 - - Add missing cast. - - svn path=/trunk/; revision=54980 - -commit 9416835 -Author: Martin Mathieson -Date: Mon Jan 27 12:54:34 2014 +0000 - - Revert part of previous change - - svn path=/trunk/; revision=54979 - -commit f903141 -Author: Martin Mathieson -Date: Mon Jan 27 12:06:46 2014 +0000 - - Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back to previous setting - - svn path=/trunk/; revision=54978 - -commit 3abb51a -Author: Stig Bjørlykke -Date: Mon Jan 27 09:57:24 2014 +0000 - - Do not handle BER bitstring as ASCII string, because this will fail - when the first bit is set. - - svn path=/trunk/; revision=54977 - -commit fbaff1f -Author: Stig Bjørlykke -Date: Mon Jan 27 09:55:46 2014 +0000 - - Add back the fix from revision 54693. - - svn path=/trunk/; revision=54976 - -commit face757 -Author: Stig Bjørlykke -Date: Mon Jan 27 09:02:06 2014 +0000 - - Added back x509af_get_last_algorithm_id() removed in revision 54647 to - restore usage in cms and pkcs12. They never got a valid value in - actx->external.direct_reference because they use another actx in this case. - - This will add back the global variable in x509af, but this is needed - until we manage to pass the value in another way. - - See comments in bug 9573. - - svn path=/trunk/; revision=54975 - -commit b48a2db -Author: Gerald Combs -Date: Mon Jan 27 05:26:38 2014 +0000 - - Try to fix the path selector argument. - - svn path=/trunk/; revision=54974 - -commit 59990b7 -Author: Gerald Combs -Date: Mon Jan 27 05:10:34 2014 +0000 - - Fix a section name conflict. - - svn path=/trunk/; revision=54973 - -commit 5b17df0 -Author: Gerald Combs -Date: Mon Jan 27 04:34:25 2014 +0000 - - Restore an inadvertently deleted file. - - svn path=/trunk/; revision=54972 - -commit 5344e2f -Author: Gerald Combs -Date: Mon Jan 27 04:20:44 2014 +0000 - - Migrate the build environment introduction to AsciiDoc. - - svn path=/trunk/; revision=54971 - -commit e61a653 -Author: Gerald Combs -Date: Mon Jan 27 03:08:01 2014 +0000 - - Convert the preface to AsciiDoc with minor edits. - - svn path=/trunk/; revision=54970 - -commit bb21a09 -Author: Jörg Mayer -Date: Sun Jan 26 22:21:28 2014 +0000 - - GPLv2 -> GPLv2+ - - svn path=/trunk/; revision=54969 - -commit bdcf549 -Author: Alexis La Goutte -Date: Sun Jan 26 18:24:56 2014 +0000 - - lupdate / lrelease ui/qt/Qtshark.pro - - svn path=/trunk/; revision=54968 - -commit ea227de -Author: Alexis La Goutte -Date: Sun Jan 26 18:24:45 2014 +0000 - - Fix indent (Use 4spaces) and modelines info - - svn path=/trunk/; revision=54967 - -commit 2df4f47 -Author: Gerald Combs -Date: Sun Jan 26 09:06:14 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-01-26] - - Change-Id: Iaec909df5c97e92ee5d25b2ef1593b9dc00f0ad6 - -commit c6022b3 -Author: Alexis La Goutte -Date: Sun Jan 26 12:56:32 2014 +0000 - - Drop support of Visual Studio 2005 - - * Remove _MSC_VER < 1500 check - * Cleanup config.nmake - - See http://www.wireshark.org/lists/wireshark-dev/201305/msg00159.html - - svn path=/trunk/; revision=54965 - -commit 47f50d1 -Author: Alexis La Goutte -Date: Sun Jan 26 12:56:16 2014 +0000 - - Fix indent (Use 4 spaces) and add modelines - - svn path=/trunk/; revision=54964 - -commit c802536 -Author: Alexis La Goutte -Date: Sun Jan 26 12:55:59 2014 +0000 - - Fix encoding arg for RSVP dissector (with fix-encodings-args tools - - svn path=/trunk/; revision=54963 - -commit 64fd4c9 -Author: Bill Meier -Date: Sat Jan 25 18:44:29 2014 +0000 - - (Trivial) update a comment - - svn path=/trunk/; revision=54962 - -commit b2c8429 -Author: Martin Kaiser -Date: Sat Jan 25 14:38:51 2014 +0000 - - TABs -> spaces - add editor modelines - - svn path=/trunk/; revision=54961 - -commit 0d1f902 -Author: Martin Kaiser -Date: Sat Jan 25 14:29:45 2014 +0000 - - BASE_NONE -> STR_ASCII - - svn path=/trunk/; revision=54960 - -commit 5a70a53 -Author: Martin Kaiser -Date: Sat Jan 25 14:27:49 2014 +0000 - - the sametime dissector stores the result of tvb_get_string() into hf - variables that can handle only 7bit ascii strings - replace this with tvb_get_string_enc() - - svn path=/trunk/; revision=54959 - -commit 4a32b10 -Author: Gerald Combs -Date: Sat Jan 25 03:27:22 2014 +0000 - - Comment out the "diff" section for now. We'll have to update it for "git - diff" at some point. - - svn path=/trunk/; revision=54958 - -commit b326fe6 -Author: Gerald Combs -Date: Sat Jan 25 02:26:12 2014 +0000 - - Uncomment anchors. - - svn path=/trunk/; revision=54957 - -commit b87a2cb -Author: Gerald Combs -Date: Sat Jan 25 01:49:57 2014 +0000 - - Fix Windows build. - - svn path=/trunk/; revision=54956 - -commit 927914a -Author: Gerald Combs -Date: Sat Jan 25 01:09:28 2014 +0000 - - Fix xpath selector. Clean up whitespace. - - svn path=/trunk/; revision=54955 - -commit 4c5bb90 -Author: Gerald Combs -Date: Sat Jan 25 01:01:04 2014 +0000 - - Migrate more SVN content to Git+Gerrit. - - svn path=/trunk/; revision=54954 - -commit 0555a54 -Author: Gerald Combs -Date: Sat Jan 25 00:17:46 2014 +0000 - - Migrate some of the SVN-specific content to Git. - - svn path=/trunk/; revision=54953 - -commit c57ac03 -Author: Gerald Combs -Date: Sat Jan 25 00:17:19 2014 +0000 - - Try to get CMake to build the Developer Guide again. I don't have - dblatex installed so the release notes fail to build but the WSDG - targets appear to work. - - svn path=/trunk/; revision=54952 - -commit a7ea594 -Author: Evan Huus -Date: Fri Jan 24 20:48:55 2014 +0000 - - The wimax plugin primarily uses tvb_get_ptr buffer accesses instead of the - safe accessor functions, and it's all done via scary bit-twiddling macros to - boot. - - Create the macros TVB_NIB_WORD and TVB_NIB_NIBBLE that (should) behave just - like the raw-pointer NIB_WORD and NIB_NIBBLE macros, except using the safe tvb - functions instead. - - Replace two instances with the safe versions, which fixes an out-of-bounds - access caught by my valgrind fuzzer. If this doesn't break anything then we - should probably do a wholesale replacement at some point, but I'm not feeling - that adventurous at the moment. - - svn path=/trunk/; revision=54951 - -commit 5be3544 -Author: Bill Meier -Date: Fri Jan 24 20:24:02 2014 +0000 - - Mark a few function parameters as unused.... - - svn path=/trunk/; revision=54950 - -commit 1bd982a -Author: Bill Meier -Date: Fri Jan 24 20:19:06 2014 +0000 - - Rework and simplify the code to follow the principle of "dissect as - much as possible" rather than dissecting nothing if the length of a - set of fields (e.g., a "command") seems wrong or if an exception - occurs fetching data before previous fields have been displayed. - In general: just fetch/dissect from start to end: If there is missing - data, a Wireshark exception will eventually occur; - - Add lwm subtrees under the lwm protocol tree (*not* as protocols - under the top (outermost) tree. - - Fix a bug which caused an exception to be reported as: - "[Packet size limited during capture: LwMesh truncated]" - rather than as the correct: "[Malformed...]" - - col_...() and expert...() functions shouldn't be called under 'if(tree)'; - - Register the heuristic dissector using "IEEE802154_PROTOABBREV_WPAN" - (like certain other dissectors) rather than using "wpan"; - - missmatch --> mismatch - - Fix some long lines. - - - svn path=/trunk/; revision=54949 - -commit c1a88c0 -Author: Pascal Quantin -Date: Fri Jan 24 20:08:22 2014 +0000 - - Add packet-mbim.h to Makefile.common - - svn path=/trunk/; revision=54948 - -commit fae1cf2 -Author: Gerald Combs -Date: Fri Jan 24 19:50:43 2014 +0000 - - Make "all" the default target again. - - svn path=/trunk/; revision=54947 - -commit 5368012 -Author: Gerald Combs -Date: Fri Jan 24 19:12:59 2014 +0000 - - Fix AsciiDoc WSDG build on Windows. - - svn path=/trunk/; revision=54946 - -commit 8997fb0 -Author: Gerald Combs -Date: Fri Jan 24 18:55:27 2014 +0000 - - Start migrating the Developer's Guide to AsciiDoc. So far only one - chapter (WSDG_chapter_sources) has been converted. - - Conversion was done using the script in - https://code.wireshark.org/review/#/c/9/ along with manual cleanup. - Changes are mostly limited formatting. - - It's helpful to have a copy of the pre-conversion guide for comparison. - I've placed a chunked copy online at - http://www.wireshark.org/~gerald/wsdg_html_2014_01/ . - - Tested under Autotools. Nmake and CMake will likely break. I'll take a - look shortly. If only we had documention adding a feature branch to - Gerrit and using it to test different platforms... - - svn path=/trunk/; revision=54945 - -commit d8c15b8 -Author: Pascal Quantin -Date: Fri Jan 24 18:53:06 2014 +0000 - - Add ability to register new UUID and CIDs - - svn path=/trunk/; revision=54944 - -commit ef935ca -Author: Bill Meier -Date: Fri Jan 24 17:19:25 2014 +0000 - - Remove some old obsolete text in the proto_tree_add_text() description. - - svn path=/trunk/; revision=54943 - -commit 7a44616 -Author: Pascal Quantin -Date: Fri Jan 24 16:33:31 2014 +0000 - - Fix dissection of 8PSK Power Capability IE - - svn path=/trunk/; revision=54942 - -commit 3cbe97d -Author: Evan Huus -Date: Fri Jan 24 15:52:28 2014 +0000 - - Give valgrind fuzzing a bit more time. Otherwise we have some large (~80MB) - captures in the menagerie which time out even under normal circumstances. - - svn path=/trunk/; revision=54941 - -commit 2fa2515 -Author: Guy Harris -Date: Fri Jan 24 07:55:03 2014 +0000 - - Check for a zero offset in the "get status" reply *before* adding the - offset in the tvbuff of the beginning of the packet to it. Otherwise, - it will never be zero, and the tests will always think the field pointed - to by the offset is present. - - svn path=/trunk/; revision=54938 - -commit c86c9ed -Author: Jörg Mayer -Date: Fri Jan 24 06:42:49 2014 +0000 - - Looks like the asciidoc stuff is wip and breaks cmake builds. - Comment it out for now. - - svn path=/trunk/; revision=54937 - -commit a9ddc06 -Author: Gerald Combs -Date: Fri Jan 24 01:10:10 2014 +0000 - - Prepare for conversion of Guide chapters to AsciiDoc. - - svn path=/trunk/; revision=54936 - -commit 81f3392 -Author: Martin Kaiser -Date: Thu Jan 23 22:20:35 2014 +0000 - - country and language are ISO-8859-1 - - svn path=/trunk/; revision=54935 - -commit 089cedc -Author: Martin Kaiser -Date: Thu Jan 23 22:19:52 2014 +0000 - - make the menu string filterable - - svn path=/trunk/; revision=54934 - -commit 055be45 -Author: Martin Kaiser -Date: Thu Jan 23 22:18:41 2014 +0000 - - the menu string is a DVB string - - svn path=/trunk/; revision=54933 - -commit bc14487 -Author: Alexis La Goutte -Date: Thu Jan 23 20:31:20 2014 +0000 - - From me for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9519 RSVP dissector does not decode Session Object (1) C-type (13) message - - svn path=/trunk/; revision=54932 - -commit f07d9eb -Author: Alexis La Goutte -Date: Thu Jan 23 20:01:51 2014 +0000 - - Remove Update.c (and nio-ie5.[ch]) - - Never use... and replace by (Win)Sparkle - - svn path=/trunk/; revision=54931 - -commit 86930dd -Author: Bill Meier -Date: Thu Jan 23 15:11:00 2014 +0000 - - Given that we allow the 'outfile file' to be stdout, then presumably all - text messages (including informational) should go to stderr. - - svn path=/trunk/; revision=54930 - -commit 9be9ba5 -Author: Bill Meier -Date: Thu Jan 23 14:39:29 2014 +0000 - - printf(...) --> fprintf(stderr,...) (in a commented out line of code) - - svn path=/trunk/; revision=54929 - -commit 893b1aa -Author: Evan Huus -Date: Thu Jan 23 13:39:39 2014 +0000 - - Remove duplicate #include. - - svn path=/trunk/; revision=54928 - -commit a70ec94 -Author: Pascal Quantin -Date: Thu Jan 23 07:57:20 2014 +0000 - - Please GCC 4.3.2 that complains about a wrong 'variable may be used uninitialized in this function' error - - svn path=/trunk/; revision=54927 - -commit 8376b41 -Author: Guy Harris -Date: Thu Jan 23 02:46:56 2014 +0000 - - Use tvb_get_string_enc() rather than tvb_get_string(). - - svn path=/trunk/; revision=54926 - -commit d281533 -Author: Guy Harris -Date: Thu Jan 23 02:37:43 2014 +0000 - - Use tvb_get_string_enc() rather than tvb_get_string(). RFC 5352 says, - in section 6.1 "Registration.Request Primitive": - - The Pool Handle parameter contains a NULL terminated ASCII - string of fixed length. - - svn path=/trunk/; revision=54925 - -commit 8944519 -Author: Guy Harris -Date: Thu Jan 23 02:30:00 2014 +0000 - - Use tvb_get_string_enc() rather than tvb_get_string(). - - Update URL of spec. - - svn path=/trunk/; revision=54924 - -commit 138987a -Author: Guy Harris -Date: Thu Jan 23 02:24:34 2014 +0000 - - Use tvb_get_string_enc() rather than tvb_get_string(). The version of - the AR.drone Developer Guide I found online mentioned ASCII but not - UTF-8. - - svn path=/trunk/; revision=54923 - -commit 732db28 -Author: Evan Huus -Date: Thu Jan 23 01:48:13 2014 +0000 - - Use wmem_new0 to ensure that all field values are initialized. Caught by - valgrind fuzzing. - - svn path=/trunk/; revision=54922 - -commit 6dcce1f -Author: Guy Harris -Date: Thu Jan 23 01:45:55 2014 +0000 - - Use tvb_get_string_enc() rather than tvb_get_string(). The specs say - ASCII, but there's a proposal to use UTF-8. - - svn path=/trunk/; revision=54921 - -commit d4b7cc2 -Author: Guy Harris -Date: Thu Jan 23 01:37:39 2014 +0000 - - Use tvb_get_string_enc() rather than tvb_get_string(). - - svn path=/trunk/; revision=54920 - -commit aa69618 -Author: Guy Harris -Date: Thu Jan 23 01:35:28 2014 +0000 - - Use tvb_memdup(), not tvb_get_string(), when copying octets (such as - octets within a BCD number). - - Use tvb_get_string_enc() rather than tvb_get_string(). - - svn path=/trunk/; revision=54919 - -commit 4541827 -Author: Martin Kaiser -Date: Wed Jan 22 22:37:10 2014 +0000 - - BASE_NONE -> STR_ASCII - - svn path=/trunk/; revision=54918 - -commit 205a9f9 -Author: Guy Harris -Date: Wed Jan 22 22:37:08 2014 +0000 - - Use tvb_get_string_enc() rather than tvb_get_string(); according to - TIA/EIA-637-A, call-back numbers are either BCD or ASCII. - - svn path=/trunk/; revision=54917 - -commit fc58650 -Author: Martin Kaiser -Date: Wed Jan 22 22:34:46 2014 +0000 - - use tvb_get_string_enc() - - svn path=/trunk/; revision=54916 - -commit a592b6a -Author: Martin Kaiser -Date: Wed Jan 22 22:29:54 2014 +0000 - - BASE_NONE -> STR_ASCII - - svn path=/trunk/; revision=54915 - -commit 0f44a72 -Author: Martin Kaiser -Date: Wed Jan 22 22:28:27 2014 +0000 - - use tvb_get_string_enc(), the strings are 7-bit ascii - - svn path=/trunk/; revision=54914 - -commit 0c44ca6 -Author: Martin Kaiser -Date: Wed Jan 22 22:23:22 2014 +0000 - - BASE_NONE -> STR_ASCII - - svn path=/trunk/; revision=54913 - -commit 6d85633 -Author: Martin Kaiser -Date: Wed Jan 22 22:20:16 2014 +0000 - - edonkey seems to use 7-bit ascii for its tags etc - (not sure about one item that could contain arbitrary data...) - - svn path=/trunk/; revision=54912 - -commit 28a5c66 -Author: Martin Kaiser -Date: Wed Jan 22 21:57:42 2014 +0000 - - no need for if(tree) - - svn path=/trunk/; revision=54911 - -commit 2222969 -Author: Guy Harris -Date: Wed Jan 22 20:51:56 2014 +0000 - - Use tvb_get_string_enc() with appropriate encodings rather than - tvb_get_string(). (Some versions of the spec speak of ISO 8859-15 - strings as well as UTF-8 strings, but we don't appear to try to handle - those.) - - Update spec URL. - - svn path=/trunk/; revision=54910 - -commit dd8cf3d -Author: Guy Harris -Date: Wed Jan 22 20:29:47 2014 +0000 - - Use tvb_get_string_enc(), and assume ASCII for E.164 addresses. (I must - be misreading Q.2630.3, as it seems to indicate that the addresses are - BCD, not ASCII, speaking as it does of "hexadecimal digit[s] of - address[es]". - - svn path=/trunk/; revision=54909 - -commit 2019647 -Author: Guy Harris -Date: Wed Jan 22 20:05:17 2014 +0000 - - At least according to - - http://web.archive.org/web/20080308233204/http://dev.aol.com/aim/oscar/#SNAC - - "In general strings are not NULL terminated and are encoded using UTF8." - - It also says - - Authentication - - Over the years, the AIM backend has supported several different - methods for authentication. ... - - When a client collects the loginId and password for the user it - should not normalize them in any manner. It also should not - prevent the user from entering certain characters as the AIM - name space is constantly changing. For example, currently the - AIM name space is ASCII based, but in the future that may - change. In general, the client should not perform input - checking and instead allow the backend to reject bad values. - - which also suggests not assuming ASCII. - - So use ENC_UTF_8 in most cases. - - For actual messages, it says: - - An IM can be encoded in the following different forms: - - Name Value Notes - ASCII 0 ANSI ASCII -- ISO 646 - UNICODE 2 ISO 10646.USC-2 Unicode - LATIN_1 3 ISO 8859-1 - - so, if that's the case, the dissector should choose beween - ENC_ASCII|ENC_NA, ENC_UCS_2|ENC_appropriate_ENDIAN, and - ENC_ISO_8859_1|ENC_NA. - - Use tvb_get_string_enc() with an encoding rather than tvb_get_string(). - - svn path=/trunk/; revision=54908 - -commit 76131de -Author: Guy Harris -Date: Wed Jan 22 19:46:20 2014 +0000 - - Update introductory comment to have correct file name. - - svn path=/trunk/; revision=54907 - -commit 07f22ff -Author: Guy Harris -Date: Wed Jan 22 19:31:03 2014 +0000 - - Use tvb_get_string_enc() rather than tvb_get_string(). - - XXX - if we supported various MacXXX character encodings, we could use - those; that might require a preference to specify the encoding. - - svn path=/trunk/; revision=54906 - -commit 2b26c1e -Author: Gerald Combs -Date: Wed Jan 22 18:15:44 2014 +0000 - - Prepare for Git migration. - - Mass-replace "svn" with "git". Add commented code to use git to fetch - the repository version. - - svn path=/trunk/; revision=54905 - -commit 6b7fc8f -Author: Guy Harris -Date: Wed Jan 22 10:39:59 2014 +0000 - - Use tvb_get_string_enc() with an explicit encoding, and assume ASCII. - Fix the encoding argument to proto_tree_add_item() calls that add - strings. - - svn path=/trunk/; revision=54904 - -commit 6e70ecd -Author: Guy Harris -Date: Wed Jan 22 07:55:06 2014 +0000 - - Fetch strings using tvb_get_string_enc() and the appropriate encoding. - - svn path=/trunk/; revision=54903 - -commit a3fee17 -Author: Alexis La Goutte -Date: Wed Jan 22 07:49:48 2014 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54902 - -commit a5e7958 -Author: Alexis La Goutte -Date: Wed Jan 22 07:49:40 2014 +0000 - - Fix encoding arg (found by encoding arg tools) - - svn path=/trunk/; revision=54901 - -commit 923c5b3 -Author: Alexis La Goutte -Date: Wed Jan 22 07:49:31 2014 +0000 - - Fix the second argument of some proto_item_add_subtree (function : dissect_vendor_tr111_suboption and dissect_vendor_cl_suboption) - - It is a ett variable no hf variable - - svn path=/trunk/; revision=54900 - -commit 90e6423 -Author: Guy Harris -Date: Wed Jan 22 07:33:57 2014 +0000 - - I don't see any specification of how a H221NonStandardIdentifier is - encoded, but let's say it's pure ASCII for now. - - svn path=/trunk/; revision=54899 - -commit ee88d38 -Author: Anders Broman -Date: Wed Jan 22 06:13:17 2014 +0000 - - Add a SCTP port range preference. - - svn path=/trunk/; revision=54898 - -commit 31116b5 -Author: Anders Broman -Date: Wed Jan 22 06:09:42 2014 +0000 - - Remove unused entity. - - svn path=/trunk/; revision=54897 - -commit d262ff8 -Author: Guy Harris -Date: Wed Jan 22 04:53:43 2014 +0000 - - Use tvb_get_string_enc() with an explicit encoding; it's a + or a -, so - just treat it as ASCII. - - svn path=/trunk/; revision=54896 - -commit 9ec41e3 -Author: Guy Harris -Date: Wed Jan 22 04:50:23 2014 +0000 - - The stuff you get from dissect_cbs_data() is UTF-8 encoded; treat it as - such. - - Replace proto_tree_add_string(..., tvb_get_string_enc(same ..., - ENC_xxx)) with proto_tree_add_item(..., ENC_xxx). - - svn path=/trunk/; revision=54895 - -commit d85bca8 -Author: Guy Harris -Date: Wed Jan 22 04:39:31 2014 +0000 - - Another probably-wrong tvb_get_string(). - - Also, add a URL for the PKCS #12 spec. - - svn path=/trunk/; revision=54894 - -commit 051cb78 -Author: Guy Harris -Date: Wed Jan 22 04:27:15 2014 +0000 - - To quote section B.5 "Keys for password integrity mode" of PKCS #12 - v1.1: Personal Information Exchange Syntax: - - http://www.emc.com/emc-plus/rsa-labs/pkcs/files/h11301-wp-pkcs-12v1-1-personal-information-exchange-syntax.pdf - - "When password integrity mode is used to protect a PFX PDU, a password - and salt are used to derive a MAC key. As with password privacy mode, - the password is a Unicode string, and the salt is a byte string." - - So, not having found any other references to salts as text strings, copy - it with tvb_memdup(), not tvb_get_string(). - - svn path=/trunk/; revision=54893 - -commit 19930d6 -Author: Guy Harris -Date: Wed Jan 22 04:14:05 2014 +0000 - - Clean up indentation and bracketing. - - svn path=/trunk/; revision=54892 - -commit c85b34e -Author: Guy Harris -Date: Wed Jan 22 04:13:37 2014 +0000 - - The strings in question are generated as UTF-8 from the CBS encoding, so - process them as such. - - svn path=/trunk/; revision=54891 - -commit e163578 -Author: Guy Harris -Date: Wed Jan 22 02:41:13 2014 +0000 - - Another tvb_get_string() replacement. - - svn path=/trunk/; revision=54890 - -commit c12dc67 -Author: Guy Harris -Date: Wed Jan 22 02:37:45 2014 +0000 - - Strings in LDAP are generally UTF-8, although if we treat something only - as a string if every byte in it is a printable ASCII character, it's - ASCII. Use tvb_get_string_enc() with an appropriate encoding. - - svn path=/trunk/; revision=54889 - -commit 5e0641f -Author: Guy Harris -Date: Wed Jan 22 02:04:15 2014 +0000 - - Use tvb_get_string_enc() with an explicit encoding. - - svn path=/trunk/; revision=54886 - -commit e35ca75 -Author: Guy Harris -Date: Wed Jan 22 01:28:31 2014 +0000 - - It's one character, either + or -, hence ASCII. - - svn path=/trunk/; revision=54885 - -commit a75657b -Author: Guy Harris -Date: Wed Jan 22 01:22:01 2014 +0000 - - It's not a string, it's a byte array (bit array, really). - - Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634. - - svn path=/trunk/; revision=54884 - -commit 9c95398 -Author: Bill Meier -Date: Wed Jan 22 01:10:31 2014 +0000 - - Clean up whitespace: use consistent indentation, etc; - Add editor modelines. - - svn path=/trunk/; revision=54883 - -commit 90d7c5f -Author: Guy Harris -Date: Wed Jan 22 00:26:36 2014 +0000 - - Don't write out packets that have a "captured length" bigger than we're - willing to read or that's bigger than will fit in the file format; - instead, report an error. - - For the "I can't write a packet of that type in that file type" error, - report the file type in question. - - svn path=/trunk/; revision=54882 - -commit 5c825d6 -Author: Martin Kaiser -Date: Tue Jan 21 22:16:05 2014 +0000 - - mp4 box type is always a 7bit ascii string - - svn path=/trunk/; revision=54881 - -commit ddb966f -Author: Guy Harris -Date: Tue Jan 21 20:13:40 2014 +0000 - - The file's name has a lower-case "p" in "9p". - - svn path=/trunk/; revision=54880 - -commit 87f4b37 -Author: Guy Harris -Date: Tue Jan 21 20:13:17 2014 +0000 - - Fix one half-changed tvb_get_string() call. - - svn path=/trunk/; revision=54879 - -commit 4eb619b -Author: Guy Harris -Date: Tue Jan 21 20:12:48 2014 +0000 - - Always combine ENC_UTF_8 with ENC_NA. - - svn path=/trunk/; revision=54878 - -commit 73598a7 -Author: Guy Harris -Date: Tue Jan 21 20:08:39 2014 +0000 - - IA5 = ASCII. Use tvb_get_string_enc() with an explicit encoding, not - tvb_get_string(). - - svn path=/trunk/; revision=54877 - -commit 4b02416 -Author: Guy Harris -Date: Tue Jan 21 19:53:52 2014 +0000 - - 9p strings are, not surprisingly, encoded using UTF-8; replace - tvb_get_string() calls with tvb_get_string_enc() calls explicitly - specifying UTF-8. - - svn path=/trunk/; revision=54876 - -commit f4ab2b2 -Author: Evan Huus -Date: Tue Jan 21 18:48:01 2014 +0000 - - Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe - Kaplan for the report. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 and some - other cases in the same vein. - - svn path=/trunk/; revision=54875 - -commit 4d9475e -Author: Guy Harris -Date: Tue Jan 21 09:56:34 2014 +0000 - - Get rid of tvb_get_faked_unicode() - tvb_get_string_enc() does the job - better. - - We don't need eventlog_get_unicode_string_length() in the eventlog - dissector, either - tvb_unicode_strsize() does the job just as well. - - svn path=/trunk/; revision=54874 - -commit 35d0d0f -Author: Pascal Quantin -Date: Tue Jan 21 08:59:47 2014 +0000 - - From Igor Slepchin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9675 : - RMT LCT dissector doesn't display 48-bit TOIs and TSIs properly - - svn path=/trunk/; revision=54873 - -commit 8f8eeb5 -Author: Guy Harris -Date: Tue Jan 21 08:50:35 2014 +0000 - - Check the return of wtap_dump_close() even if we've gotten a read error; - the only reason not to check it is if we've already gotten a write error - and another write error would be superfluous (either "you got two of the - same error" or "you got an I/O error *and* you ran out of disk - space/disk quota" is of limited interest). - - Discard the return value of wtap_dump_close() in the case where we've - already gotten a write error, in the hopes of squelching a Coverity - warning. - - svn path=/trunk/; revision=54872 - -commit 0bc06ee -Author: Bill Meier -Date: Tue Jan 21 02:32:48 2014 +0000 - - - Remove unneeded #includes; - - "Once-only" test not needed in proto_reg_handoff..(); - - Set COL_PROTOCOL, clear COL_INFO at the begining of the dissector - before fetching data from the tvb; - - Use tvb_reported_length; - - Use col_set_str/col_append_str where appropriate; - - Zigbee --> lwm; - - Fix typo; - - Reformat some whitespace for consistency. - - ToDo: - - Review use of col_...() and expert...() under 'if (tree)'; - - Review use of col_clear(..., COL_INFO) after text already added to COL_INFO; - - Review certain tvb fetches to ensure no fetches using a negative offset; - - svn path=/trunk/; revision=54871 - -commit 45d5b74 -Author: Guy Harris -Date: Tue Jan 21 01:44:58 2014 +0000 - - Fix declaration of tvb_get_string(). - - svn path=/trunk/; revision=54870 - -commit c540e33 -Author: Bill Meier -Date: Tue Jan 21 01:24:13 2014 +0000 - - Add properties .... - - svn path=/trunk/; revision=54869 - -commit 9cdf8dd -Author: Guy Harris -Date: Tue Jan 21 01:23:29 2014 +0000 - - Don't do the byte-with-8th-bit-set-to-REPLACEMENT-CHARACTER mapping for - UTF-8 strings. - - Add that mapping for null-terminated ASCII strings. - - Factor out some common parts of comments about string routines, and - clean up some other comments. - - svn path=/trunk/; revision=54868 - -commit 6517e3b -Author: Martin Kaiser -Date: Mon Jan 20 23:30:01 2014 +0000 - - don't use tvb_get_string(..., len) to get exactly len raw bytes - from a tvbuff - - svn path=/trunk/; revision=54867 - -commit ae82a1c -Author: Martin Kaiser -Date: Mon Jan 20 22:06:19 2014 +0000 - - make MMI strings filterable - - svn path=/trunk/; revision=54866 - -commit 26701ed -Author: Martin Kaiser -Date: Mon Jan 20 21:56:38 2014 +0000 - - remove todo comments - - svn path=/trunk/; revision=54865 - -commit 933e95c -Author: Martin Kaiser -Date: Mon Jan 20 21:39:00 2014 +0000 - - tvb_get_string(): replace 8bit characters with the unicode replacement char - - svn path=/trunk/; revision=54864 - -commit 1d27123 -Author: Guy Harris -Date: Mon Jan 20 21:37:32 2014 +0000 - - Longs are not guaranteed to be 64-bit. Use G_GINT64_MODIFIER to format - 64-bit quantities. - - svn path=/trunk/; revision=54863 - -commit 3a96d94 -Author: Anders Broman -Date: Mon Jan 20 20:36:42 2014 +0000 - - From Michal Labedzki: - Bluetooth/Ubertooth: Improvements: Support for new btsnoop format, almost finished btle and minor fixes. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606 - - svn path=/trunk/; revision=54862 - -commit 5fc0904 -Author: Anders Broman -Date: Mon Jan 20 20:30:41 2014 +0000 - - packet-bootp.c: In function 'dissect_vendor_generic_suboption': - packet-bootp.c:3293: warning: unused parameter 'pinfo' - packet-bootp.c:3293: warning: unused parameter 'v_ti' - packet-bootp.c:3294: warning: unused parameter 'optend' - - svn path=/trunk/; revision=54861 - -commit f0fb43a -Author: Anders Broman -Date: Mon Jan 20 20:26:04 2014 +0000 - - From alexeyv: - Add decryption for resumed TLS sessions with a session ticket. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5963 - - svn path=/trunk/; revision=54860 - -commit 6402d85 -Author: Anders Broman -Date: Mon Jan 20 20:03:49 2014 +0000 - - Add generic dissection of unknown vendor sub options. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9594 - - svn path=/trunk/; revision=54859 - -commit 77e4a2f -Author: Evan Huus -Date: Mon Jan 20 19:32:43 2014 +0000 - - Fix 32/64 casting and add a note where the loss of precision might actually be a - problem for 32-bit platforms. - - svn path=/trunk/; revision=54858 - -commit f5931c7 -Author: Evan Huus -Date: Mon Jan 20 19:13:42 2014 +0000 - - From Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612 - - AMQP 1.0 Dissector - - svn path=/trunk/; revision=54857 - -commit d241033 -Author: Alexis La Goutte -Date: Mon Jan 20 18:35:45 2014 +0000 - - From Lubos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9638 - - New Dissector For Lightweight Mesh protocol - - A dissector for ATMEL Lightweight Mesh protocol (lwm). - The protocol is carried on the top of 802.15.4 frame. - - From me: - * Add Modelines info - * Fix indent (use 4 spaces) - * Remove trailing whitespace - - svn path=/trunk/; revision=54856 - -commit c80e021 -Author: Alexis La Goutte -Date: Mon Jan 20 09:42:52 2014 +0000 - - Add modelines info - - svn path=/trunk/; revision=54855 - -commit fdee928 -Author: Alexis La Goutte -Date: Mon Jan 20 09:42:45 2014 +0000 - - Fix indent (use 4 spaces) and remove trailing whitespace - - svn path=/trunk/; revision=54854 - -commit 663ddb3 -Author: Alexis La Goutte -Date: Mon Jan 20 07:53:42 2014 +0000 - - Fix build with CMake (Missing tap_export_pdu in ui/CMakeLists.txt - - svn path=/trunk/; revision=54853 - -commit 18d3a70 -Author: Alexis La Goutte -Date: Mon Jan 20 07:53:00 2014 +0000 - - Fix typo (only need one comma) - - svn path=/trunk/; revision=54852 - -commit 072cce1 -Author: Anders Broman -Date: Mon Jan 20 06:59:10 2014 +0000 - - From Abdul Hannan Khan: - Correct AVP flags. - - svn path=/trunk/; revision=54851 - -commit e45896c -Author: Anders Broman -Date: Mon Jan 20 05:51:10 2014 +0000 - - Split the GUI and the tap part to make it possible to adapt to Qt. - - svn path=/trunk/; revision=54850 - -commit a8002aa -Author: Jörg Mayer -Date: Sun Jan 19 17:59:20 2014 +0000 - - Fix two coverity messages: - - *** CID 718534: Dereference before null check (REVERSE_INULL) - /tools/lemon/lemon.c: 3425 in translate_code() - 3419 rp->rhs[i]->index,i-rp->nrhs+1); - 3420 }else{ - 3421 /* No destructor defined for this term */ - 3422 } - 3423 } - 3424 } - >>> CID 718534: Dereference before null check (REVERSE_INULL) - >>> Null-checking "rp->code" suggests that it may be null, but it has already been - +dereferenced on all paths leading to the check. - 3425 if( rp->code ){ - 3426 cp = append_str(0,0,0,0); - 3427 rp->code = Strsafe(cp?cp:""); - 3428 } - 3429 } - 3430 - - *** CID 1156989: Out-of-bounds read (OVERRUN) - /tools/lemon/lemon.c: 3139 in tplt_xfer() - 3133 int i, iStart; - 3134 char line[LINESIZE]; - 3135 while( fgets(line,LINESIZE,in) && (line[0]!='%' || line[1]!='%') ){ - 3136 (*lineno)++; - 3137 iStart = 0; - 3138 if( name ){ - >>> CID 1156989: Out-of-bounds read (OVERRUN) - >>> Overrunning array "line" of 1000 bytes at byte offset 1000 using index "i" - +(which evaluates to 1000). - 3139 for(i=0; line[i] && iiStart ) fprintf(out,"%.*s",i-iStart,&line[iStart]); - 3144 fprintf(out,"%s",name); - - svn path=/trunk/; revision=54849 - -commit a0df200 -Author: Martin Kaiser -Date: Sun Jan 19 16:19:24 2014 +0000 - - coverity 702387 - add missing NULL check - - svn path=/trunk/; revision=54848 - -commit f544e08 -Author: Martin Kaiser -Date: Sun Jan 19 16:06:45 2014 +0000 - - coverity 281214 - check the return value of strtok() before passing it to strtoul() - - (can't be triggered in practice as dumpcap never sends a NULL string) - - svn path=/trunk/; revision=54847 - -commit bb5051e -Author: Gerald Combs -Date: Sun Jan 19 15:03:43 2014 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2014-01-19] - - svn path=/trunk/; revision=54844 - -commit 95ed1b4 -Author: Anders Broman -Date: Sun Jan 19 09:40:04 2014 +0000 - - As spotted by Joerg; make a HFILL_INIT(hf) macro and use it to init the private part of the hf structure. - - svn path=/trunk/; revision=54843 - -commit 113c6d5 -Author: Jörg Mayer -Date: Sun Jan 19 02:18:24 2014 +0000 - - Fix a typo - - svn path=/trunk/; revision=54842 - -commit 88a205d -Author: Jörg Mayer -Date: Sun Jan 19 01:08:52 2014 +0000 - - Error doesn't exist, use warning instead. - - svn path=/trunk/; revision=54841 - -commit 2a21b01 -Author: Jörg Mayer -Date: Sun Jan 19 00:48:22 2014 +0000 - - Add option to specify special permissions for dumpcap during cmake phase: - set(DUMPCAP_INSTALL_OPTION ) - where val is one of "normal" "suid" "capabilities" - - Some things left to do: - - Error out in cmake if setcap isn't found or libcap isn't found. - - Move multivalue option handling into it's own macro (-file) with - value checking - - - svn path=/trunk/; revision=54840 - -commit 5783452 -Author: Jörg Mayer -Date: Sat Jan 18 22:52:56 2014 +0000 - - -Warray-bounds was listed twice - - svn path=/trunk/; revision=54839 - -commit 8424cf3 -Author: Gerald Combs -Date: Sat Jan 18 00:03:02 2014 +0000 - - Add environment checks. Add a topic to our refspec. - - Check for a 'gerrit' remote and for a commit-msg hook. The hook script - doesn't work on my system. This might be due to - http://code.google.com/p/gerrit/issues/detail?id=843 - - svn path=/trunk/; revision=54838 - -commit 6429497 -Author: Pascal Quantin -Date: Fri Jan 17 22:18:50 2014 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9649 : - SMPP: source_telematics_id value length is 1 byte - - svn path=/trunk/; revision=54837 - -commit f63d80c -Author: Pascal Quantin -Date: Fri Jan 17 21:52:55 2014 +0000 - - From Fabio Tarabelloni via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9650 : - ZigBee ZCL Appliance Identification: fix endianness of Company ID, Brand ID and Product Type ID - - svn path=/trunk/; revision=54836 - -commit c852f99 -Author: Martin Kaiser -Date: Fri Jan 17 20:06:39 2014 +0000 - - From Toralf Förster - fix format strings for signed integers - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9637 - - svn path=/trunk/; revision=54835 - -commit 90ea235 -Author: Anders Broman -Date: Fri Jan 17 19:35:57 2014 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54834 - -commit 43595fa -Author: Anders Broman -Date: Fri Jan 17 19:21:41 2014 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54833 - -commit 493ba3e -Author: Anders Broman -Date: Fri Jan 17 18:58:50 2014 +0000 - - Try to fix warning: initializer element is not computable at load time. - - svn path=/trunk/; revision=54832 - -commit a49fee4 -Author: Anders Broman -Date: Fri Jan 17 18:55:49 2014 +0000 - - Fix a bug intrduced in http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=54820 - - svn path=/trunk/; revision=54831 - -commit 7649011 -Author: Gerald Combs -Date: Thu Jan 16 14:40:46 2014 -0800 - - Apply layouts in Qt Creator. Fix a tooltip. - - Change-Id: I02759cb83ef970395a80acaafb9a28c630000000 - -commit fae3157 -Author: Gerald Combs -Date: Thu Jan 16 20:15:20 2014 +0000 - - Look for win_flex and win_bison. - - svn path=/trunk/; revision=54830 - -commit 705083d -Author: Gerald Combs -Date: Thu Jan 16 19:42:13 2014 +0000 - - If you use bashisms it means you're a bash script. - - svn path=/trunk/; revision=54829 - -commit 8db4bc2 -Author: Gerald Combs -Date: Thu Jan 16 18:57:29 2014 +0000 - - More Chocolatey lex/yacc updates. - - Add Windows-style path handling to runlex.sh. Update the example - Chocolatey LEX path accordingly. This lets us use path information in - LEX and have it work in both nmake and runlex.sh - - Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it. - The code is currently untested and commented out. - - svn path=/trunk/; revision=54828 - -commit 6224947 -Author: Martin Mathieson -Date: Thu Jan 16 12:02:30 2014 +0000 - - Remove #include and make the situation with snow3g clearer in a comment. May need further removal, depending upon concensus on wireshark-dev - - svn path=/trunk/; revision=54827 - -commit 8c608ca -Author: Anders Broman -Date: Thu Jan 16 07:30:22 2014 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54826 - -commit bce9eaa -Author: Gerald Combs -Date: Thu Jan 16 02:23:42 2014 +0000 - - Partially revert r54824. - - svn path=/trunk/; revision=54825 - -commit d5b706b -Author: Gerald Combs -Date: Thu Jan 16 01:28:02 2014 +0000 - - Allow the use of Win flex-bison and document how to do that. - - svn path=/trunk/; revision=54824 - -commit 60045ca -Author: Evan Huus -Date: Wed Jan 15 23:56:41 2014 +0000 - - Implement basic support for SPXII decoding (at least we get the payload offsets - right now). - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9552 - - svn path=/trunk/; revision=54823 - -commit 1c6679c -Author: Evan Huus -Date: Wed Jan 15 23:09:36 2014 +0000 - - Dissect SPXII flag bits. - - First part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9552 - - svn path=/trunk/; revision=54822 - -commit 622d9cb -Author: Evan Huus -Date: Wed Jan 15 23:00:07 2014 +0000 - - Add modelines and fix one indentation issue. - - svn path=/trunk/; revision=54821 - -commit efbecb3 -Author: Anders Broman -Date: Wed Jan 15 19:29:03 2014 +0000 - - Fix a couple of - warning: initializer element is not computable at load time - - svn path=/trunk/; revision=54820 - -commit 3f65020 -Author: Evan Huus -Date: Wed Jan 15 18:06:57 2014 +0000 - - Add captype and tfshark binaries to .gitignore - - svn path=/trunk/; revision=54819 - -commit 9374ede -Author: Guy Harris -Date: Wed Jan 15 08:38:14 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54818 - -commit 2f0ddb9 -Author: Guy Harris -Date: Wed Jan 15 08:36:09 2014 +0000 - - Fun and games with const. - - svn path=/trunk/; revision=54817 - -commit 9228c72 -Author: Guy Harris -Date: Wed Jan 15 08:35:55 2014 +0000 - - Explain casting away const. - - svn path=/trunk/; revision=54816 - -commit 1f8d2e2 -Author: Anders Broman -Date: Wed Jan 15 07:13:23 2014 +0000 - - Update to version V12.3.0 (2013-12). - - svn path=/trunk/; revision=54815 - -commit d15a6d0 -Author: Guy Harris -Date: Wed Jan 15 03:37:06 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54814 - -commit ada9daf -Author: Guy Harris -Date: Wed Jan 15 03:35:44 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54813 - -commit dae8660 -Author: Evan Huus -Date: Wed Jan 15 02:09:11 2014 +0000 - - Reject pcap files that claim on-the-wire packet sizes > 64MB. This fixes many - heuristic cases broken in r49999 when we permitted packets > 64KB, since that - relaxed so severely the definition of a valid packet header. - - 64MB is an arbitrary and perhaps suboptimal number, but it seems to do the right - thing in all the examples I have handy. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9634 - - svn path=/trunk/; revision=54812 - -commit 61867d0 -Author: Guy Harris -Date: Wed Jan 15 01:05:03 2014 +0000 - - Eliminate fvalue_set() in favor of routines that take arguments - appropriate for particular FT_ types. This lets us do some more type - checking and lets us use const pointers when appropriate. - - Constify a bunch of stuff, and don't cast away constness. - - svn path=/trunk/; revision=54811 - -commit 04b18f4 -Author: Gerald Combs -Date: Wed Jan 15 00:52:27 2014 +0000 - - Make it more clear that we're faking a git description for now. - - svn path=/trunk/; revision=54810 - -commit d7e93e9 -Author: Gerald Combs -Date: Wed Jan 15 00:51:38 2014 +0000 - - Copy over recent changes from trunk-1.8 along with some local - modifications. - - ------------------------------------------------------------------------ - r54807 | gerald | 2014-01-14 16:35:34 -0800 (Tue, 14 Jan 2014) | 2 lines - - Start using the output of 'git describe'. - ------------------------------------------------------------------------ - r54805 | gerald | 2014-01-14 15:38:16 -0800 (Tue, 14 Jan 2014) | 2 lines - - Start adding support for plain git. - ------------------------------------------------------------------------ - - svn path=/trunk/; revision=54809 - -commit 62aef67 -Author: Alexis La Goutte -Date: Tue Jan 14 20:48:30 2014 +0000 - - Fix typo (Direcly => Directly) - - svn path=/trunk/; revision=54804 - -commit 4ed4470 -Author: Alexis La Goutte -Date: Tue Jan 14 20:37:23 2014 +0000 - - Add filetap/abi* to .gitignore - - svn path=/trunk/; revision=54803 - -commit 32da185 -Author: Guy Harris -Date: Tue Jan 14 18:42:54 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54802 - -commit a48d06d -Author: Guy Harris -Date: Tue Jan 14 18:42:16 2014 +0000 - - We have to cast away constness here, because C doesn't have - parameterized types. - - svn path=/trunk/; revision=54801 - -commit f862fc4 -Author: Guy Harris -Date: Tue Jan 14 18:35:36 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54800 - -commit d99e0b1 -Author: Guy Harris -Date: Tue Jan 14 18:34:01 2014 +0000 - - Regenerate ANSI TCAP dissector from the changes in r54499. - - svn path=/trunk/; revision=54799 - -commit afc159e -Author: Guy Harris -Date: Tue Jan 14 18:19:31 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54798 - -commit 11220f6 -Author: Guy Harris -Date: Tue Jan 14 18:16:12 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54797 - -commit 834c79a -Author: Guy Harris -Date: Tue Jan 14 18:12:14 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54796 - -commit 570a364 -Author: Guy Harris -Date: Tue Jan 14 18:03:54 2014 +0000 - - Consistently use "guint8" for "8-bit byte". - - Constify. - - For routines that manipulate sequences of 8-bit bytes, have them take - guint8 pointers rather than void pointers. - - Don't cast away constness. - - svn path=/trunk/; revision=54795 - -commit 7a559d2 -Author: Guy Harris -Date: Tue Jan 14 17:49:50 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54794 - -commit 13176da -Author: Guy Harris -Date: Tue Jan 14 17:47:31 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54793 - -commit 0a99ee2 -Author: Guy Harris -Date: Tue Jan 14 17:45:03 2014 +0000 - - Don't make claims of constness that can't be guaranteed in terms the C - compiler can verify. - - svn path=/trunk/; revision=54792 - -commit 85ab202 -Author: Alexis La Goutte -Date: Tue Jan 14 17:44:21 2014 +0000 - - Fix -Wsometimes-uninitialized found by Clang - - packet-pdcp-lte.c:1397:9: error: variable 'decrypted_data' is used uninitialized whenever 'if' condition is false - packet-pdcp-lte.c:1469:50: note: uninitialized use occurs here - decrypted_tvb = tvb_new_child_real_data(tvb, decrypted_data, payload_length, payload_length); - packet-pdcp-lte.c:1353:27: note: initialize the variable 'decrypted_data' to silence this warning - - packet-pdcp-lte.c:1397:9: error: variable 'payload_length' is used uninitialized whenever 'if' condition is false - packet-pdcp-lte.c:1469:66: note: uninitialized use occurs here - decrypted_tvb = tvb_new_child_real_data(tvb, decrypted_data, payload_length, payload_length); - packet-pdcp-lte.c:1354:24: note: initialize the variable 'payload_length' to silence this warning - - svn path=/trunk/; revision=54791 - -commit 6b6d709 -Author: Alexis La Goutte -Date: Tue Jan 14 17:44:07 2014 +0000 - - Fix unused const variable found by Clang 3.4 - - svn path=/trunk/; revision=54790 - -commit a48b6f4 -Author: Pascal Quantin -Date: Tue Jan 14 16:51:10 2014 +0000 - - Upgrade LTE RRC dissector to v11.6.0 - - svn path=/trunk/; revision=54789 - -commit 330654b -Author: Pascal Quantin -Date: Tue Jan 14 16:48:43 2014 +0000 - - SNOW3G is not available on default Wireshark - - svn path=/trunk/; revision=54788 - -commit eabf15f -Author: Pascal Quantin -Date: Tue Jan 14 16:23:38 2014 +0000 - - Fix dissection of 3GPP2 SMS encoded in UCS2 - - svn path=/trunk/; revision=54787 - -commit 293f8ca -Author: Martin Mathieson -Date: Tue Jan 14 16:22:44 2014 +0000 - - Make sure we allocate bytes for snow3g at least rounded up to next 4 byte boundary - - svn path=/trunk/; revision=54786 - -commit b948c75 -Author: Martin Mathieson -Date: Tue Jan 14 15:11:35 2014 +0000 - - Update a comment - - svn path=/trunk/; revision=54785 - -commit 58e8800 -Author: Martin Mathieson -Date: Tue Jan 14 15:07:20 2014 +0000 - - Add snow3g integrity (not quite working for me), but rework how integrity and ciphering functions and conditional compilation is done - - svn path=/trunk/; revision=54784 - -commit b0d4e7a -Author: Pascal Quantin -Date: Tue Jan 14 14:01:03 2014 +0000 - - UCS2 encoded SMS is directly read from data -> remove PROTO_ITEM_SET_GENERATED() - - svn path=/trunk/; revision=54783 - -commit b01a99c -Author: Martin Mathieson -Date: Tue Jan 14 11:09:47 2014 +0000 - - Provide hook for calling EEA1 implementation (Snow3G). Implementation not supplied due to licensing conditions. TODO: EIA1. - - svn path=/trunk/; revision=54782 - -commit e2b668e -Author: Guy Harris -Date: Tue Jan 14 10:50:26 2014 +0000 - - Whoever in GLibland was responsible for defining the signature of - g_snprintf() owes the world a huge apology. They *could* have just used - size_t, or they *could* at least have, if they insisted on having GLib - types to mirror regular types, made gsize an alias for size_t and, - whatever they did with gsize, they *could* have used it as the argument - for the size of the buffer for g_snprintf(), but no, they had to use - gulong. - - svn path=/trunk/; revision=54781 - -commit ecdc864 -Author: Guy Harris -Date: Tue Jan 14 08:32:50 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54780 - -commit e1b57af -Author: Guy Harris -Date: Tue Jan 14 08:30:45 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54779 - -commit 9232db1 -Author: Guy Harris -Date: Tue Jan 14 08:30:24 2014 +0000 - - But *do* cast const void * to the appropriate type. - - svn path=/trunk/; revision=54778 - -commit 1ec9417 -Author: Guy Harris -Date: Tue Jan 14 08:26:24 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54777 - -commit 6aa49e3 -Author: Guy Harris -Date: Tue Jan 14 08:22:38 2014 +0000 - - Don't assign away constness. - - svn path=/trunk/; revision=54776 - -commit bd165ab -Author: Guy Harris -Date: Tue Jan 14 08:14:28 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54775 - -commit 4a82c3b -Author: Guy Harris -Date: Tue Jan 14 08:12:45 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54774 - -commit dc71034 -Author: Guy Harris -Date: Tue Jan 14 08:09:33 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54773 - -commit 382e2c8 -Author: Guy Harris -Date: Tue Jan 14 07:59:58 2014 +0000 - - gsize, not gusize. Whatever. - - svn path=/trunk/; revision=54772 - -commit 8b2aced -Author: Guy Harris -Date: Tue Jan 14 07:58:18 2014 +0000 - - Glib, gotta love it. No, gusize isn't the same as size_t, it's long, - which is Too Damn Short on Windows. (Microsoft, gotta love 'em. I - guess even more Windows programmers than UN*X programmers thought long - was 32 bits, now and forever, world without end, amen.) - - svn path=/trunk/; revision=54771 - -commit aaeb6a4 -Author: Guy Harris -Date: Tue Jan 14 07:56:43 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54770 - -commit dd152d8 -Author: Guy Harris -Date: Tue Jan 14 05:49:04 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54769 - -commit 4a7636a -Author: Guy Harris -Date: Tue Jan 14 05:47:50 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54768 - -commit c6c1887 -Author: Guy Harris -Date: Tue Jan 14 05:39:57 2014 +0000 - - Have ip6_to_str() and tvb_ip6_to_str() return const pointers, as the - ip_to_str equivalents do. - - Don't cast away constness, and don't make it necessary to do so. - - svn path=/trunk/; revision=54767 - -commit e1f6ad8 -Author: Guy Harris -Date: Tue Jan 14 05:29:02 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54766 - -commit 0f40fd8 -Author: Guy Harris -Date: Tue Jan 14 05:25:51 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54765 - -commit 720cfe4 -Author: Guy Harris -Date: Tue Jan 14 05:23:48 2014 +0000 - - Don't cast away constness. In one place, this requires that we use one - pointer while we're filling in a string and then assigning it to a const - pointer when we're done. - - Don't use guint16 as a size value; it does no good (it doesn't magically - protect you againt too-long strings), it runs the potential risk of - overflow, it doesn't save time for arithmetic (32-bit or 64-bit - arithmetic may well be faster, and will at least be as fast), and it - doesn't save space (if it fits in a register, you save nothing, and if - it's on the stack, there will probably be padding. - - svn path=/trunk/; revision=54764 - -commit 547efd4 -Author: Guy Harris -Date: Tue Jan 14 05:17:06 2014 +0000 - - Cast away constness. - - svn path=/trunk/; revision=54763 - -commit 1980bb7 -Author: Guy Harris -Date: Tue Jan 14 04:09:21 2014 +0000 - - Constification. - - svn path=/trunk/; revision=54762 - -commit 1b0cfd4 -Author: Guy Harris -Date: Tue Jan 14 04:05:23 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54761 - -commit 6a4bd7a -Author: Guy Harris -Date: Tue Jan 14 04:01:59 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54760 - -commit 6a9b99c -Author: Guy Harris -Date: Tue Jan 14 04:01:34 2014 +0000 - - And more constification. - - svn path=/trunk/; revision=54759 - -commit ccbebb0 -Author: Guy Harris -Date: Tue Jan 14 03:56:36 2014 +0000 - - More constification. - - svn path=/trunk/; revision=54758 - -commit c1b6025 -Author: Guy Harris -Date: Tue Jan 14 03:24:37 2014 +0000 - - Don't make promises of constness that we can't honor. - - svn path=/trunk/; revision=54757 - -commit 60f06e5 -Author: Guy Harris -Date: Tue Jan 14 03:16:27 2014 +0000 - - Don't cast away constness when you don't have to. - - svn path=/trunk/; revision=54756 - -commit 3decdd5 -Author: Guy Harris -Date: Tue Jan 14 03:06:40 2014 +0000 - - Squelch some casting-away-constness warnings. - - svn path=/trunk/; revision=54755 - -commit f7b0675 -Author: Guy Harris -Date: Tue Jan 14 02:30:05 2014 +0000 - - Clean up references to an address and squelch some warnings. - - svn path=/trunk/; revision=54754 - -commit 7b32b5c -Author: Guy Harris -Date: Tue Jan 14 02:25:20 2014 +0000 - - Don't cast away constness. - - svn path=/trunk/; revision=54753 - -commit 88e3e47 -Author: Guy Harris -Date: Tue Jan 14 02:17:16 2014 +0000 - - More prototype cleanup. - - svn path=/trunk/; revision=54752 - -commit 6b8e8d3 -Author: Guy Harris -Date: Tue Jan 14 02:06:42 2014 +0000 - - Make a routine not used outside the SNMP dissector static. - - svn path=/trunk/; revision=54751 - -commit 9713776 -Author: Guy Harris -Date: Tue Jan 14 01:44:36 2014 +0000 - - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so. - - Said header declares pipe_input_cb_t, so we don't have to do it - ourselves. - - svn path=/trunk/; revision=54750 - -commit d399b7a -Author: Guy Harris -Date: Tue Jan 14 01:41:38 2014 +0000 - - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so. - - svn path=/trunk/; revision=54749 - -commit afef2cd -Author: Guy Harris -Date: Tue Jan 14 01:40:09 2014 +0000 - - Detangle the #ifdefs a bit. - - svn path=/trunk/; revision=54748 - -commit 2e5c549 -Author: Guy Harris -Date: Tue Jan 14 01:35:13 2014 +0000 - - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so. - - Don't cast away constness when passing something to a routine that takes - a const pointer argument. - - svn path=/trunk/; revision=54747 - -commit 6a37db9 -Author: Guy Harris -Date: Tue Jan 14 01:31:49 2014 +0000 - - Make a routine not used outside this file static. - - svn path=/trunk/; revision=54746 - -commit 2051620 -Author: Guy Harris -Date: Tue Jan 14 01:29:16 2014 +0000 - - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so. - - svn path=/trunk/; revision=54745 - -commit 91ad2ea -Author: Guy Harris -Date: Tue Jan 14 01:26:51 2014 +0000 - - Include ui/progress_dlg.h to get the declaration of - delayed_create_progress_dlg(). - - svn path=/trunk/; revision=54744 - -commit d041ec6 -Author: Guy Harris -Date: Tue Jan 14 01:23:49 2014 +0000 - - #if 0 out an unused routine. - - svn path=/trunk/; revision=54743 - -commit 5a43b70 -Author: Guy Harris -Date: Tue Jan 14 01:16:55 2014 +0000 - - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so. - - svn path=/trunk/; revision=54742 - -commit 8642c3f -Author: Guy Harris -Date: Tue Jan 14 01:11:42 2014 +0000 - - Make a routine used only in this file static. - - svn path=/trunk/; revision=54741 - -commit 2081d99 -Author: Guy Harris -Date: Mon Jan 13 23:05:44 2014 +0000 - - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so - which means - creating the header file in the first place. - - Also, declare proto_register_wimax_compact_dlmap_ie() early in - wimax_compact_dlmap_ie_decoder.c, similar to what we do in - wimax_copact_ulmap_ie_decoder.c. - - svn path=/trunk/; revision=54739 - -commit d363ef3 -Author: Guy Harris -Date: Mon Jan 13 23:03:30 2014 +0000 - - tvparse_until() is used, so don't make it static. - - svn path=/trunk/; revision=54738 - -commit 41a13ad -Author: Pascal Quantin -Date: Mon Jan 13 22:57:31 2014 +0000 - - Upgrade LPP dissector to v11.5.0 - - svn path=/trunk/; revision=54737 - -commit f8cb559 -Author: Pascal Quantin -Date: Mon Jan 13 22:54:41 2014 +0000 - - Update SVN properties - - svn path=/trunk/; revision=54736 - -commit 9935ef7 -Author: Guy Harris -Date: Mon Jan 13 22:46:05 2014 +0000 - - dissect_CBA_Connection_Data() isn't used outside packet-dcom-cba-acco.c, - so make it static - and get rid of the #if 0'ed out declaration in - packet-dcom-cba-acco.h. - - svn path=/trunk/; revision=54735 - -commit 7ef949b -Author: Guy Harris -Date: Mon Jan 13 22:38:56 2014 +0000 - - No reason for decode_bgp_rd()'s return value to be non-const, so make it - const. - - svn path=/trunk/; revision=54734 - -commit 40791d0 -Author: Guy Harris -Date: Mon Jan 13 22:36:52 2014 +0000 - - Move dissect_pn_uint16_ret_item() to packet-pn.c, to be with its sibling - dissect_pn_uint16(). Declare it in packet-pn.h. - - svn path=/trunk/; revision=54733 - -commit 4a09abd -Author: Alexis La Goutte -Date: Mon Jan 13 22:25:13 2014 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54732 - -commit 86f6c85 -Author: Alexis La Goutte -Date: Mon Jan 13 22:25:03 2014 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54731 - -commit 4fdbf84 -Author: Guy Harris -Date: Mon Jan 13 22:24:54 2014 +0000 - - dispatchService() is imported from other code; declare it in - opcua_transport_layer.h, not opcua_transport_layer.c. - - svn path=/trunk/; revision=54730 - -commit 4cf9cd3 -Author: Alexis La Goutte -Date: Mon Jan 13 22:24:53 2014 +0000 - - From Kevin Loewen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9631 - - Add dissector for Pathport Protocol - - From me : - * Fix indent (use 4 spaces) - * Remove unused variable and fix Clang warning - - svn path=/trunk/; revision=54729 - -commit 10345a6 -Author: Alexis La Goutte -Date: Mon Jan 13 22:24:32 2014 +0000 - - From Miroslav Miklus via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9504 Enhance BGP dissector : bgp-ls dissector (draft-ietf-idr-ls-distribution-04) - - BGPTYPE_LINK_STATE_ATTR is temporarily set to 99, would need change when IANA allocate a Path Attribute value for BGP-LS - - From me : - * Fix indent - * fix arg encoding (via encoding-args tools) - - svn path=/trunk/; revision=54728 - -commit c977816 -Author: Guy Harris -Date: Mon Jan 13 22:20:25 2014 +0000 - - #if 0 out unused routines claimed to be "untested" and #if 0'ed out in - epan/tvparse.h, and static routines used by that code. - - svn path=/trunk/; revision=54727 - -commit 1f1887f -Author: Guy Harris -Date: Mon Jan 13 22:14:38 2014 +0000 - - Get rid of unused routine (the initialization is done in - geoip_db_post_update_cb() - as the comment says, "and also once on - startup"). - - svn path=/trunk/; revision=54726 - -commit 59722b8 -Author: Guy Harris -Date: Mon Jan 13 22:06:12 2014 +0000 - - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so - which means - creating the header file in the first place. - - That means luaopen_bit() doesn't need to, and shouldn't be, declared in - wslua.h. - - Have make-reg.pl generate a #include of lua_bitop.h. Also fix the "this - is autogenerated" warning. - - svn path=/trunk/; revision=54725 - -commit 020230e -Author: Guy Harris -Date: Mon Jan 13 21:36:43 2014 +0000 - - f_k() is used outside packet-gsm_a_rr.c, so it can't be static. - - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so - which means - creating the header file in the first place. - - That means f_k() doesn't need to, and shouldn't be, declared in - packet-gsm_rlcmac.h. Include packet-gsm_a_rr.h in packet-gsm_rlcmac.c. - - svn path=/trunk/; revision=54724 - -commit 7f5567a -Author: Guy Harris -Date: Mon Jan 13 21:23:46 2014 +0000 - - lsarpc_dissect_sec_desc_buf() and lsarpc_dissect_struct_dom_sid2() are - used in the Netlogon dissector, so don't make them static. - - Now that we've added HEADER START/HEADER END to Pidl, use it to declare - those routines in packet-dcerpc-lsa.h. Don't declare them in - packet-dcerpc-netlogon.c, as they're now declared in the header. - - svn path=/trunk/; revision=54723 - -commit 386c5ba -Author: Pascal Quantin -Date: Mon Jan 13 21:23:36 2014 +0000 - - Fix crash when exporting to CSV file - - svn path=/trunk/; revision=54722 - -commit 833d315 -Author: Guy Harris -Date: Mon Jan 13 21:18:29 2014 +0000 - - Document {CODE,HEADER} {START,END}. - - Clean up indentation. - - svn path=/trunk/; revision=54721 - -commit a297950 -Author: Guy Harris -Date: Mon Jan 13 21:05:44 2014 +0000 - - Add HEADER START and HEADER END, similar to CODE START and CODE END, to - allow stuff to be put into the .h file; that way, if you put helper - functions into the .c file, for use by dissectors other than the one - being generated, you can put declarations for them into the .h file. - - Do some checks for mis-nesting of CODE and HEADER blocks. - - Clean up the "this is generated code" header. - - svn path=/trunk/; revision=54720 - -commit c463f6c -Author: Guy Harris -Date: Mon Jan 13 20:17:20 2014 +0000 - - Make a routine not used outside this file static. - - svn path=/trunk/; revision=54719 - -commit 7cff496 -Author: Guy Harris -Date: Mon Jan 13 20:14:00 2014 +0000 - - Make a routine not used outside this file static. - - svn path=/trunk/; revision=54718 - -commit 6df963e -Author: Guy Harris -Date: Mon Jan 13 20:12:14 2014 +0000 - - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so - which means - creating the header file in the first place. - - svn path=/trunk/; revision=54717 - -commit aec280d -Author: Guy Harris -Date: Mon Jan 13 19:49:12 2014 +0000 - - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so. - - They *didn't* match; fix that. - - Do *not* use 16-bit tvbuff offsets; there is no advantage to that (and, - in fact, 32-bit arithmetic may be easier on some platforms), and it has - the disadvantage that you're more likely to have the offset overflow. - - dissect_cbs_serial_number() returns the new offset, not the length of - the item it dissected; don't add its return value to the offset, set the - offset to its return value. - - Make dissect_cbs_message_identifier() return the new offset as well, for - consistency, and don't add *its* return value to the offset. - - svn path=/trunk/; revision=54714 - -commit 39fe54a -Author: Guy Harris -Date: Mon Jan 13 19:32:10 2014 +0000 - - In a file that defines external routines, the header file that declares - them should be included, to make sure the declaration and definition - match. Make it so. - - svn path=/trunk/; revision=54713 - -commit 7620abc -Author: Guy Harris -Date: Mon Jan 13 19:29:21 2014 +0000 - - Make routines not used outside packet-dcerpc-lsa.c static. - - svn path=/trunk/; revision=54712 - -commit 61d5c45 -Author: Guy Harris -Date: Mon Jan 13 19:07:48 2014 +0000 - - Squelch some warnings. - - svn path=/trunk/; revision=54711 - -commit bfde80d -Author: Gerald Combs -Date: Mon Jan 13 16:22:01 2014 +0000 - - Make sure we point to the GPLv2. - - svn path=/trunk/; revision=54710 - -commit 1242a77 -Author: Jörg Mayer -Date: Mon Jan 13 10:51:37 2014 +0000 - - Change level off TCP/RST expertitem from chat to warn. Add a comment - that RST is still an indicator for network errors/problems. - - svn path=/trunk/; revision=54709 - -commit 1bd2407 -Author: Jörg Mayer -Date: Sun Jan 12 22:21:55 2014 +0000 - - One more place where setcap does not need inheritance - - svn path=/trunk/; revision=54708 - -commit 527071f -Author: Pascal Quantin -Date: Sun Jan 12 20:52:19 2014 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9633 : - Do not try to add a new NAL unit when the previous one was not decoded - - svn path=/trunk/; revision=54707 - -commit 658e0d8 -Author: Martin Kaiser -Date: Sun Jan 12 17:57:21 2014 +0000 - - remove unnecessary if(tree) statements - - svn path=/trunk/; revision=54706 - -commit b3df313 -Author: Martin Kaiser -Date: Sun Jan 12 17:49:30 2014 +0000 - - Coverity 280438: missing break - - svn path=/trunk/; revision=54705 - -commit 8989899 -Author: Gerald Combs -Date: Sun Jan 12 15:03:43 2014 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2014-01-12] - - svn path=/trunk/; revision=54702 - -commit bdfabe5 -Author: Michael Mann -Date: Sun Jan 12 03:17:51 2014 +0000 - - Zcl OTA Upgrade cluster dissector. Bug 9545 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9545) - - From Fabio Tarabelloni - From me: Reorder function definitions so declarations aren't necessary - - svn path=/trunk/; revision=54701 - -commit 11a61d7 -Author: Michael Mann -Date: Sun Jan 12 02:29:51 2014 +0000 - - Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) - - From Michal Labedzki - - 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector - 2. Bluetooth: Merge all UUIDs together - 3. Bluetooth: Extract LE Channel MAP to separate dissector - 4. Ubertooth: Dissect CC2400 registers - - svn path=/trunk/; revision=54700 - -commit c071a1c -Author: Michael Mann -Date: Sun Jan 12 00:50:41 2014 +0000 - - Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) - - From Michal Labedski - - 1. add support for new btsnoop "format" introduced by BlueZ team in "btmon" tool - 2. Bluetooth: Make EIR, AD and COD more generic - 3. Bluetooth: HCI/LL: Update Error Codes to Core 4.1 Specification - 4. Ubertooth: Fix response command handling - 5. Ubertooth: Update to support firmware version - 6. Ubertooth: Dissect by Vendor Id/Product Id - - svn path=/trunk/; revision=54699 - -commit 4210311 -Author: Chris Maynard -Date: Sat Jan 11 20:40:43 2014 +0000 - - Clean up OPTSTRING, removing ':'s from options that don't expect args and removing the G option completely, as it doesn't appear to be supported. - - svn path=/trunk/; revision=54698 - -commit 31e24e4 -Author: Michael Mann -Date: Sat Jan 11 19:47:24 2014 +0000 - - Link wiretap library with tfshark. This is hopefully a "temporary" fix as the plan is to not have tfshark depend on wiretap. - - From Michal Labedzki - - svn path=/trunk/; revision=54697 - -commit e2cec3b -Author: Alexis La Goutte -Date: Sat Jan 11 12:16:56 2014 +0000 - - Remove (ugly) hack in about_dialog.cpp (include main.cpp to have function to set comp_info_str and runtime_info_str variable) - - Now About Dialog is start after main() and variables is set by main(), only extern variable in wireshark_applicatin.h - - svn path=/trunk/; revision=54696 - -commit bf95d60 -Author: Alexis La Goutte -Date: Sat Jan 11 11:16:49 2014 +0000 - - Fix indent (use 4 spaces) and add modelines - - svn path=/trunk/; revision=54695 - -commit 1a279ac -Author: Gerald Combs -Date: Fri Jan 10 22:57:28 2014 +0000 - - Update the enterprise-numbers URL. - - svn path=/trunk/; revision=54694 - -commit 640e6f4 -Author: Stig Bjørlykke -Date: Fri Jan 10 18:58:56 2014 +0000 - - Return other than 0 from RTSE when handling reassembly initiated from SES. - - This bug was introduced in revision 53093 when updating to new-style dissector. - - svn path=/trunk/; revision=54693 - -commit 830509b -Author: Martin Mathieson -Date: Fri Jan 10 17:56:55 2014 +0000 - - Update a comment and fix some indentation - - svn path=/trunk/; revision=54692 - -commit 92b1a4a -Author: Martin Mathieson -Date: Fri Jan 10 12:51:57 2014 +0000 - - Move UEId to the beginning of summary shown in info column, plus only look for existing reassembly info when not starting a new SDU - - svn path=/trunk/; revision=54691 - -commit 4debda5 -Author: Martin Mathieson -Date: Fri Jan 10 12:36:17 2014 +0000 - - Note in a comment that with Gtk 3.4.4 reselecting UE+channel doesn't work as other UEs seem to get selected while list is being repopulated during retapping - - svn path=/trunk/; revision=54690 - -commit 5843e95 -Author: Martin Kaiser -Date: Fri Jan 10 09:23:36 2014 +0000 - - use a value string for the emi - correct the dot offset - other minor cleanup - - svn path=/trunk/; revision=54689 - -commit 8a99c04 -Author: Martin Kaiser -Date: Fri Jan 10 09:15:08 2014 +0000 - - dissect Digital Only Token and retention limit - - svn path=/trunk/; revision=54688 - -commit 80ed2d2 -Author: Martin Kaiser -Date: Fri Jan 10 08:48:38 2014 +0000 - - correct a typo in a filter string - - svn path=/trunk/; revision=54687 - -commit 05f7044 -Author: Anders Broman -Date: Fri Jan 10 07:01:15 2014 +0000 - - Make internal functions static - - svn path=/trunk/; revision=54686 - -commit 02eb787 -Author: Anders Broman -Date: Fri Jan 10 06:49:25 2014 +0000 - - Fix - tfshark.c:1676:102: warning: unused parameter ‘data_offset’ [-Wunused-parameter] - tfshark.c:177:1: warning: ‘string_compare’ defined but not used [-Wunused-function] - tfshark.c:184:1: warning: ‘string_elem_print’ defined but not used [-Wunused-function] - - svn path=/trunk/; revision=54685 - -commit 70dc619 -Author: Pascal Quantin -Date: Thu Jan 9 21:58:09 2014 +0000 - - From Michael Lum via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9472 : - ANSI IS-637 SMS enhancements for CMAS (TIA-1149) and header dissection - - svn path=/trunk/; revision=54684 - -commit f42fa7a -Author: Michael Mann -Date: Thu Jan 9 21:42:36 2014 +0000 - - USB: Add DFU dissector. Bug 9610 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9610) - - From Michal Labedzki - - svn path=/trunk/; revision=54683 - -commit 944db5d -Author: Pascal Quantin -Date: Thu Jan 9 21:29:07 2014 +0000 - - Set explicitly P2P direction for received SMS - - svn path=/trunk/; revision=54682 - -commit 84dc9e9 -Author: Michael Mann -Date: Thu Jan 9 20:19:43 2014 +0000 - - Revert "from me" changes of r54676. Checks for NULL were functional logic, not trying to NULL protect proto_item_append_text. - - svn path=/trunk/; revision=54681 - -commit 0fa16ed -Author: Martin Kaiser -Date: Thu Jan 9 13:45:51 2014 +0000 - - From Marko Hrastovec - dissect all elements of category 48 messages - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9629 - - svn path=/trunk/; revision=54680 - -commit e830c29 -Author: Martin Kaiser -Date: Thu Jan 9 13:02:27 2014 +0000 - - From Marko Hrastovec - rename RE field len to make it generic for all categories - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9624 - - svn path=/trunk/; revision=54679 - -commit 02b9cbb -Author: Jörg Mayer -Date: Thu Jan 9 11:02:29 2014 +0000 - - Move cfile.c into SHARK_COMMON_SRC (as was done in nmake) - - svn path=/trunk/; revision=54678 - -commit 993a4d5 -Author: Guy Harris -Date: Thu Jan 9 03:01:37 2014 +0000 - - Mark an unused parameter as such. - - svn path=/trunk/; revision=54677 - -commit 5ff31ef -Author: Michael Mann -Date: Thu Jan 9 02:49:18 2014 +0000 - - Remove some global variables. Bug 9471 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9471) - - From Michael Lum - From me: Remove a few proto_item* NULL checks because it's done by the underlying function. - - svn path=/trunk/; revision=54676 - -commit bbc7ad3 -Author: Gerald Combs -Date: Thu Jan 9 01:30:25 2014 +0000 - - cfile.c is in WIRESHARK_COMMON_SRC so there's no need to add it again. - - svn path=/trunk/; revision=54675 - -commit 2203d51 -Author: Jörg Mayer -Date: Wed Jan 8 22:02:07 2014 +0000 - - make tfshark finally compile: - - Link against filetap - - Add cfile.c to sources - - Add the generated tshark-tap-register.c (which seems to be pulled - in by one of the intermediate libraries with autotools) - - svn path=/trunk/; revision=54674 - -commit 0cde948 -Author: Guy Harris -Date: Wed Jan 8 21:27:44 2014 +0000 - - Add libfiletap. - - svn path=/trunk/; revision=54673 - -commit 8c91639 -Author: Guy Harris -Date: Wed Jan 8 20:57:34 2014 +0000 - - TFShark doesn't capture traffic, so it doesn't need - SHARK_COMMON_CAPTURE_SRC. - - svn path=/trunk/; revision=54672 - -commit 658e0b3 -Author: Guy Harris -Date: Wed Jan 8 20:50:52 2014 +0000 - - At least some of the files in PLATFORM_CAPTURE_SRC are needed by - programs that use {lib,win}pcap but that don't capture traffic, such as - rawshark; rename it to PLATFORM_PCAP_SRC, to match CMake. - - svn path=/trunk/; revision=54671 - -commit c81a43d -Author: Guy Harris -Date: Wed Jan 8 20:36:37 2014 +0000 - - At least some of the files in PLATFORM_CAPTURE_SRC are needed by - programs that use {lib,win}pcap but that don't capture traffic, such as - rawshark; rename it to PLATFORM_PCAP_SRC, and include it in - SHARK_COMMON_SRC rather than SHARK_COMMON_CAPTURE_SRC. - - svn path=/trunk/; revision=54670 - -commit 324a7c9 -Author: Guy Harris -Date: Wed Jan 8 20:22:13 2014 +0000 - - Rename PLATFORM_SRC to PLATFORM_CAPTURE_SRC, to match the CMake name. - - svn path=/trunk/; revision=54669 - -commit 005ff3f -Author: Guy Harris -Date: Wed Jan 8 20:10:17 2014 +0000 - - Rename WIRESHARK_COMMON_SRC to SHARK_COMMON_SRC - what's common about it - is that it includes files used in TShark and rawshark as well as - Wireshark, and that name is what's used by the autotools. - - Add capture_sync.c to SHARK_COMMON_CAPTURE_SRC, as it's used both by - Wireshark and TShark, but not by rawshark, and as it's in the autotools - SHARK_COMMON_CAPTURE_SRC. Move PLATFORM_CAPTURE_SRC from - (WIRE)SHARK_COMMON_SRC to SHARK_COMMON_CAPTURE_SRC, as it should only be - used by programs that capture traffic. - - svn path=/trunk/; revision=54668 - -commit 9f664e5 -Author: Anders Broman -Date: Wed Jan 8 20:03:16 2014 +0000 - - Add vendor-id="Acision" - - svn path=/trunk/; revision=54667 - -commit 57c4d97 -Author: Martin Kaiser -Date: Wed Jan 8 18:42:26 2014 +0000 - - use a DVB string for the text field in the extended event descriptor - check for text length 0 while we're at it - - svn path=/trunk/; revision=54666 - -commit c05722e -Author: Martin Kaiser -Date: Wed Jan 8 18:21:33 2014 +0000 - - remove duplicate editor modelines - it's enough to have them at the end of the file - - svn path=/trunk/; revision=54665 - -commit 5460e09 -Author: Martin Kaiser -Date: Wed Jan 8 18:16:36 2014 +0000 - - From Antony Bridle - - Added dissection capabilities for ASTERIX Category 062 Reserved - Expansion Field. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9624 - - svn path=/trunk/; revision=54664 - -commit a972503 -Author: Pascal Quantin -Date: Wed Jan 8 15:58:49 2014 +0000 - - Make it possible to use have_tap_listener() in a plugin - - svn path=/trunk/; revision=54663 - -commit 7cbbf32 -Author: Alexis La Goutte -Date: Wed Jan 8 14:43:41 2014 +0000 - - Don't create About window when Wireshark Qt start - - svn path=/trunk/; revision=54662 - -commit d183113 -Author: Martin Kaiser -Date: Wed Jan 8 13:57:02 2014 +0000 - - merge two if statements - - svn path=/trunk/; revision=54661 - -commit 10da332 -Author: Martin Kaiser -Date: Wed Jan 8 13:56:24 2014 +0000 - - Coverity 280379 - if the key is missing, it's always a request - - svn path=/trunk/; revision=54660 - -commit e8c0ef0 -Author: Jörg Mayer -Date: Wed Jan 8 13:01:01 2014 +0000 - - Add file_access.c - - svn path=/trunk/; revision=54659 - -commit f938507 -Author: Martin Kaiser -Date: Wed Jan 8 12:49:45 2014 +0000 - - no need for if (tree) - - svn path=/trunk/; revision=54658 - -commit 9979ebf -Author: Martin Kaiser -Date: Wed Jan 8 12:38:27 2014 +0000 - - Coverity 280335, 280336 - check the return value of gtk_tree_selection_get_selected() - - svn path=/trunk/; revision=54657 - -commit 0b4aeb3 -Author: Martin Kaiser -Date: Wed Jan 8 11:06:31 2014 +0000 - - Coverity 280334 - check the return value of gtk_tree_selection_get_selected() - - if there was no selected item, wireshark would crash - but this is very unlikely in practice - - svn path=/trunk/; revision=54656 - -commit be9d2e6 -Author: Guy Harris -Date: Wed Jan 8 10:34:00 2014 +0000 - - Add libfiletap. - - Add libwsutil to wireshark-dev.files - I'm not sure it's necessary, but - code added to Wireshark has to be able to call routines from libwsutil. - - svn path=/trunk/; revision=54655 - -commit 2f2bd94 -Author: Guy Harris -Date: Wed Jan 8 09:21:26 2014 +0000 - - Don't put into the distribution files that don't exist. - - svn path=/trunk/; revision=54654 - -commit a7c8e67 -Author: Stig Bjørlykke -Date: Wed Jan 8 08:19:51 2014 +0000 - - Added a check for valid algorithm id. - - svn path=/trunk/; revision=54653 - -commit c79fb54 -Author: Guy Harris -Date: Wed Jan 8 05:40:53 2014 +0000 - - Sorry, the bytes-to-read argument to file_read() is unsigned int, so - cast packet_size to unsigned int. Yes, that means that it can't read - more than 65535 bytes. - - Clean up white space while we're at it. - - svn path=/trunk/; revision=54652 - -commit 035526a -Author: Guy Harris -Date: Wed Jan 8 05:36:36 2014 +0000 - - tfshark.c doesn't build without warnings, so default to "don't build it" - for now. - - svn path=/trunk/; revision=54651 - -commit cd7909e -Author: Guy Harris -Date: Wed Jan 8 05:34:02 2014 +0000 - - Handle tfshark. - - svn path=/trunk/; revision=54650 - -commit 276ac8d -Author: Guy Harris -Date: Wed Jan 8 05:32:55 2014 +0000 - - No generated C files in filetap, so no libfiletap_generated. - - svn path=/trunk/; revision=54649 - -commit ffb31ec -Author: Guy Harris -Date: Wed Jan 8 05:05:23 2014 +0000 - - Unused parameters are unused. - - svn path=/trunk/; revision=54648 - -commit 92a567f -Author: Michael Mann -Date: Wed Jan 8 04:55:59 2014 +0000 - - Make global algorithm_id in x509af dissector a direct_reference instead. Bug 9573 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9573). Removes valgrind warnings as well as just being Good Code. - - svn path=/trunk/; revision=54647 - -commit bf284da -Author: Michael Mann -Date: Wed Jan 8 04:35:28 2014 +0000 - - TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) - - This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) - - This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). - - svn path=/trunk/; revision=54646 - -commit a6ed8a1 -Author: Michael Mann -Date: Wed Jan 8 01:58:06 2014 +0000 - - Have HAVE_SPANDSP just go over entire file rather than individual functions. - - svn path=/trunk/; revision=54645 - -commit 2adcfcd -Author: Guy Harris -Date: Wed Jan 8 00:39:14 2014 +0000 - - Need for StringCchPrintf(). - - svn path=/trunk/; revision=54644 - -commit 1678d37 -Author: Evan Huus -Date: Wed Jan 8 00:29:56 2014 +0000 - - Explicitly reject two-pass live capture, it doesn't work anyways. - - svn path=/trunk/; revision=54643 - -commit d28084d -Author: Jakub Zawadzki -Date: Wed Jan 8 00:28:13 2014 +0000 - - Move UAT xton() to wsutil library - - Use ws_xton() in few more places. - - svn path=/trunk/; revision=54642 - -commit e8dd800 -Author: Guy Harris -Date: Tue Jan 7 23:56:21 2014 +0000 - - As checkAPIs.pl says, "use StringCchPrintf". - - svn path=/trunk/; revision=54641 - -commit 62796c0 -Author: Evan Huus -Date: Tue Jan 7 23:38:50 2014 +0000 - - From Michal Labedzki via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9610 - - USB: Dissect Application-specific Interface Class/Subclass/Protocols - - svn path=/trunk/; revision=54640 - -commit 4cbe95e -Author: Jörg Mayer -Date: Tue Jan 7 23:32:11 2014 +0000 - - Update documentation to match change in r54630: - "The capabilities for dumpcap don't need to be inheritable." - - svn path=/trunk/; revision=54639 - -commit 25f66df -Author: Jörg Mayer -Date: Tue Jan 7 23:08:42 2014 +0000 - - Rework compiler flag detection to be able to handle changed - order of flags - - svn path=/trunk/; revision=54638 - -commit 2abbb53 -Author: Jakub Zawadzki -Date: Tue Jan 7 22:55:03 2014 +0000 - - Remove svn:executable attribute. - - svn path=/trunk/; revision=54637 - -commit 147e185 -Author: Evan Huus -Date: Tue Jan 7 22:42:50 2014 +0000 - - From Michal Labedzki via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9610 - - USB: Update Standard Descriptor Type numbers to 3.1 Specification - - svn path=/trunk/; revision=54636 - -commit 8dae674 -Author: Evan Huus -Date: Tue Jan 7 22:39:15 2014 +0000 - - Don't use #defines for errno values, just build the value-string directly. They - weren't used and were causing build failures due to redefinition in certain - environments. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9614 - - svn path=/trunk/; revision=54635 - -commit 644d6fe -Author: Alexis La Goutte -Date: Tue Jan 7 22:36:01 2014 +0000 - - Fix warning when use make packaging on Windows - - warning: unknown variable/constant "{PROGRAM_NAME_PATH_GTK}" detected, ignoring (macro:MUI_FUNCTION_FINISHPAGE:387) - - - svn path=/trunk/; revision=54634 - -commit abda30e -Author: Jakub Zawadzki -Date: Tue Jan 7 22:17:32 2014 +0000 - - Fix bug #9618: Invalid utf8 causes JSON dissector assertion failure "g_utf8_validate" - - Validate JSON UTF-8 characters, replace with '?' when invalid. - - svn path=/trunk/; revision=54633 - -commit d1dcee9 -Author: Jakub Zawadzki -Date: Tue Jan 7 21:55:49 2014 +0000 - - Move defines for helping with UTF-16 surrogate pairs to wsutil/unicode-utils.h - - tvbuff version was moved, but with 'or' optimization from packet-json. - - svn path=/trunk/; revision=54632 - -commit adb28bd -Author: Guy Harris -Date: Tue Jan 7 21:21:20 2014 +0000 - - The capabilities for dumpcap don't need to be inheritable. - - See - - https://bugzilla.redhat.com/show_bug.cgi?id=1022377 - - svn path=/trunk/; revision=54630 - -commit 1df5d94 -Author: Jörg Mayer -Date: Tue Jan 7 21:09:03 2014 +0000 - - include config.h at the top of the file. - A used parameter was marked unused. - - svn path=/trunk/; revision=54629 - -commit 2f76706 -Author: Jörg Mayer -Date: Tue Jan 7 18:36:37 2014 +0000 - - HAVE_PLUGINS was defined twice - - svn path=/trunk/; revision=54627 - -commit 8da8e47 -Author: Anders Broman -Date: Tue Jan 7 18:08:02 2014 +0000 - - Try to get rid of some warnings. - - svn path=/trunk/; revision=54626 - -commit 43252e3 -Author: Anders Broman -Date: Tue Jan 7 17:41:06 2014 +0000 - - From Zoltán Lajos Kis: - - OpenFlow 1.4 dissector: add missing features - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9621 - - svn path=/trunk/; revision=54625 - -commit 3dbebff -Author: Anders Broman -Date: Tue Jan 7 17:25:20 2014 +0000 - - Fix - warning: redundant redeclaration of 'zbee_get_bit_field' - warning: redundant redeclaration of 'zbee_aps_cid_names' - - svn path=/trunk/; revision=54624 - -commit 74394f2 -Author: Stig Bjørlykke -Date: Tue Jan 7 14:46:17 2014 +0000 - - Added expired handling to FieldInfo. - - This avoids using free'd pointers (which leads to crash) when - assigning FieldInfos to global variables. - - svn path=/trunk/; revision=54623 - -commit fd4faf6 -Author: Guy Harris -Date: Mon Jan 6 23:07:48 2014 +0000 - - Expand a comment. - - svn path=/trunk/; revision=54622 - -commit 81b2145 -Author: Guy Harris -Date: Mon Jan 6 23:02:32 2014 +0000 - - In col_fill_in() and col_fill_in_error(), use col_based_on_frame_data() - to determine whether to fill in the column from frame data or not. - - svn path=/trunk/; revision=54621 - -commit f026d8a -Author: Martin Mathieson -Date: Mon Jan 6 18:18:04 2014 +0000 - - Call deciphering and integrity checking appropriately for - SecurityModeCommand and SecurityModeResponse. - - Also show when integrity has been checked and found to be correct. - - svn path=/trunk/; revision=54620 - -commit 7bf44dc -Author: Anders Broman -Date: Mon Jan 6 17:28:49 2014 +0000 - - Try to fix warning: cast discards '__attribute__((const))' qualifier from pointer target type . - - svn path=/trunk/; revision=54619 - -commit 52033d3 -Author: Anders Broman -Date: Mon Jan 6 17:25:03 2014 +0000 - - Try to fix warning: initializer element is not computable at load time. - - svn path=/trunk/; revision=54618 - -commit 9c05ac1 -Author: Anders Broman -Date: Mon Jan 6 17:12:54 2014 +0000 - - Fix a typo. - - svn path=/trunk/; revision=54617 - -commit ef399fb -Author: Anders Broman -Date: Mon Jan 6 15:30:01 2014 +0000 - - Try to fix warning: initializer element is not computable at load time. - - svn path=/trunk/; revision=54616 - -commit f6bf628 -Author: Martin Mathieson -Date: Mon Jan 6 11:28:20 2014 +0000 - - Do EEA2 deciphering in-place, from Pascal - - svn path=/trunk/; revision=54615 - -commit 5a3ba6c -Author: Anders Broman -Date: Mon Jan 6 08:30:53 2014 +0000 - - Omit assignment for not used types. - - svn path=/trunk/; revision=54614 - -commit df3d47a -Author: Michael Mann -Date: Mon Jan 6 00:44:41 2014 +0000 - - Base dissector for fileshark functionality. Intended as the equivalent of packet-frame for capture files. This is meant as a placeholder for now, so don't take any of the fields/data as being written in stone. - - - svn path=/trunk/; revision=54613 - -commit bcacd60 -Author: Alexis La Goutte -Date: Sun Jan 5 18:40:07 2014 +0000 - - Fix indent (use 4 spaces) - - svn path=/trunk/; revision=54612 - -commit 6c66f36 -Author: Alexis La Goutte -Date: Sun Jan 5 18:39:58 2014 +0000 - - Fix indent (use 4 spaces) and add modelines and remove trailing whitespace - - svn path=/trunk/; revision=54611 - -commit 2108cca -Author: Alexis La Goutte -Date: Sun Jan 5 18:39:50 2014 +0000 - - Fix indent (Use tabs) and add modelines - - svn path=/trunk/; revision=54610 - -commit f27990c -Author: Alexis La Goutte -Date: Sun Jan 5 18:39:43 2014 +0000 - - Fix indent (use 4 spaces) - - svn path=/trunk/; revision=54609 - -commit bf76292 -Author: Alexis La Goutte -Date: Sun Jan 5 18:39:35 2014 +0000 - - Fix indent (4 spaces) and add modelines - - svn path=/trunk/; revision=54608 - -commit 9e49bf8 -Author: Alexis La Goutte -Date: Sun Jan 5 18:16:29 2014 +0000 - - Fix build when use PortablesAPPS - - svn path=/trunk/; revision=54607 - -commit a051efe -Author: Alexis La Goutte -Date: Sun Jan 5 18:16:22 2014 +0000 - - Fix indent (use 4 spaces) - - svn path=/trunk/; revision=54606 - -commit 88dcc80 -Author: Alexis La Goutte -Date: Sun Jan 5 18:16:14 2014 +0000 - - Enhance NSIS Windows installer (Wireshark Qt support) - - * Add Radiobox to choose File Association (Wireshark GTK or Qt) - * Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...) - * Fix unistaller (don't remove all icons...) - * ... - - svn path=/trunk/; revision=54605 - -commit 76c9fc0 -Author: Alexis La Goutte -Date: Sun Jan 5 17:16:03 2014 +0000 - - Enhance NSIS Windows installer (Wireshark Qt support) - - * Add Radiobox to choose File Association (Wireshark GTK or Qt) - * Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...) - * Fix unistaller (don't remove all icons...) - * ... - - svn path=/trunk/; revision=54604 - -commit 9aad2ee -Author: Gerald Combs -Date: Sun Jan 5 15:03:44 2014 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2014-01-05] - - svn path=/trunk/; revision=54601 - -commit 5fdb822 -Author: Evan Huus -Date: Sun Jan 5 14:58:07 2014 +0000 - - Dissect the remainder of IEC104 integrated totals, including the binary counter - reading and the various flags. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596 - - svn path=/trunk/; revision=54600 - -commit 2ddfebb -Author: Martin Kaiser -Date: Sun Jan 5 12:17:52 2014 +0000 - - use a DVB string for the event text in the short evt descriptor - - svn path=/trunk/; revision=54599 - -commit 36e68f7 -Author: Evan Huus -Date: Sun Jan 5 00:47:24 2014 +0000 - - From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9613 - - Don't use "rand" as a variable name, it shadows a global in recent MacOSX - stdlib.h - - svn path=/trunk/; revision=54598 - -commit 21cc278 -Author: Anders Broman -Date: Sat Jan 4 23:41:22 2014 +0000 - - Fix a typo. - - svn path=/trunk/; revision=54597 - -commit 0c3f422 -Author: Anders Broman -Date: Sat Jan 4 17:48:15 2014 +0000 - - Omit assignment for not used types. - - svn path=/trunk/; revision=54596 - -commit 65ac347 -Author: Bill Meier -Date: Sat Jan 4 17:45:12 2014 +0000 - - Minor: update 'Conversation' intro to include find_or_create_conversation - - svn path=/trunk/; revision=54595 - -commit b26f50c -Author: Bill Meier -Date: Sat Jan 4 17:29:20 2014 +0000 - - (Trivial) explicitely --> explicitly - - svn path=/trunk/; revision=54594 - -commit 3a533cc -Author: Anders Broman -Date: Sat Jan 4 12:03:02 2014 +0000 - - Omit assignment for not used types. - - svn path=/trunk/; revision=54593 - -commit c7c5e4f -Author: Anders Broman -Date: Sat Jan 4 11:54:27 2014 +0000 - - Omit assignment for not used types. - - svn path=/trunk/; revision=54592 - -commit 6b58ef9 -Author: Anders Broman -Date: Sat Jan 4 11:48:40 2014 +0000 - - Omit assignment for not used types. - - svn path=/trunk/; revision=54591 - -commit 42e0144 -Author: Anders Broman -Date: Sat Jan 4 11:40:43 2014 +0000 - - Remove unused function and variable. - - svn path=/trunk/; revision=54590 - -commit 2334ace -Author: Anders Broman -Date: Sat Jan 4 11:34:46 2014 +0000 - - Omit assignment for not used types. - - svn path=/trunk/; revision=54589 - -commit 4763f36 -Author: Anders Broman -Date: Sat Jan 4 11:26:30 2014 +0000 - - Omit assignment for not used types. - - svn path=/trunk/; revision=54588 - -commit 2b32fed -Author: Anders Broman -Date: Sat Jan 4 11:24:33 2014 +0000 - - Omit assignment for not used types. - - svn path=/trunk/; revision=54587 - -commit 7297067 -Author: Anders Broman -Date: Sat Jan 4 10:06:04 2014 +0000 - - Add the rest of the NOKIA extensions. - - svn path=/trunk/; revision=54586 - -commit d0f7a4f -Author: Gerald Combs -Date: Sat Jan 4 01:13:01 2014 +0000 - - Add tooltips for the total number of streams. - - svn path=/trunk/; revision=54585 - -commit 2fa2f63 -Author: Gerald Combs -Date: Sat Jan 4 01:00:19 2014 +0000 - - Add a note and commented-out definitions for Win flex-bison. - - Alex Zhondin was kind enough to create a Chocolatey package for Win - flex-bison. Unfortunately a bug in Chocolatey's shell wrapper generator - keeps us from using it for the time being. - - svn path=/trunk/; revision=54584 - -commit 7af0e2a -Author: Evan Huus -Date: Fri Jan 3 15:09:24 2014 +0000 - - Add partial dissection of IEC104 M_IT_TB_1. - For https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596 - - Also add modelines. - - svn path=/trunk/; revision=54583 - -commit c62db3c -Author: Bill Meier -Date: Fri Jan 3 14:44:16 2014 +0000 - - For -h option: output to stdout and exit(0) as per convention; - Do some whitespace changes; - Change editor-modelines tab-width & etc to 8. - - svn path=/trunk/; revision=54582 - -commit 58a92b1 -Author: Bill Meier -Date: Fri Jan 3 14:30:09 2014 +0000 - - For '-h' option: exit(0) as per convention; - No need to build a constant string on the stack at runtime; - Fix a typo; - Do some whitespace changes; - Change tab-width & etc to 8 in editor modelines. - - svn path=/trunk/; revision=54581 - -commit 4f62f2c -Author: Anders Broman -Date: Fri Jan 3 13:29:48 2014 +0000 - - Add a few more of the NOKIA extensions. - - svn path=/trunk/; revision=54580 - -commit 3fb89fe -Author: Pascal Quantin -Date: Fri Jan 3 12:21:26 2014 +0000 - - EIA2 is now functional - - svn path=/trunk/; revision=54579 - -commit 8299c8d -Author: Alexis La Goutte -Date: Fri Jan 3 10:22:10 2014 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54578 - -commit ff19d57 -Author: Alexis La Goutte -Date: Fri Jan 3 10:21:56 2014 +0000 - - Update NEWS and Release note - - Revert part of last commit about AUTHORS-SHORT in Windows.... - - svn path=/trunk/; revision=54577 - -commit dd03231 -Author: Anders Broman -Date: Fri Jan 3 09:48:53 2014 +0000 - - Update with the removal of the ASN1 plugin and the GNM dissector. - - svn path=/trunk/; revision=54576 - -commit 396c028 -Author: Evan Huus -Date: Fri Jan 3 06:03:28 2014 +0000 - - Make sure we have a dissector table before calling dissector_try_uint_new. Fixes - a null-ptr deref found while fuzzing. - - svn path=/trunk/; revision=54574 - -commit 75dbaf5 -Author: Jörg Mayer -Date: Fri Jan 3 00:40:21 2014 +0000 - - Check flags that might be supported by both C and C++ still - separately. - - svn path=/trunk/; revision=54573 - -commit 0752f22 -Author: Jörg Mayer -Date: Fri Jan 3 00:14:46 2014 +0000 - - As discussed on wireshark-dev: follow autotools to use - -Wshorten-64-to-32 for c only - - svn path=/trunk/; revision=54572 - -commit ef5e9fd -Author: Jeff Morriss -Date: Thu Jan 2 20:48:33 2014 +0000 - - Don't try to build asn1/asn1/Makefile either (see r54561). - - svn path=/trunk/; revision=54571 - -commit 9d41c65 -Author: Guy Harris -Date: Thu Jan 2 20:47:21 2014 +0000 - - No seek-read routines use the length argument, so eliminate it from - wtap_seek_read(). - - svn path=/trunk/; revision=54570 - -commit 5acabc9 -Author: Alexis La Goutte -Date: Thu Jan 2 20:21:09 2014 +0000 - - It is AUTHORS-SHORT.txt in Windows - Kept comment about dev release (and change logo) - Use the some order like Wireshark GTK (Authors before Folders) - - svn path=/trunk/; revision=54569 - -commit 11e4e67 -Author: Guy Harris -Date: Thu Jan 2 20:17:24 2014 +0000 - - Don't use the length argument to the seek-read routine; no other - seek-read routine does that. - - Pass the length we just filled in to buffer_assure_space() in the - seek-read routine, and use that in the memcpy() as well. - - svn path=/trunk/; revision=54568 - -commit d91261a -Author: Jeff Morriss -Date: Thu Jan 2 19:48:26 2014 +0000 - - Don't try to build asn1/gnm/Makefile (see r54561). - - svn path=/trunk/; revision=54567 - -commit 24b377b -Author: Jeff Morriss -Date: Thu Jan 2 19:47:03 2014 +0000 - - Don't try to distribute asn1.dll since we no longer build it. - - svn path=/trunk/; revision=54566 - -commit ac0f903 -Author: Guy Harris -Date: Thu Jan 2 19:39:20 2014 +0000 - - Don't pass the wtap * to a routine if it's not needed. - - svn path=/trunk/; revision=54565 - -commit e9730c8 -Author: Guy Harris -Date: Thu Jan 2 19:33:47 2014 +0000 - - Fill in the struct wtap_pkthdr in the seek-read routine. - - svn path=/trunk/; revision=54564 - -commit a56494a -Author: Jeff Morriss -Date: Thu Jan 2 19:11:06 2014 +0000 - - Fix wireshark-qt startup coredump under autofoo and Windows: make cmake's - VERSION_* macros integers instead of numbers (and treat them as such in - ui/qt/about_dialog.cpp). - - svn path=/trunk/; revision=54563 - -commit bbcd2dc -Author: Jeff Morriss -Date: Thu Jan 2 18:32:58 2014 +0000 - - Set SVN properties. - - svn path=/trunk/; revision=54562 - -commit b22d9ab -Author: Anders Broman -Date: Thu Jan 2 18:01:33 2014 +0000 - - Disabling building of the gnm dissector, I don't tink it was ever used. - - svn path=/trunk/; revision=54561 - -commit 0a5f6f4 -Author: Jörg Mayer -Date: Thu Jan 2 17:59:04 2014 +0000 - - Actually enable building filetap library. - NEWS changed - - svn path=/trunk/; revision=54560 - -commit 643b572 -Author: Anders Broman -Date: Thu Jan 2 17:47:34 2014 +0000 - - Stop building and distributing the asn1 plugin. I bleleve it to be obsolete. - - svn path=/trunk/; revision=54559 - -commit 61c7271 -Author: Anders Broman -Date: Thu Jan 2 17:42:02 2014 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54558 - -commit f5c6f39 -Author: Alexis La Goutte -Date: Thu Jan 2 17:04:10 2014 +0000 - - Add About window for Wireshark Qt - - svn path=/trunk/; revision=54557 - -commit 5490a66 -Author: Alexis La Goutte -Date: Thu Jan 2 16:52:56 2014 +0000 - - Fix icon in top of Wireshark Qt main window - - svn path=/trunk/; revision=54556 - -commit 8ef3e2f -Author: Bill Meier -Date: Thu Jan 2 15:41:45 2014 +0000 - - For getopt() arg processing: - - Use exit(0) for -h option as per convention; - - For g_option...() arg processing (when USE_GOPTION is set): - - Fix bug: 'capinfos x' doesn't print any info about x; - (bug introduced in SVN #48481); - - Use stderr for error messages related to cmd-line arg parsing; - - - svn path=/trunk/; revision=54555 - -commit be849dc -Author: Jörg Mayer -Date: Thu Jan 2 15:17:14 2014 +0000 - - rename filetap/file_wrappers.[hc] -> filetap/ft_file_wrappers.[hc] - to avoid colliding include file names with wiretap/file_wrappers.h - - svn path=/trunk/; revision=54554 - -commit 2db085d -Author: Alexis La Goutte -Date: Thu Jan 2 11:46:58 2014 +0000 - - Fix indent always use tab - - svn path=/trunk/; revision=54553 - -commit 3cb2c58 -Author: Anders Broman -Date: Thu Jan 2 11:27:10 2014 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54552 - -commit 558c885 -Author: Guy Harris -Date: Thu Jan 2 09:23:45 2014 +0000 - - Have a routine that reads and processes the record header, and use it in - both the read and seek-read routines. - - Use the packet length read from the packet header when reading packets - randomly. - - svn path=/trunk/; revision=54549 - -commit ce4d667 -Author: Guy Harris -Date: Thu Jan 2 02:18:04 2014 +0000 - - Process the packet header and data in common code, shared by the read - and seek-read routines. - - svn path=/trunk/; revision=54548 - -commit abda7cd -Author: Guy Harris -Date: Thu Jan 2 02:16:22 2014 +0000 - - Read the packet header in the seek-read routines as well as the read - routines. - - svn path=/trunk/; revision=54547 - -commit 492883c -Author: Guy Harris -Date: Wed Jan 1 23:22:53 2014 +0000 - - If the uncompression buffers are empty, they have no data; set the count - of bytes in them to 0, as there's no data in them, and set the offset in - that buffer of the stream's current position, to 0, as we're currently - at the beginning of the file in both streams. - - This fixes some tricky-to-reproduce errors (which show up only if the - ngsniffer_t structure is allocated from data that's been allocated, - written to in those variables, and freed). - - #BACKPORT 1.8, 1.10 - - svn path=/trunk/; revision=54544 - -commit f878016 -Author: Guy Harris -Date: Wed Jan 1 23:19:17 2014 +0000 - - Back out r54523 - more work is needed on it, and some testing found an - unrelated uninitialized-data bug that I want to fix in the next commit, - and then backport. - - svn path=/trunk/; revision=54543 - -commit 10ebce2 -Author: Bill Meier -Date: Wed Jan 1 18:14:16 2014 +0000 - - Add svn:keywords property - - svn path=/trunk/; revision=54542 - -commit 2bd1b54 -Author: Bill Meier -Date: Wed Jan 1 18:11:38 2014 +0000 - - Remove incorrect property 'svn:keyword' - - svn path=/trunk/; revision=54541 - -commit c228237 -Author: Bill Meier -Date: Wed Jan 1 18:08:30 2014 +0000 - - Change incorrect property 'keywords' to 'svn:keywords' - - svn path=/trunk/; revision=54540 - -commit fa353bc -Author: Bill Meier -Date: Wed Jan 1 18:02:11 2014 +0000 - - Remove incorrect property 'svn:kywords' - - svn path=/trunk/; revision=54539 - -commit b602491 -Author: Bill Meier -Date: Wed Jan 1 17:58:19 2014 +0000 - - Remove incorrect property 'eol-style' - - svn path=/trunk/; revision=54538 - -commit d193a13 -Author: Bill Meier -Date: Wed Jan 1 17:54:44 2014 +0000 - - Fix property name: svn:eol_style ==> svn:eol-style - - svn path=/trunk/; revision=54537 - -commit c3dce3b -Author: Michael Mann -Date: Wed Jan 1 14:55:20 2014 +0000 - - Fix compile issue - - svn path=/trunk/; revision=54536 - -commit 998bbfb -Author: Pascal Quantin -Date: Wed Jan 1 14:51:58 2014 +0000 - - Try to pacify OSX-10.6-x64 buildbot - - svn path=/trunk/; revision=54535 - -commit 6ebc058 -Author: Pascal Quantin -Date: Wed Jan 1 14:33:19 2014 +0000 - - Add proto_tree_add_ts_23_038_7bits_item() / tvb_get_ts_23_038_7bits_string() functions and update dissectors to use it. - Remove gsm_sms_char_7bit_unpack() / gsm_sms_chars_to_utf8() functions. - Update documentation a bit. - - svn path=/trunk/; revision=54534 - -commit e504cf9 -Author: Pascal Quantin -Date: Wed Jan 1 14:29:16 2014 +0000 - - wimax_compact_ulmap_ie_decoder() is used outside of wimax_compact_ulmap_ie_decoder.c - - svn path=/trunk/; revision=54533 - -commit 28a2511 -Author: Alexis La Goutte -Date: Wed Jan 1 14:12:38 2014 +0000 - - Add extern C for init_wslua (for future use in Wireshark Qt) - - svn path=/trunk/; revision=54532 - -commit 6daf9fd -Author: Michael Mann -Date: Wed Jan 1 13:18:45 2014 +0000 - - Filetap library, version 0.001 - - This is intended as the "tap library" for fileshark. Right now its basically just a very stripped down (and renamed) copy of the wiretap library. The goal is to remove "capture" and "wire" specific functionality out of the file handling to make it easier/simpler to support non-capture type files in the epan architecture. - - svn path=/trunk/; revision=54531 - -commit 818c0fd -Author: Anders Broman -Date: Wed Jan 1 12:25:44 2014 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54530 - -commit ddda691 -Author: Stig Bjørlykke -Date: Wed Jan 1 12:20:27 2014 +0000 - - Happy new year! - - svn path=/trunk/; revision=54529 - -commit 451c30e -Author: Anders Broman -Date: Wed Jan 1 12:17:57 2014 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54528 - -commit 322e727 -Author: Guy Harris -Date: Tue Dec 31 23:51:10 2013 +0000 - - Use a common code path for most of both sequential and random file - access. We currently can't provide a time stamp when randomly reading, - so don't set WTAP_HAS_TS in that case. - - svn path=/trunk/; revision=54527 - -commit 1e3f101 -Author: Guy Harris -Date: Tue Dec 31 23:49:09 2013 +0000 - - Back out a change so that we can check it in again with the correct - commit message. - - svn path=/trunk/; revision=54526 - -commit d734fe4 -Author: Guy Harris -Date: Tue Dec 31 23:48:02 2013 +0000 - - When reading MIME-encapsulated files, read the entire file at once, - don't break it into chunks. - - This means we don't need to do reassembly in the MIME-encapsulated-data - dissector. - - svn path=/trunk/; revision=54525 - -commit 8387a45 -Author: Guy Harris -Date: Tue Dec 31 23:47:24 2013 +0000 - - When reading MIME-encapsulated files, read the entire file at once, - don't break it into chunks. - - This means we don't need to do reassembly in the MIME-encapsulated-data - dissector. - - svn path=/trunk/; revision=54524 - -commit cdce403 -Author: Guy Harris -Date: Tue Dec 31 23:43:54 2013 +0000 - - When reading sequentially, pass the packet data length to - ngsniffer_read_rec_data(), and separatelyskip extra data after that. - - When reading randomly, use the packet length read from the packet - header. - - svn path=/trunk/; revision=54523 - -commit 0dd0176 -Author: Guy Harris -Date: Tue Dec 31 23:41:35 2013 +0000 - - Use the packet length read from the packet header when reading packets - randomly. - - svn path=/trunk/; revision=54522 - -commit 9df5ace -Author: Guy Harris -Date: Tue Dec 31 23:34:43 2013 +0000 - - Trust the packet length we calculate when reading packets randomly. - - svn path=/trunk/; revision=54521 - -commit a628e77 -Author: Guy Harris -Date: Tue Dec 31 23:33:49 2013 +0000 - - Make it clearer that we're using the packet length read from the packet - header when reading packets randomly. - - svn path=/trunk/; revision=54520 - -commit eeda7ec -Author: Guy Harris -Date: Tue Dec 31 23:32:30 2013 +0000 - - Use the packet length read from the packet header when reading packets - randomly. - - svn path=/trunk/; revision=54519 - -commit cd13dd3 -Author: Guy Harris -Date: Tue Dec 31 23:31:44 2013 +0000 - - Use the packet length read from the packet header when reading packets - randomly. - - svn path=/trunk/; revision=54518 - -commit 31d74c1 -Author: Guy Harris -Date: Tue Dec 31 23:30:39 2013 +0000 - - Use the packet length read from the packet header, and check for an EOF - and treat it as an error, when reading packets randomly. - - svn path=/trunk/; revision=54517 - -commit 4648f41 -Author: Guy Harris -Date: Tue Dec 31 23:30:18 2013 +0000 - - Use the packet length read from the packet header, and check for an EOF - and treat it as an error, when reading packets randomly. - - svn path=/trunk/; revision=54516 - -commit a4c1a7c -Author: Pascal Quantin -Date: Tue Dec 31 17:19:43 2013 +0000 - - Revert r54510: OSX buildbots still complain about unused hf variables - - svn path=/trunk/; revision=54515 - -commit 1d11745 -Author: Bill Meier -Date: Tue Dec 31 16:23:00 2013 +0000 - - Add -h option (with output to stdout and exit status 0). - Add editor modelines. - - svn path=/trunk/; revision=54514 - -commit 6b4944e -Author: Bill Meier -Date: Tue Dec 31 16:17:09 2013 +0000 - - Follow convention for -h option: - Output to stdout & then exit(0). - Add editor modelines. - - svn path=/trunk/; revision=54513 - -commit 1b180b3 -Author: Bill Meier -Date: Tue Dec 31 15:10:51 2013 +0000 - - Use the normal convention for exit status and output file descriptors: - Changes: - - exit(1) if error (not exit(-1)); - - for -h: output to stdout & exit(0); - - Also: - - editor modelines: set tab-width=8; - - use a consistent whitespace & formatting style; - - svn path=/trunk/; revision=54512 - -commit aa796df -Author: Pascal Quantin -Date: Tue Dec 31 14:50:52 2013 +0000 - - Add SVN properties - - svn path=/trunk/; revision=54511 - -commit 729e8a2 -Author: Martin Kaiser -Date: Tue Dec 31 14:48:48 2013 +0000 - - move packet-tango.c from dirty to clean - - svn path=/trunk/; revision=54510 - -commit 97f904a -Author: Martin Kaiser -Date: Tue Dec 31 14:25:28 2013 +0000 - - add Novell PKIS to the list of new protocols - - svn path=/trunk/; revision=54509 - -commit 43e892e -Author: Martin Kaiser -Date: Tue Dec 31 14:20:08 2013 +0000 - - From Dirk - dissector for Novell's PKIS certificate extensions - - from me - clean up the $Id$ tags - remove packet-pkis(-template).h - remove ASN.1 definitions that cause compiler warnings - (OID, SecurityLabelType2) - move the dissector to the clean ASN.1 dissectors - support CMake build - change the name to novell_pkis - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9597 - - svn path=/trunk/; revision=54508 - -commit fc15329 -Author: Martin Kaiser -Date: Tue Dec 31 13:09:52 2013 +0000 - - add some more box names - - svn path=/trunk/; revision=54507 - -commit 2719103 -Author: Martin Mathieson -Date: Tue Dec 31 00:46:53 2013 +0000 - - Zero security struct to avoid reading garbage value, and remove a redundant test - - svn path=/trunk/; revision=54506 - -commit a65cbe8 -Author: Jakub Zawadzki -Date: Mon Dec 30 23:58:45 2013 +0000 - - Add new function: tvb_skip_guint8() - - svn path=/trunk/; revision=54505 - -commit e1ea055 -Author: Guy Harris -Date: Mon Dec 30 23:44:42 2013 +0000 - - Clean up white space. - - svn path=/trunk/; revision=54504 - -commit 53cba3e -Author: Guy Harris -Date: Mon Dec 30 23:37:12 2013 +0000 - - Add an "ATM reassembly failed" flag for capture file readers to provide, - and set it in NetXRay/Windows Sniffer files if the putative "ATM - reassembly failed" flag is set and, if reassembly failed, don't attempt - to dissect the packet. - - svn path=/trunk/; revision=54503 - -commit 1c9b36a -Author: Guy Harris -Date: Mon Dec 30 22:31:04 2013 +0000 - - gcamel_StatSRT is set by the CLI CAMEL tap, so it can't be static. - - svn path=/trunk/; revision=54502 - -commit bb4b783 -Author: Bill Meier -Date: Mon Dec 30 22:22:22 2013 +0000 - - Fix a couple of old typos; - Use a consistent formatting style for function defs; - Add editor modelines. - - svn path=/trunk/; revision=54501 - -commit 2c73dbc -Author: Guy Harris -Date: Mon Dec 30 22:14:45 2013 +0000 - - Squelch compiler warnings. - - svn path=/trunk/; revision=54500 - -commit 58346b6 -Author: Michael Mann -Date: Mon Dec 30 22:07:38 2013 +0000 - - Move tcap and camel "persistent data" functionality to the dissectors themselves instead of being part of epan directory. - - svn path=/trunk/; revision=54499 - -commit 94387fd -Author: Guy Harris -Date: Mon Dec 30 21:03:43 2013 +0000 - - If we don't have libgcrypt, have a stub zbee_sec_ccm_decrypt() routine - that always returns FALSE, meaning "can't decrypt". - - Should fix bug 9608. - - We already declare zbee_sec_ccm_decrypt() in a header file, so don't - declare it in the source file. - - svn path=/trunk/; revision=54498 - -commit e133ec2 -Author: Guy Harris -Date: Mon Dec 30 20:56:53 2013 +0000 - - More reverse engineering. - - svn path=/trunk/; revision=54497 - -commit 3490fae -Author: Pascal Quantin -Date: Mon Dec 30 12:26:03 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9286 : - PLMN 440 20 is now used by SoftBank. - While we are at it, update the E.212 list to the latest operational bulletin no. 1041. - - svn path=/trunk/; revision=54496 - -commit 5946c52 -Author: Guy Harris -Date: Mon Dec 30 06:43:19 2013 +0000 - - For file formats that don't have magic numbers, so they're recognized by - heuristics, but do have a file extension that files of that format are - likely to have, use the extension of the file we're opening, if it has - one, as a hint for which heuristics to try first. - - svn path=/trunk/; revision=54495 - -commit 8724d5d -Author: Bill Meier -Date: Mon Dec 30 02:24:11 2013 +0000 - - Use G_GUINT64_CONSTANT(nn) instead of nnULL in a few places. - - svn path=/trunk/; revision=54494 - -commit f7208c8 -Author: Bill Meier -Date: Mon Dec 30 01:47:51 2013 +0000 - - Don't use 'l' as a constant modifier: - Define NTP_BASETIME as an unsigned [int] constant; - - Also: - Add editor modelines; - Create/use an extended value-string; - Use casts to time_t consistently; - 'offset++' --> 'offset += 1' - Adjust some whitespace. - - svn path=/trunk/; revision=54493 - -commit ce68b8d -Author: Jakub Zawadzki -Date: Sun Dec 29 23:29:03 2013 +0000 - - Make arrow down/ up work in gtk again. - - Broken by r54328 g_ascii_isprint() can test only char type and event->keyval is unsigned int. - - svn path=/trunk/; revision=54492 - -commit 8732850 -Author: Guy Harris -Date: Sun Dec 29 23:09:12 2013 +0000 - - Replace a global variable used only for its size with a #define for the - size; this eliminates a global variable and also eliminates some - compiler warnings on LP64 platforms. - - svn path=/trunk/; revision=54491 - -commit f7af5c4 -Author: Bill Meier -Date: Sun Dec 29 21:22:51 2013 +0000 - - For the Juan Antonio entry: specify the dissector written; - Move the entry to the end ofthe first section (before the - 'and by' section. - - svn path=/trunk/; revision=54490 - -commit 7564576 -Author: Bill Meier -Date: Sun Dec 29 20:58:27 2013 +0000 - - From robionekenobi: packet-mq enhancement - Add new Structure dissection - Fix some small issues - Reformat some part of code - use spaces instead of tabs for indentation - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9603 - - From me: - Remove some trailing whitespace; - Change a few tabs to spaces; - Change editor-modelines tab-width, etc to 8 (altho - not really relevant since tabs not being used). - - svn path=/trunk/; revision=54489 - -commit 745c866 -Author: Martin Kaiser -Date: Sun Dec 29 18:45:09 2013 +0000 - - From stcook - clear the temporary buffer after each DXM channel data line - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 - - svn path=/trunk/; revision=54488 - -commit 870635c -Author: Gerald Combs -Date: Sun Dec 29 17:28:12 2013 +0000 - - The IEEE OUI, IAB, and OUI-36 lists currently redirect to - http://standards.ieee.org/regauthmaint.html, which says - - IEEE Registration Authority Services will be unavailable from Friday, December 27th through Monday, December 30th - - As a result the manuf file got clobbered. Revert the manuf file to - its non-clobbered state and add sanity checks to make-manuf. Add a - note about the impending addition of OUI-28. - - svn path=/trunk/; revision=54485 - -commit 2693738 -Author: Jakub Zawadzki -Date: Sun Dec 29 16:00:26 2013 +0000 - - Set svn:keywords and svn:eol-style properties. - - svn path=/trunk/; revision=54484 - -commit 57a62f7 -Author: Michael Mann -Date: Sun Dec 29 15:28:49 2013 +0000 - - New dissector for the CCSDS CFDP protocol. Bug 9517 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9517) - - From Juan Antonio - - svn path=/trunk/; revision=54482 - -commit f01ee8a -Author: Gerald Combs -Date: Sun Dec 29 15:03:50 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-12-29] - - svn path=/trunk/; revision=54480 - -commit 82f9e9e -Author: Martin Kaiser -Date: Sat Dec 28 20:37:21 2013 +0000 - - use the correct record length for an IPv6 record in the NRB - - this is already correct in 1.8 and 1.10 and was - accidentially(?) changed in r52176 - - svn path=/trunk/; revision=54479 - -commit d3ed64d -Author: Michael Mann -Date: Sat Dec 28 12:26:37 2013 +0000 - - Add ZigBee Green Power dissector. Bug 9424 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9424) - - From DSR Corporation - - svn path=/trunk/; revision=54478 - -commit a8ac118 -Author: Guy Harris -Date: Fri Dec 27 23:55:23 2013 +0000 - - Use Unicode REPLACEMENT CHARACTER for TS 23.038 errors, as we do for - unassigned code points in some other character sets. - - svn path=/trunk/; revision=54477 - -commit d6b35d5 -Author: Jakub Zawadzki -Date: Fri Dec 27 17:42:46 2013 +0000 - - mp2t: return offset when dissecting AF (continuation of r54396) - - svn path=/trunk/; revision=54476 - -commit 6bb97fa -Author: Jakub Zawadzki -Date: Fri Dec 27 15:46:50 2013 +0000 - - Generate prototype for plugin_reg_handoff() - - This should fix warnings: - plugin.c:XX:1: warning: no previous prototype for 'plugin_reg_handoff' [-Wmissing-prototypes] - - svn path=/trunk/; revision=54475 - -commit cc74708 -Author: Guy Harris -Date: Fri Dec 27 11:08:41 2013 +0000 - - Fix some typoes, quote $CFLAGS and $LDFLAGS when using them in - assignments (not sure that's necessary, but...). - - svn path=/trunk/; revision=54474 - -commit d0915ca -Author: Anders Broman -Date: Fri Dec 27 10:49:35 2013 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54473 - -commit fa2c0bb -Author: Alexis La Goutte -Date: Fri Dec 27 08:11:25 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9576 - - Replace g_memmove with memmove - - However there still one move g_memmove related code in "packaging/macosx/native-gtk/glibconfig.h". - - svn path=/trunk/; revision=54472 - -commit 2412913 -Author: Guy Harris -Date: Thu Dec 26 21:45:51 2013 +0000 - - Fix configure-script errors with some versions of autoconf. - - svn path=/trunk/; revision=54470 - -commit 31954c9 -Author: Evan Huus -Date: Thu Dec 26 21:35:20 2013 +0000 - - From Robert Jongbloed via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8355 - - Support RTP/RTCP multiplexing. With input from Jonathan Lennox. - - svn path=/trunk/; revision=54469 - -commit 0893e06 -Author: Guy Harris -Date: Thu Dec 26 21:03:54 2013 +0000 - - OK, "i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. - build 5658) (LLVM build 2336.11.00)" likes -Wmissing-prototypes but not - -Wmissing-declarations and G++ 4.8.2 likes -Wmissing-declarations but - not -Wmissing-prototypes, so check whether *either* of them requires - -Werror in order to be detected as NSFC++. - - Fix a copy-and-pasteo while we're at it. - - Don't treat a different willingness to accept - -Wmissing-{prototypes,declarations} as an indication that you have - mismatched C and C++ compilers. - - svn path=/trunk/; revision=54468 - -commit 29f61a9 -Author: Michael Mann -Date: Thu Dec 26 15:42:06 2013 +0000 - - Add numeric types instead of string where possible in the RTPproxy dissector. Bug 9561 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9561) - - From Peter Lemenkov - - svn path=/trunk/; revision=54467 - -commit f563d1d -Author: Michael Mann -Date: Thu Dec 26 15:08:18 2013 +0000 - - ZigBee Test Profile #2 and ZDP fixes. Bug 9584 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9584) - - From DSR Corporation - - svn path=/trunk/; revision=54466 - -commit 60b1c30 -Author: Michael Mann -Date: Thu Dec 26 14:28:22 2013 +0000 - - Bugfix attribute id parsing in zbee dissectors. Bug 9566 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9566) - - From Fabio Tarabelloni - - svn path=/trunk/; revision=54465 - -commit a2abd0e -Author: Evan Huus -Date: Thu Dec 26 14:12:50 2013 +0000 - - Protect ucp_mktime against too-short input strings, as caught by Alexis' - ASAN-fuzzing. - - svn path=/trunk/; revision=54464 - -commit 6697a94 -Author: Michael Mann -Date: Thu Dec 26 14:10:26 2013 +0000 - - "Better" fix for OpenSafety heuristics with Modbus/TCP. Bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572) - - From Roland Knall - - This fix is on top of/in conjunction with r54193 and both need to be backported. - - svn path=/trunk/; revision=54463 - -commit 441ebf8 -Author: Evan Huus -Date: Thu Dec 26 14:01:37 2013 +0000 - - Use the correct define for the array length check, actually fixes the overflow I - originall tried to fix in r54441. - - svn path=/trunk/; revision=54462 - -commit 67527be -Author: Guy Harris -Date: Thu Dec 26 13:45:59 2013 +0000 - - Report files not recognized as capture files as type "unknown" rather - than as open errors. - - svn path=/trunk/; revision=54461 - -commit e3d4fe8 -Author: Guy Harris -Date: Thu Dec 26 12:58:26 2013 +0000 - - Add some new tags seen. - - svn path=/trunk/; revision=54460 - -commit ca91b33 -Author: Jakub Zawadzki -Date: Thu Dec 26 10:53:53 2013 +0000 - - There's no need to mark inline functions with _U_ - - svn path=/trunk/; revision=54459 - -commit e79f82d -Author: Alexis La Goutte -Date: Thu Dec 26 10:00:36 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54458 - -commit c39b9e7 -Author: Alexis La Goutte -Date: Thu Dec 26 09:54:31 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54457 - -commit 766d443 -Author: Alexis La Goutte -Date: Thu Dec 26 09:54:22 2013 +0000 - - Fix -Wunused-const-variable found by Clang - - svn path=/trunk/; revision=54456 - -commit 00fb8f0 -Author: Alexis La Goutte -Date: Thu Dec 26 09:54:12 2013 +0000 - - From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9595 - - Small changes (mainly textual) to packet-scsi.c - - The attached patch fixes small issues in SCSI dissection: - 1. Extends the meaning of some fields (for example, the mysterious 'LBPME' becomes 'LBPME (logical block provisioning management enabled) / TPE' - 2. Adds another ASC value which is important to me - 'Thin Provisioning Soft Threshold Reached' . Added comment where to get all of them (at http://www.t10.org/lists/asc-alph.txt or http://www.t10.org/lists/asc-num.txt) - 3. Fixes a small typo: scsi.extcopy.dest_lba is 'Destination LBA', not 'Source LBA' (silly copy-paste mistake). - - svn path=/trunk/; revision=54455 - -commit 8411568 -Author: Chris Maynard -Date: Thu Dec 26 03:45:12 2013 +0000 - - Since the documentation states that, "Text2pcap understands a hexdump of the form generated by od -Ax -tx1 -v.", supply an example that actually matches that format. - - In addition, change the hex bytes so that they represent a valid, well-formed packet, rather than a malformed RSVP packet. This should allow a user to more clearly verify that the text2pcap converstion worked as expected in the event he/she desires to test text2pcap using the example provided. - - - svn path=/trunk/; revision=54454 - -commit c0823e1 -Author: Guy Harris -Date: Wed Dec 25 23:03:12 2013 +0000 - - OmniPeek's dissection nonwitstanding, the timestamp field in the - PeekRemote packets from Cisco appears to be a 64-bit timestamp; it's - probably the Time Synchronization Function timestamp (TSFT), so call it - that. - - svn path=/trunk/; revision=54453 - -commit 189debc -Author: Guy Harris -Date: Wed Dec 25 09:23:33 2013 +0000 - - Code that uses that parameter is #if 0'ed out, so _U_ it for now. - - svn path=/trunk/; revision=54452 - -commit 21f8c1f -Author: Martin Mathieson -Date: Wed Dec 25 08:44:43 2013 +0000 - - Show ciphering and integrity keys separately. Correct inputs to integrity calculation (result still not right with gcrypt 1.6 yet) - - svn path=/trunk/; revision=54451 - -commit e44ebaa -Author: Michael Mann -Date: Wed Dec 25 03:48:20 2013 +0000 - - Use expert info instead of proto_tree_add_text. - - svn path=/trunk/; revision=54450 - -commit 6535f89 -Author: Michael Mann -Date: Tue Dec 24 23:41:24 2013 +0000 - - Make many fields filterable. Used convert_proto_tree_add_text.pl to do a "first pass" at converting proto_tree_add_text calls since this dissector is the worse (ab)user (by volume) of proto_tree_add_text and the "coding style" is very conducive to having convert_proto_tree_add_text.pl correctly guessing the field info. - - Another pass or two of convert_proto_tree_add_text.pl (with more manual intervention) is needed to be a "proper" dissector, but it gets it off of the checkAPIs.pl "naughty list" in time for Christmas. - - svn path=/trunk/; revision=54449 - -commit b5baf01 -Author: Guy Harris -Date: Tue Dec 24 18:51:13 2013 +0000 - - No need for quotes around the arguments to AC_MSG_ macros. - - svn path=/trunk/; revision=54448 - -commit 8713e04 -Author: Guy Harris -Date: Tue Dec 24 18:43:42 2013 +0000 - - Some warning options are, for reasons not entirely obvious to me, not - supported by some versions of g++ even though the corresponding version - of gcc supports them. Other versions of g++, and clang, support them. - - Check, before adding a -W option for C++, whether the compiler supports - it; that check must be done with -Werror, at least with g++, in order to - get a non-zero exit status from the compiler. - - svn path=/trunk/; revision=54447 - -commit 68e7ccc -Author: Alexis La Goutte -Date: Tue Dec 24 15:16:02 2013 +0000 - - From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589 - - Enhance SSL dissector : fix ssl_private_decrypt() - - rename and remove some variables - - svn path=/trunk/; revision=54446 - -commit 46d0f09 -Author: Alexis La Goutte -Date: Tue Dec 24 15:15:52 2013 +0000 - - From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589 - - Enhance SSL dissector : fix ssl_private_decrypt() - - free all gcrypt resources - - svn path=/trunk/; revision=54445 - -commit ee6d040 -Author: Alexis La Goutte -Date: Tue Dec 24 15:15:43 2013 +0000 - - From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589 - - Enhance SSL dissector : fix ssl_private_decrypt() - - free all gcrypt resources - - svn path=/trunk/; revision=54444 - -commit ad5d1b9 -Author: Alexis La Goutte -Date: Tue Dec 24 15:15:29 2013 +0000 - - From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589 - - Enhance SSL dissector : fix ssl_private_decrypt() - - initialize all variables - - svn path=/trunk/; revision=54443 - -commit 7c5dc6d -Author: Alexis La Goutte -Date: Tue Dec 24 15:15:17 2013 +0000 - - From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589 - - Enhance SSL dissector : fix ssl_private_decrypt() - - remove unused functions and a #define - - svn path=/trunk/; revision=54442 - -commit 36587bc -Author: Evan Huus -Date: Tue Dec 24 14:34:06 2013 +0000 - - Avoid accessing past the end of an array. - - svn path=/trunk/; revision=54441 - -commit d6b1e2e -Author: Martin Kaiser -Date: Tue Dec 24 13:53:09 2013 +0000 - - use https instead of http in the url when the packet contains ssl - - svn path=/trunk/; revision=54440 - -commit fba61a3 -Author: Martin Kaiser -Date: Tue Dec 24 13:44:00 2013 +0000 - - add ssl detection to proto_get_frame_protocols() - - svn path=/trunk/; revision=54439 - -commit 7708c2a -Author: Martin Kaiser -Date: Tue Dec 24 13:38:32 2013 +0000 - - dirty hack to make things compile without libgcrypt - - would it make sense to check global_pdcp_check_integrity inside - calculate_digest()? - - svn path=/trunk/; revision=54438 - -commit 8cbcfcf -Author: Martin Mathieson -Date: Tue Dec 24 07:24:39 2013 +0000 - - Lop off last 4 bytes of payload to use for digest calculation. Still doesn't get expected result. - - svn path=/trunk/; revision=54437 - -commit 18f9460 -Author: Evan Huus -Date: Tue Dec 24 03:39:19 2013 +0000 - - Remove now-unused ephemeral stack code. And another one bites the dust... - - svn path=/trunk/; revision=54436 - -commit 7151a4d -Author: Evan Huus -Date: Tue Dec 24 03:29:14 2013 +0000 - - Replace all(?) remaining ep_stack occurences with wmem stacks. - - svn path=/trunk/; revision=54435 - -commit 0ea5c80 -Author: Evan Huus -Date: Tue Dec 24 01:38:26 2013 +0000 - - Replace an ep-stack with a wmem stack. Running epan_init() no longer uses - any ephemeral memory. - - svn path=/trunk/; revision=54434 - -commit edb6cf0 -Author: Guy Harris -Date: Tue Dec 24 01:30:00 2013 +0000 - - Get rid of no-longer-used variables. - - svn path=/trunk/; revision=54433 - -commit 1dfa4e2 -Author: Evan Huus -Date: Tue Dec 24 01:17:41 2013 +0000 - - Add wmem_destroy_list, wmem_destroy_queue, wmem_destroy_stack so that those - data-structures can be used with manually managed memory. - - svn path=/trunk/; revision=54432 - -commit 5f91a0a -Author: Guy Harris -Date: Tue Dec 24 01:03:59 2013 +0000 - - Oops, escape characters shouldn't cause anything to be added to the - string, they should just cause TRUE to be returned - it's the *next* - code point that gets treated specially and, after mapping, added to the - string. - - svn path=/trunk/; revision=54431 - -commit 5a81522 -Author: Evan Huus -Date: Tue Dec 24 00:54:30 2013 +0000 - - Make sure uchar is always initialized. Just use '?' since the comment indicates - that it's a weird (undefined?) case. - - svn path=/trunk/; revision=54430 - -commit bd8aeb9 -Author: Guy Harris -Date: Tue Dec 24 00:23:09 2013 +0000 - - Update some comments. - - svn path=/trunk/; revision=54429 - -commit 0d7a48a -Author: Guy Harris -Date: Tue Dec 24 00:20:09 2013 +0000 - - Add a ENC_3GPP_TS_23_038 encoding, for the standard SMS alphabet in a - bit-packed string, and use it in some places. - - svn path=/trunk/; revision=54428 - -commit 57c6542 -Author: Martin Mathieson -Date: Tue Dec 24 00:09:41 2013 +0000 - - Still not quite working, but using MAC API with gcrypt 1.6 now for digest - - svn path=/trunk/; revision=54427 - -commit b71b269 -Author: Guy Harris -Date: Mon Dec 23 22:05:23 2013 +0000 - - Fix setup of new expert info item. - - svn path=/trunk/; revision=54426 - -commit 7adc480 -Author: Michael Mann -Date: Mon Dec 23 21:39:09 2013 +0000 - - Make C-type filterable. - - If someone wanted to make more hf_ variables accompanied by a variety of value_strings for each category, they are certainly more than welcome. For now it just cuts down on the proto_tree_add_text (ab)use. - - "Comment out" unused hf_ variable found. - - svn path=/trunk/; revision=54425 - -commit 0fc3f9c -Author: Evan Huus -Date: Mon Dec 23 21:30:44 2013 +0000 - - Designated initializers are not standard C90, just list all the '-1's without - their field names. - - svn path=/trunk/; revision=54424 - -commit e805778 -Author: Evan Huus -Date: Mon Dec 23 21:19:34 2013 +0000 - - Avoid using ephemeral memory in register routines. - - svn path=/trunk/; revision=54423 - -commit a0321dd -Author: Evan Huus -Date: Mon Dec 23 21:19:06 2013 +0000 - - Avoid one unnecessary use of ephemeral memory. - - svn path=/trunk/; revision=54422 - -commit adff2b3 -Author: Evan Huus -Date: Mon Dec 23 21:09:26 2013 +0000 - - Get rid of some useless intermediate ep-memory when building Diameter arrays. - - svn path=/trunk/; revision=54421 - -commit b2e5e4a -Author: Evan Huus -Date: Mon Dec 23 20:52:12 2013 +0000 - - First round converting OIDs from emem to wmem. Just internal functions so far. - - svn path=/trunk/; revision=54420 - -commit d567248 -Author: Alexis La Goutte -Date: Mon Dec 23 20:42:43 2013 +0000 - - From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9498 - - dtls: use generic ssl dissect code for TLS extensions - - This makes the DTLS dissector use the now common TLS extensions - dissector from packet-ssl-utils.c instead of its own. - - Signed-off-by: Hauke Mehrtens - - svn path=/trunk/; revision=54419 - -commit 7b75159 -Author: Alexis La Goutte -Date: Mon Dec 23 20:42:28 2013 +0000 - - From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9498 - - ssl: move TLS ext dissect code to packet-ssl-utils.c - - This moves the code used to parse the TLS extension into packet- - ssl-utils.c and adds an architecture that this code could be used by - dtls in the next patch. This patch should not change anything in the - functionality. - - Signed-off-by: Hauke Mehrtens - - svn path=/trunk/; revision=54418 - -commit a92a125 -Author: Alexis La Goutte -Date: Mon Dec 23 20:13:48 2013 +0000 - - Add modelines info - - svn path=/trunk/; revision=54417 - -commit aa65e84 -Author: Alexis La Goutte -Date: Mon Dec 23 20:13:31 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54416 - -commit 09e10bb -Author: Alexis La Goutte -Date: Mon Dec 23 20:13:17 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54415 - -commit c3a3825 -Author: Alexis La Goutte -Date: Mon Dec 23 20:13:04 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54414 - -commit efa81cd -Author: Alexis La Goutte -Date: Mon Dec 23 20:12:51 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54413 - -commit b3a584d -Author: Alexis La Goutte -Date: Mon Dec 23 20:12:39 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54412 - -commit 368df16 -Author: Alexis La Goutte -Date: Mon Dec 23 20:12:26 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54411 - -commit 8b468ca -Author: Alexis La Goutte -Date: Mon Dec 23 20:12:13 2013 +0000 - - Fix Result of operation is garbage or undefined warning found by Clang - - svn path=/trunk/; revision=54410 - -commit b48d585 -Author: Jeff Morriss -Date: Mon Dec 23 20:05:18 2013 +0000 - - Set SVN properties. - - svn path=/trunk/; revision=54409 - -commit 43a2cd3 -Author: Alexis La Goutte -Date: Mon Dec 23 19:24:20 2013 +0000 - - Fix Windows Buildbot - - packet-ubertooth.c(680) : warning C4244: '=' : conversion from 'gint16' to 'guint8', possible loss of data - - svn path=/trunk/; revision=54408 - -commit 0d76e34 -Author: Alexis La Goutte -Date: Mon Dec 23 18:56:30 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 - - USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 - - USB: CCID: Add ACR122 dissector to be autodetected by VendorId/ProductID - - svn path=/trunk/; revision=54407 - -commit e32d169 -Author: Alexis La Goutte -Date: Mon Dec 23 18:56:19 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 - - USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 - - NFC: Add ACR122 USB dongle dissector - - ACS ACR122 is compatibile with PN532, but has its own API. Dissect it. - - svn path=/trunk/; revision=54406 - -commit 908bd09 -Author: Alexis La Goutte -Date: Mon Dec 23 18:56:06 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 - - USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 - - Bluetooth: Add support for Low Energy Link Layer dissector - - svn path=/trunk/; revision=54405 - -commit b16af7b -Author: Alexis La Goutte -Date: Mon Dec 23 18:55:55 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 - - USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 - - Bluetooth: L2CAP: Clarify constant - - BTL2CAP_FIXED_CID_MAX should not be 0x40 because this is first - dynamic CID, so rename to BTL2CAP_FIXED_CID_LAST and set to - last fixed CID value. - - svn path=/trunk/; revision=54404 - -commit eb68a7b -Author: Alexis La Goutte -Date: Mon Dec 23 18:55:37 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 - - USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 - - Bluetooth: HCI: Clarify roles for Switch Role command - - Descriptions now based on Core 4.1 specification. - - svn path=/trunk/; revision=54403 - -commit 717b8d3 -Author: Alexis La Goutte -Date: Mon Dec 23 18:55:04 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 - - USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 - - USB: Add support for Ubertooth dissections - - svn path=/trunk/; revision=54402 - -commit 00fd173 -Author: Alexis La Goutte -Date: Mon Dec 23 18:54:46 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 - - USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 - - USB: Make setup request to be able decoding by next dissector - - Most devices use them as commands, so we can dissect this protocol (class, vendor). - Also update "hci_usb" to decode these informations. - - svn path=/trunk/; revision=54401 - -commit 27a9308 -Author: Alexis La Goutte -Date: Mon Dec 23 18:54:27 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 - - USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 - - USB: Decode the rest of Linux header - - svn path=/trunk/; revision=54400 - -commit 1b5ebb1 -Author: Alexis La Goutte -Date: Mon Dec 23 18:54:09 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 - - USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 - - Bluetooth: HCI_USB seems to be compatible with AMP Controllers - - svn path=/trunk/; revision=54399 - -commit 21eb60d -Author: Alexis La Goutte -Date: Mon Dec 23 18:12:16 2013 +0000 - - Fix compilation after last change in packet-pdcp-lte (about unused parameter) - - svn path=/trunk/; revision=54398 - -commit 0ce7d17 -Author: Alexis La Goutte -Date: Mon Dec 23 18:12:04 2013 +0000 - - Make Buildbot Happy - - Fix : ./wslua_proto.c:1261:1: error: 'ProtoField_systemid' defined but not used [-Werror=unused-function] - - svn path=/trunk/; revision=54397 - -commit 37ec878 -Author: Jakub Zawadzki -Date: Mon Dec 23 18:07:28 2013 +0000 - - mp2t: rework dissecting adaptation field - - - move dissecting adaptation field length to dissect_mp2t_adaptation_field() - - return offset, not delta. - - svn path=/trunk/; revision=54396 - -commit 8c87099 -Author: Jakub Zawadzki -Date: Mon Dec 23 18:06:33 2013 +0000 - - mp2t: avoid calling get_mp2t_conversation_data() - - svn path=/trunk/; revision=54395 - -commit bcd2ecf -Author: Michael Mann -Date: Mon Dec 23 17:57:57 2013 +0000 - - Add FT_SYSTEM_ID for type checking - - svn path=/trunk/; revision=54394 - -commit 68e0469 -Author: Bill Meier -Date: Mon Dec 23 17:20:07 2013 +0000 - - Use G_GINT64_CONSTANT(nnn) instead of nnnul in a few places; - Add a few casts to time_t; - Do a few whitespace tweaks (indentation, trailing, etc) - - svn path=/trunk/; revision=54393 - -commit 460d57c -Author: Jeff Morriss -Date: Mon Dec 23 17:01:37 2013 +0000 - - Fix up casing and code formatting in the UDP Decode-As code. - - svn path=/trunk/; revision=54392 - -commit b20e6a2 -Author: Jeff Morriss -Date: Mon Dec 23 16:50:25 2013 +0000 - - Make the SCTP Decode-As dialog more consistent with the TCP one. - Rename the 2nd SCTP Transport tab to "SCTP(PPID)" to make it obvious what it - is. - - Fix up casing and code formatting in both SCTP and TCP Decode-As code. - - svn path=/trunk/; revision=54391 - -commit 9e8306c -Author: Bill Meier -Date: Mon Dec 23 16:47:10 2013 +0000 - - Back out inadvertant change introduced in SVN #54340 - to use GTK2 when building Windows Wireshark. - - svn path=/trunk/; revision=54390 - -commit bc7c39e -Author: Alexis La Goutte -Date: Mon Dec 23 15:58:26 2013 +0000 - - Make buildbot Happy - - error: unused parameter 'allow_partial_value' - - svn path=/trunk/; revision=54389 - -commit 7479af5 -Author: Martin Mathieson -Date: Mon Dec 23 15:56:40 2013 +0000 - - Add #if 0'd code to calculate CMAC digest, which isn't supported in windows build of libgcrypt currently getched by 'setup'. - - svn path=/trunk/; revision=54388 - -commit 8ab9c55 -Author: Bill Meier -Date: Mon Dec 23 15:53:13 2013 +0000 - - From Ville Skyttä: Spelling Fixes - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591 - - - svn path=/trunk/; revision=54387 - -commit eecbfd1 -Author: Bill Meier -Date: Mon Dec 23 15:35:07 2013 +0000 - - Reove _U_ from some function parameters ... - - svn path=/trunk/; revision=54386 - -commit f687bd1 -Author: Martin Mathieson -Date: Mon Dec 23 15:25:05 2013 +0000 - - Change types to try to avoid warnings. - - svn path=/trunk/; revision=54385 - -commit 00048cf -Author: Evan Huus -Date: Mon Dec 23 15:19:25 2013 +0000 - - Add GPLv2+ license header to headers-check.c as per private email from the - author. - - svn path=/trunk/; revision=54384 - -commit 7ec4582 -Author: Michael Mann -Date: Mon Dec 23 15:18:48 2013 +0000 - - Add FT_SYSTEM_ID type and convert the dissectors that use print_system_id with FT_BYTES to now use FT_SYSTEM_ID type. - - svn path=/trunk/; revision=54383 - -commit 5b8f078 -Author: Martin Mathieson -Date: Mon Dec 23 13:53:56 2013 +0000 - - Remove printf() call - - svn path=/trunk/; revision=54382 - -commit 5742802 -Author: Alexis La Goutte -Date: Mon Dec 23 13:45:07 2013 +0000 - - From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9551 - - Dissect SCSI XCOPY and RECEIVE COPY Parameters commands - - From me : - Fix encoding-args - Fix trailing whitespace - - svn path=/trunk/; revision=54381 - -commit 9d688a9 -Author: Martin Mathieson -Date: Mon Dec 23 13:43:13 2013 +0000 - - Call function and compare result with parsed mac-i. Now just need to do EIA2(AES) calculation - - svn path=/trunk/; revision=54380 - -commit e8e3f10 -Author: Stig Bjørlykke -Date: Mon Dec 23 12:19:16 2013 +0000 - - Removed a wrong sanity check in ByteArray base64_decode. - - svn path=/trunk/; revision=54379 - -commit 27409e8 -Author: Martin Mathieson -Date: Mon Dec 23 11:38:38 2013 +0000 - - Use preference variable that wasn't used yet to pacify buildbot - - svn path=/trunk/; revision=54378 - -commit 2f2b05a -Author: Martin Mathieson -Date: Mon Dec 23 10:56:51 2013 +0000 - - Starting to get ready for integrity checking - - svn path=/trunk/; revision=54377 - -commit 0566944 -Author: Martin Kaiser -Date: Mon Dec 23 09:42:10 2013 +0000 - - correct http2 detection - - check the input tvb's length before doing tvb_get_guint8(tvb,2) - reject a short packet, don't throw an exception - - svn path=/trunk/; revision=54376 - -commit eb3ff13 -Author: Guy Harris -Date: Mon Dec 23 02:19:27 2013 +0000 - - Fix warning. - - svn path=/trunk/; revision=54375 - -commit 8a5d226 -Author: Guy Harris -Date: Mon Dec 23 01:25:20 2013 +0000 - - Fix the offset constant in SURROGATE_VALUE(), and add rather than OR it. - - Expand a bunch of comments, discussing what various routines do and - should perhaps do. - - Pull the core of tvb_get_ucs_2_string()/tvb_get_ucs_2_stringz() and - tvb_get_ucs_4_string()/tvb_get_ucs_4_stringz() into common routines, as - we did for tvb_get_utf_16_string()/tvb_get_utf_16_stringz(). - - svn path=/trunk/; revision=54374 - -commit 0ab7d56 -Author: Michael Mann -Date: Mon Dec 23 01:16:00 2013 +0000 - - Make (most) fields within packet-osi-options.c filterable. - - Not sure how to handle the filter names. Even though OSI isn't a "protocol", there's enough commonality to justify a "dissector". Also not sure if packet-osi-options.c should just be merged with packet-osi.c to make the relationship more obvious (both files aren't that big) - - svn path=/trunk/; revision=54373 - -commit df25b7a -Author: Stig Bjørlykke -Date: Sun Dec 22 22:19:41 2013 +0000 - - Improved out-of-bounds check in TvbRange ustringz and le_ustringz. - - This functions should probably be marked as obsoleted now that we - have support for encoding in stringz. - - svn path=/trunk/; revision=54372 - -commit 8a4f419 -Author: Stig Bjørlykke -Date: Sun Dec 22 22:09:06 2013 +0000 - - Made TvbRange strsize take an optional encoding argument. - - svn path=/trunk/; revision=54371 - -commit 9de6aa8 -Author: Pascal Quantin -Date: Sun Dec 22 21:16:31 2013 +0000 - - From Fabrice Bellard: - Add Carrier Id and detailed PHY info to MAC LTE UDP framing dissector - - svn path=/trunk/; revision=54370 - -commit 18f68ca -Author: Pascal Quantin -Date: Sun Dec 22 20:12:31 2013 +0000 - - Try to pacify buildbots - - svn path=/trunk/; revision=54369 - -commit ee0ea80 -Author: Pascal Quantin -Date: Sun Dec 22 19:26:58 2013 +0000 - - Fix dissection of GSM SMS PDU - - svn path=/trunk/; revision=54368 - -commit 89786cc -Author: Michael Mann -Date: Sun Dec 22 18:18:12 2013 +0000 - - Overhaul the ISIS dissectors - - 1. Make real dissectors and call dissector_try_uint_new for each "isis.type" - 2. Use make_register script for dissector initialization - 3. Replace isis_dissect_unknown() with real expert info - 4. Use convert_proto_tree_add_text.pl to make many more filterable items and gets some files off of the checkAPIs.pl naughty list. - 5. Remove (now unnecessary) dissector specific header files - 6. Do some reordering of functions to eliminate the need for function declarations. - - Additional whitespace formatting and modelines should probably be applied to all of these dissectors. - - Used capture files from bug 5354 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5354) and bug 1792 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1792) for fuzztesting. - - svn path=/trunk/; revision=54367 - -commit 302a4cf -Author: Pascal Quantin -Date: Sun Dec 22 17:27:53 2013 +0000 - - Fix copy/paste error - - svn path=/trunk/; revision=54366 - -commit 3fba8ea -Author: Pascal Quantin -Date: Sun Dec 22 16:27:21 2013 +0000 - - proto_tree_add_text -> proto_tree_add_item - - svn path=/trunk/; revision=54365 - -commit e348c13 -Author: Bill Meier -Date: Sun Dec 22 15:47:17 2013 +0000 - - (Trivial) - - Minor whitespace changes; - - Fix a typo; - - Add editor modelines to tnbuff_subset.c - - svn path=/trunk/; revision=54364 - -commit 523abb7 -Author: Bill Meier -Date: Sun Dec 22 15:31:42 2013 +0000 - - 'L' constant modifier not needed. - - svn path=/trunk/; revision=54362 - -commit e73a97a -Author: Bill Meier -Date: Sun Dec 22 15:22:49 2013 +0000 - - Constant modifier 'L' not needed; - Remove unneeded #includes; - Change several tabs to spaces; - Add editor modelines. - - svn path=/trunk/; revision=54361 - -commit 95379b9 -Author: Gerald Combs -Date: Sun Dec 22 15:03:44 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-12-22] - - svn path=/trunk/; revision=54359 - -commit c00f877 -Author: Bill Meier -Date: Sun Dec 22 14:47:16 2013 +0000 - - Don't use 'L' as a constant modifier. - - svn path=/trunk/; revision=54358 - -commit 400a1fc -Author: Bill Meier -Date: Sun Dec 22 14:43:35 2013 +0000 - - Use G_GINT64_CONSTANT(n) rather than 'nLL' when defining constants; - Fix a typo in a comment. - - svn path=/trunk/; revision=54357 - -commit a48a5a1 -Author: Stig Bjørlykke -Date: Sun Dec 22 13:08:39 2013 +0000 - - Made TvbRange string and stringz take an optional encoding argument, and - removed the yet-another-string-function string_enc and stringz_enc. - - Documented the encoding argument. - - svn path=/trunk/; revision=54356 - -commit a1c84e0 -Author: Guy Harris -Date: Sun Dec 22 11:15:35 2013 +0000 - - Get rid of a set-but-unused variable. - - svn path=/trunk/; revision=54355 - -commit 51ea411 -Author: Jakub Zawadzki -Date: Sun Dec 22 10:52:29 2013 +0000 - - Move expert value_string body to expert.c (from expert.h) - - svn path=/trunk/; revision=54354 - -commit 1f88687 -Author: Jakub Zawadzki -Date: Sun Dec 22 10:45:22 2013 +0000 - - tvb_get_ucs_4_string: increase offset by 4 - - copy&paste of tvb_get_ucs_2_string? - - svn path=/trunk/; revision=54353 - -commit 0f8572c -Author: Jakub Zawadzki -Date: Sun Dec 22 10:41:27 2013 +0000 - - Avoid including definition of column_info structure in dissectors. - - Move COL_* enum to - - XXX Later we can rename epan/column-info.h to column-int.h (or smth like this) - - svn path=/trunk/; revision=54352 - -commit fc7a771 -Author: Guy Harris -Date: Sun Dec 22 08:45:57 2013 +0000 - - Add UCS-4 support, and use it. - - Shuffle the character ENC_ values around a bit, keeping the Unicode - encodings together, moving the Windows code pages (only one for now) - after the ISO 8859 encodings, and putting "I can't believe it's not - ASCII!" at the end. - - Fix some comment typoes, and update another comment, while we're at it. - - svn path=/trunk/; revision=54351 - -commit 5084f58 -Author: Guy Harris -Date: Sun Dec 22 02:12:32 2013 +0000 - - We support ENC_UCS_2, so use that in proto_tree_add_item() and - tvb_get_string_enc() rather than using iconv to convert it to UTF-8. - - svn path=/trunk/; revision=54350 - -commit f9cce15 -Author: Jörg Mayer -Date: Sun Dec 22 01:29:21 2013 +0000 - - Generated stuff does not belong into the source tree - - svn path=/trunk/; revision=54349 - -commit 6d17d3c -Author: Jörg Mayer -Date: Sun Dec 22 01:21:56 2013 +0000 - - Beginnings of doxygen support. - Currently the doxygen.cfg files are not designed for - out-of-tree builds - that needs to be fixed first. - - svn path=/trunk/; revision=54348 - -commit 48504bc -Author: Guy Harris -Date: Sat Dec 21 22:12:46 2013 +0000 - - Oops, added the "unknown header version" expert info to the wrong item. - - svn path=/trunk/; revision=54347 - -commit 50d9d2f -Author: Guy Harris -Date: Sat Dec 21 22:10:49 2013 +0000 - - Support all the DVB ISO 8859-x encodings, now that we have ENC_ values - for all of them. - - svn path=/trunk/; revision=54346 - -commit 80ad152 -Author: Jörg Mayer -Date: Sat Dec 21 22:05:42 2013 +0000 - - Fix for - - /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-peekremote.c: In function ‘dissect_peekremote_new’: - /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-peekremote.c:210:15: error: variable ‘ti_header_version’ set but not used [-Werror=unused-but-set-variable] - proto_item *ti_header_version, *ti_header_size; - ^ - cc1: all warnings being treated as errors - - - svn path=/trunk/; revision=54345 - -commit f231a27 -Author: Guy Harris -Date: Sat Dec 21 21:55:46 2013 +0000 - - Add the rest of ISO-8859-n, thanks to Jakub's "generate a mapping table" - program. - - Put the character-encoding cases in order. - - svn path=/trunk/; revision=54344 - -commit 026fae3 -Author: Bill Meier -Date: Sat Dec 21 21:42:18 2013 +0000 - - Don't use 'L' as a constant modifier. - - svn path=/trunk/; revision=54343 - -commit ad0c90e -Author: Bill Meier -Date: Sat Dec 21 21:02:41 2013 +0000 - - Use G_GINT64_CONSTANT(-1) instead of -1L. - - svn path=/trunk/; revision=54342 - -commit aba3b9a -Author: Guy Harris -Date: Sat Dec 21 20:54:26 2013 +0000 - - Dissect some more fields in the legacy (20-byte) header, as per the - screenshot in bug 9586. - - First cut at dissecting the 802.11n (55-byte) header, as per the other - screenshot in that bug. - - Update Protocol column to match the new name we gave the protocol. - - Still waiting for a new-header capture to test with.... - - svn path=/trunk/; revision=54341 - -commit 7d5a52f -Author: Bill Meier -Date: Sat Dec 21 19:12:04 2013 +0000 - - Add a comment as to a required change to CFLAGS - if Wireshark is ever to be built with Gtk >= 3.10. - - svn path=/trunk/; revision=54340 - -commit 2e20f89 -Author: Jakub Zawadzki -Date: Sat Dec 21 18:40:20 2013 +0000 - - Argh, fix include. - - I start thinking about compiling (read: installing) Qt... - - svn path=/trunk/; revision=54339 - -commit c40e1dc -Author: Jakub Zawadzki -Date: Sat Dec 21 18:19:07 2013 +0000 - - fix warnings. - - svn path=/trunk/; revision=54338 - -commit 6ec4ba5 -Author: Bill Meier -Date: Sat Dec 21 18:16:07 2013 +0000 - - If Gtk >= 3.10, allow use of deprecated Gtk features (and prevent 'deprecated' warnings); - - Given that Wireshark is moving to QT, the Wireshark changes required to - fix the features deprecated in Gtk 3.10 will not be done. - - svn path=/trunk/; revision=54337 - -commit 58289a8 -Author: Jakub Zawadzki -Date: Sat Dec 21 18:00:00 2013 +0000 - - missing include - - svn path=/trunk/; revision=54336 - -commit c442c1b -Author: Jakub Zawadzki -Date: Sat Dec 21 17:37:37 2013 +0000 - - Fix buildbot: ./wslua_util.c:102: warning: implicit declaration of function 'rel_time_to_ep_str' - - svn path=/trunk/; revision=54335 - -commit 4cf7cdd -Author: Jakub Zawadzki -Date: Sat Dec 21 17:34:41 2013 +0000 - - fix some warnings. - - svn path=/trunk/; revision=54334 - -commit 4f6f488 -Author: Jakub Zawadzki -Date: Sat Dec 21 17:24:19 2013 +0000 - - Avoid including in dissectors - - svn path=/trunk/; revision=54333 - -commit deb2b23 -Author: Jakub Zawadzki -Date: Sat Dec 21 17:23:17 2013 +0000 - - Add missing includes - - svn path=/trunk/; revision=54332 - -commit 1fbc610 -Author: Jakub Zawadzki -Date: Sat Dec 21 16:22:44 2013 +0000 - - include header file. - - svn path=/trunk/; revision=54331 - -commit 3d6fdc5 -Author: Jakub Zawadzki -Date: Sat Dec 21 16:16:56 2013 +0000 - - New functions: str_to_ip6(), str_to_ip() - - This way we can avoid including lot of system header files in some dissectors - and it might fix bug #9581 - - svn path=/trunk/; revision=54330 - -commit aa4b08e -Author: Jakub Zawadzki -Date: Sat Dec 21 15:25:06 2013 +0000 - - ui/gtk/follow_stream.c was using isprint.h hack, change all isprint() - - svn path=/trunk/; revision=54329 - -commit 33ef0c2 -Author: Jakub Zawadzki -Date: Sat Dec 21 15:12:11 2013 +0000 - - isascii(x) && isprint(x) -> g_ascii_isprint(x) - - svn path=/trunk/; revision=54328 - -commit 746ee39 -Author: Jakub Zawadzki -Date: Sat Dec 21 15:01:45 2013 +0000 - - Drop isprint.h use g_ascii_isprint() when this include hack was enabled. - - svn path=/trunk/; revision=54327 - -commit be733f3 -Author: Jakub Zawadzki -Date: Sat Dec 21 14:38:51 2013 +0000 - - Move epan/base64.[ch] to wsutil/ with function name change. - - svn path=/trunk/; revision=54326 - -commit 576c7ea -Author: Jakub Zawadzki -Date: Sat Dec 21 14:33:54 2013 +0000 - - Move base64_to_tvb() to tvbuff_base64.c - - svn path=/trunk/; revision=54325 - -commit 3778699 -Author: Jakub Zawadzki -Date: Sat Dec 21 11:44:31 2013 +0000 - - Commit sample program to generate charsets.c tables using iconv() - - For now only single-byte, and it must be possible to encode whole charset as UCS-2 - - svn path=/trunk/; revision=54324 - -commit 0d479ec -Author: Jörg Mayer -Date: Sat Dec 21 09:43:02 2013 +0000 - - make it possible to compile the sample dissector. - Fix one trivial error found. - Add a missing forward declaration. - - svn path=/trunk/; revision=54323 - -commit 81fb51a -Author: Jörg Mayer -Date: Sat Dec 21 03:04:27 2013 +0000 - - Fix compilation without HAVE_HFI_SECTION_INIT defined. - - svn path=/trunk/; revision=54322 - -commit 9591364 -Author: Guy Harris -Date: Sat Dec 21 01:52:18 2013 +0000 - - Update documentation to reflect the non-existence of - proto_tree_add_unicode_string(). - - svn path=/trunk/; revision=54321 - -commit ab9aa3c -Author: Guy Harris -Date: Sat Dec 21 01:50:55 2013 +0000 - - Update documentation to reflect removal of tvb_get_unicode_string*, full - support for (correct) UTF-16, and new string encodings. - - svn path=/trunk/; revision=54320 - -commit 2af870c -Author: Jörg Mayer -Date: Sat Dec 21 01:50:54 2013 +0000 - - Convert to NEW_PROTO_TREE_API - - svn path=/trunk/; revision=54319 - -commit 92f177e -Author: Guy Harris -Date: Sat Dec 21 01:42:41 2013 +0000 - - Get rid of tvb_get_unicode_string() and tvb_get_unicode_stringz(); - instead, have static routines to get UCS-2 (no surrogate pairs) and - UTF-16 (with surrogate pairs) strings, with the routines to handle - UTF-16 actually handling surrogate pairs. - - Update some out-of-date comments while we're at it. - - svn path=/trunk/; revision=54318 - -commit 296a286 -Author: Jörg Mayer -Date: Sat Dec 21 00:20:12 2013 +0000 - - unknown5 is probably the speed in 500kHz - - svn path=/trunk/; revision=54317 - -commit fa7471a -Author: Jörg Mayer -Date: Fri Dec 20 23:48:03 2013 +0000 - - Try to guess some more values looking at the decoded values from - a (version 2) screenshot - - svn path=/trunk/; revision=54316 - -commit 90858e3 -Author: Jakub Zawadzki -Date: Fri Dec 20 23:25:36 2013 +0000 - - Avoid including in dissectors. - - svn path=/trunk/; revision=54315 - -commit 064082e -Author: Jakub Zawadzki -Date: Fri Dec 20 22:39:32 2013 +0000 - - Change G_GINT64_CONSTANT(xxxxU) to G_GUINT64_CONSTANT(xxxx) - - svn path=/trunk/; revision=54314 - -commit 90c8f5d -Author: Jakub Zawadzki -Date: Fri Dec 20 22:32:11 2013 +0000 - - Copy Evan r54250 changes to asn/ - - Rename more to_str functions to have ep_ in the name if they return ephemeral buffers. - - svn path=/trunk/; revision=54313 - -commit 4ca4794 -Author: Jörg Mayer -Date: Fri Dec 20 21:41:54 2013 +0000 - - unknown2/3 -> capturelen1/2 - - NEWS got updated - - svn path=/trunk/; revision=54312 - -commit ae97f5d -Author: Stig Bjørlykke -Date: Fri Dec 20 21:15:04 2013 +0000 - - Improved the valuestring documentation. - - svn path=/trunk/; revision=54311 - -commit 0f86a86 -Author: Guy Harris -Date: Fri Dec 20 20:29:27 2013 +0000 - - Add new string_enc and stringz_enc methods that take an encoding value - as an argument, just as the add_packet_field method for a tree does. - - Use tvb_get_string_enc() and tvb_get_stringz_enc() rather than - tvb_get_string(), tvb_get_stringz(), tvb_get_unicode_string(), and - tvb_get_unicode_stringz(). Treat "ustring" as meaning "UTF-16-encoded - Unicode string" rather than "UCS-2-encoded subset-of-Unicode string". - - svn path=/trunk/; revision=54310 - -commit 7838ead -Author: Bill Meier -Date: Fri Dec 20 16:57:02 2013 +0000 - - - Change guint32 array initializer constants to use 'U' rather than 'L' - (not that it actally makes any difference); - - Change 'guint crc32_0AA725CF_reverse[]' to 'guint32 ...' - (no actual difference); - - Fix some indentation; - - Add editor modelines. - - svn path=/trunk/; revision=54309 - -commit 6a0b02c -Author: Bill Meier -Date: Fri Dec 20 16:42:06 2013 +0000 - - 'guint32 crc_c[256]' array initializer constants should be unsigned 32bit; Replace 'L' by 'U'. - (not that it makes any difference in this case). - - (I note that in https://tools.ietf.org/id/draft-ietf-tsvwg-sctpcsum-01.txt - the definition was 'unsigned long crc_c[256] = {0x...L, ...} presumably from - the days when LP32 was still in use. - - - - svn path=/trunk/; revision=54308 - -commit dcd669e -Author: Bill Meier -Date: Fri Dec 20 16:25:37 2013 +0000 - - #if 0 a group of unused #defines; - Remove some trailing whitespace; - Add editor modelines. - - svn path=/trunk/; revision=54307 - -commit ffb3264 -Author: Bill Meier -Date: Fri Dec 20 16:03:24 2013 +0000 - - #if 0 some unused #defines. - - svn path=/trunk/; revision=54306 - -commit bf9f19e -Author: Bill Meier -Date: Fri Dec 20 15:55:40 2013 +0000 - - #if 0 some unused #defines; - Add editor modelines. - - svn path=/trunk/; revision=54305 - -commit ccdb11e -Author: Bill Meier -Date: Fri Dec 20 15:34:05 2013 +0000 - - nnn'ULL' ==> G_GUINT64_CONSTANT(nnn) - - - svn path=/trunk/; revision=54304 - -commit 82112c8 -Author: Evan Huus -Date: Fri Dec 20 15:14:52 2013 +0000 - - The payload of a compressed Kafka message is supposed to be itself a - message-set, so dissect it as such. I don't have a capture demonstrating this - at the moment, but it ought to work. - - svn path=/trunk/; revision=54303 - -commit 1feb5f0 -Author: Evan Huus -Date: Fri Dec 20 15:03:08 2013 +0000 - - Simplify dissect_kafka_metadata_request() to not add an unnecessary tree and - match the rest of the protocol dissection in style. - - svn path=/trunk/; revision=54301 - -commit 73f1356 -Author: Martin Kaiser -Date: Fri Dec 20 15:02:23 2013 +0000 - - use small negative values for the error defines - (such constants are signed ints by default) - - svn path=/trunk/; revision=54300 - -commit 0f59960 -Author: Martin Kaiser -Date: Fri Dec 20 15:00:26 2013 +0000 - - we can display UTF-8 encoded ISO 10646 BMP without any mapping - - svn path=/trunk/; revision=54299 - -commit d8fd9f7 -Author: Martin Kaiser -Date: Fri Dec 20 14:59:34 2013 +0000 - - add Asian DVB-SI character tables - minor whitespace changes - - svn path=/trunk/; revision=54298 - -commit cf3276b -Author: Martin Kaiser -Date: Fri Dec 20 14:58:43 2013 +0000 - - simplify the defines for DVB chartables - there's no need for their values to match the values in the DVB-SI spec - we can summarize basic and extended table definitions - - svn path=/trunk/; revision=54297 - -commit c384243 -Author: Evan Huus -Date: Fri Dec 20 14:45:24 2013 +0000 - - Replace one more g_memmove with memmove, add a cast to make the Lua stuff - compile. - - svn path=/trunk/; revision=54296 - -commit 9fba5a7 -Author: Evan Huus -Date: Fri Dec 20 14:35:34 2013 +0000 - - g_memmove has been removed in favour of normal memmove in the latest glib - versions, so do the same. Plain old memmove appears to be specified in C90, so - I'm not sure why they ever needed a compat function in the first place... - - svn path=/trunk/; revision=54295 - -commit c3de9c6 -Author: Jeff Morriss -Date: Fri Dec 20 14:28:16 2013 +0000 - - As pointed out in http://ask.wireshark.org/questions/28304/questions-on-packet-kafkac : - - ett_kafka_metadata_topics is defined (and registered) but not used. Use it. - - svn path=/trunk/; revision=54294 - -commit de2bcb2 -Author: Stig Bjørlykke -Date: Fri Dec 20 13:38:36 2013 +0000 - - Build correct base table in init.lua after changes in epan/proto.h - - svn path=/trunk/; revision=54293 - -commit db3c476 -Author: Stig Bjørlykke -Date: Fri Dec 20 13:33:48 2013 +0000 - - Rewrote ProtoField_new to: - - Allow both string and integer for type and base (improve usability). - - Check valid base and mask for different types (avoid crashes). - - Remove ftypes.PROTOCOL from valid types. - - This should fix bug #9549. - - svn path=/trunk/; revision=54292 - -commit fe98b8e -Author: Martin Kaiser -Date: Fri Dec 20 13:23:13 2013 +0000 - - use STR_ASCII instead of BASE_NONE for strings - - svn path=/trunk/; revision=54291 - -commit 217f710 -Author: Martin Kaiser -Date: Fri Dec 20 13:17:24 2013 +0000 - - don't assert if an FT_BYTES entry is empty - - svn path=/trunk/; revision=54290 - -commit 198ce0b -Author: Guy Harris -Date: Fri Dec 20 10:30:57 2013 +0000 - - Fix indentation. - - svn path=/trunk/; revision=54289 - -commit 1cf2e46 -Author: Guy Harris -Date: Fri Dec 20 10:08:35 2013 +0000 - - bytes_to_hexstr_punct() does not add a null terminator, so we must add - it ourselves. - - svn path=/trunk/; revision=54288 - -commit 2548f6e -Author: Stig Bjørlykke -Date: Fri Dec 20 09:04:12 2013 +0000 - - Strip leading spaces in unknown-extension value. - - svn path=/trunk/; revision=54287 - -commit f53f205 -Author: Martin Kaiser -Date: Fri Dec 20 08:57:17 2013 +0000 - - fix - - CC packet-ecatmb.lo - packet-ecatmb.c: In function 'dissect_ecat_mailbox': - packet-ecatmb.c:877:64: error: 'info.anSdoInfoUnion.Entry.ValueInfo' may be used uninitialized in this function [-Werror=uninitialized] - packet-ecatmb.c:796:38: note: 'info.anSdoInfoUnion.Entry.ValueInfo' was declared here - packet-ecatmb.c:884:34: error: 'info.anSdoInfoUnion.Entry.Res.BitLen' may be used uninitialized in this function [-Werror=uninitialized] - packet-ecatmb.c:796:38: note: 'info.anSdoInfoUnion.Entry.Res.BitLen' was declared here - - - svn path=/trunk/; revision=54286 - -commit f48dde1 -Author: Pascal Quantin -Date: Fri Dec 20 08:33:18 2013 +0000 - - Fix a "'str' may be used uninitialized in this function" error - - svn path=/trunk/; revision=54285 - -commit 852d93a -Author: Martin Kaiser -Date: Fri Dec 20 07:57:02 2013 +0000 - - comment out unused function - - svn path=/trunk/; revision=54284 - -commit 1170be1 -Author: Martin Kaiser -Date: Fri Dec 20 07:56:38 2013 +0000 - - fix compilation without libgcrypt - - svn path=/trunk/; revision=54283 - -commit f390e38 -Author: Pascal Quantin -Date: Fri Dec 20 06:55:56 2013 +0000 - - Fix time dissection broken in r54274 - - svn path=/trunk/; revision=54282 - -commit 350a207 -Author: Anders Broman -Date: Fri Dec 20 06:50:46 2013 +0000 - - Try to please the buildbot. - - svn path=/trunk/; revision=54281 - -commit 5fbfa6c -Author: Anders Broman -Date: Fri Dec 20 06:30:13 2013 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54280 - -commit f4ef031 -Author: Michael Mann -Date: Fri Dec 20 02:13:02 2013 +0000 - - Make more items filterable courtesy of convert_proto_tree_add_text.pl - - svn path=/trunk/; revision=54279 - -commit 56fa846 -Author: Pascal Quantin -Date: Thu Dec 19 22:55:16 2013 +0000 - - Try to please Clang-Code-Analysis buildbot - - svn path=/trunk/; revision=54278 - -commit 6af6cd7 -Author: Pascal Quantin -Date: Thu Dec 19 22:40:49 2013 +0000 - - Add out-of-band send_preamble event to UDP framing protocol - - svn path=/trunk/; revision=54277 - -commit 704f759 -Author: Michael Mann -Date: Thu Dec 19 22:18:30 2013 +0000 - - Makes "slot" filterable to pacify checkAPIs.pl - - svn path=/trunk/; revision=54276 - -commit 1e29ff6 -Author: Michael Mann -Date: Thu Dec 19 22:05:07 2013 +0000 - - proto_tree_add_text -> proto_tree_add_string to satisfy checkAPIs.pl - - svn path=/trunk/; revision=54275 - -commit 959a290 -Author: Michael Mann -Date: Thu Dec 19 21:51:09 2013 +0000 - - proto_tree_add_text -> proto_tree_add_xxx conversion. - - svn path=/trunk/; revision=54274 - -commit d66bffb -Author: Pascal Quantin -Date: Thu Dec 19 21:40:38 2013 +0000 - - Add System Frame Number to UDP framing protocol and display it in info column - - svn path=/trunk/; revision=54272 - -commit 6be3781 -Author: Evan Huus -Date: Thu Dec 19 20:53:44 2013 +0000 - - Add bytestring_to_str() which takes a wmem scope and is otherwise identical to - bytestring_to_ep_str (now deprecated). Use the new one in a few obvious places. - - Also just print directly to the buffer when loading ethernet addresses for - resolution. The straight-to-buffer bytes_to_hexstr seems useful, maybe it - shouldn't be in a private header... - - svn path=/trunk/; revision=54270 - -commit 1ed5971 -Author: Bill Meier -Date: Thu Dec 19 20:52:56 2013 +0000 - - Remove 'L' and 'LL' from constants; they are all used as 32-bit quantities. - #if 0 an unsed constant definition. - - svn path=/trunk/; revision=54269 - -commit bc301c4 -Author: Bill Meier -Date: Thu Dec 19 20:34:13 2013 +0000 - - Add XXX comment as follows: - /* XXX: GINT_MAX is not defined so #if ... will always be false */ - #if (GINT_MAX >= (1LL << 32)) - ... - #endif - - Remove _U_ on several function parameters. - - Do some very minor whitespace changes; - Add editor modelines. - - - svn path=/trunk/; revision=54268 - -commit 82d0e1f -Author: Gerald Combs -Date: Thu Dec 19 20:16:31 2013 +0000 - - Another try at marking the ws_sign_ext functions possibly-unused. - - svn path=/trunk/; revision=54267 - -commit e2c5575 -Author: Bill Meier -Date: Thu Dec 19 19:29:44 2013 +0000 - - Cast result of strtol() to guint32; - - svn path=/trunk/; revision=54266 - -commit 67ceb46 -Author: Gerald Combs -Date: Thu Dec 19 19:12:25 2013 +0000 - - Try to fix a warning found by, but not related to, the ABI check. - - svn path=/trunk/; revision=54265 - -commit 771dc84 -Author: Pascal Quantin -Date: Thu Dec 19 18:58:31 2013 +0000 - - Update file forgotten in r54250 - - svn path=/trunk/; revision=54264 - -commit 3dc77ce -Author: Chris Maynard -Date: Thu Dec 19 17:48:58 2013 +0000 - - Need to call ptvcursor_current_offset() BEFORE ptvcursor_free(). - - svn path=/trunk/; revision=54257 - -commit 4509ef2 -Author: Martin Mathieson -Date: Thu Dec 19 17:48:32 2013 +0000 - - Change types and add cast to try to please buildbot - - svn path=/trunk/; revision=54256 - -commit 725d85f -Author: Chris Maynard -Date: Thu Dec 19 17:48:11 2013 +0000 - - Fix leaks where ptvcursor_free() wasn't being called. - - svn path=/trunk/; revision=54255 - -commit f756c9b -Author: Chris Maynard -Date: Thu Dec 19 17:46:59 2013 +0000 - - Since we're always calling ptvcursor_new() now, always call ptvcursor_free(). - - svn path=/trunk/; revision=54254 - -commit 62393a6 -Author: Martin Mathieson -Date: Thu Dec 19 17:21:36 2013 +0000 - - Cope with spaces or dashes in security keys - - svn path=/trunk/; revision=54251 - -commit 2ae8edc -Author: Evan Huus -Date: Thu Dec 19 16:28:39 2013 +0000 - - Rename more to_str functions to have ep_ in the name if they return ephemeral - buffers. Remove two unused functions. - - svn path=/trunk/; revision=54250 - -commit a6415ec -Author: Evan Huus -Date: Thu Dec 19 15:49:09 2013 +0000 - - Rename a couple of to_str functions to have ep_ in the name. This makes it - obvious that the returned string is ephemeral, and opens up the original names - in the API for versions that take a wmem pool (and thus can work in any scope). - - svn path=/trunk/; revision=54249 - -commit b7ab4db -Author: Evan Huus -Date: Thu Dec 19 15:27:44 2013 +0000 - - Modelines and consistent indentation. - - svn path=/trunk/; revision=54248 - -commit 3b73e8b -Author: Stig Bjørlykke -Date: Thu Dec 19 15:26:31 2013 +0000 - - Renamed new_TvbRange to push_TvbRange and use this when creating a new - TvbRange from a FieldInfo. - - This should fix the crash in bug #9483. - - svn path=/trunk/; revision=54247 - -commit 891b237 -Author: Stig Bjørlykke -Date: Thu Dec 19 11:24:55 2013 +0000 - - Improved compressed user data handling. - - svn path=/trunk/; revision=54246 - -commit 317b828 -Author: Guy Harris -Date: Thu Dec 19 09:19:33 2013 +0000 - - Use proto_tree_add_item() or tvb_get_string_enc() instead of - tvb_get_unicode_string(). If there's an indication that the encoding is - UCS-2, use that, otherwise use UTF-16. (For example, "BMP" stands for - "Basic Multilingual Plane", which is the part of Unicode that can be - encoded in 16 bits, hence UCS-2.) - - In the description of the "Use Heuristics for UDP" preference for the - XML dissector, note that it's not just trying to recognize XML in UCS-2, - it's trying to recognize XML in *big-endian* UCS-2. - - svn path=/trunk/; revision=54245 - -commit 4a346b7 -Author: Guy Harris -Date: Thu Dec 19 03:12:59 2013 +0000 - - Use tvb_get_string_enc(), or proto_tree_add_item(), rather than - tvb_get_unicode_string() or g_iconv stuff. - - svn path=/trunk/; revision=54244 - -commit 3012901 -Author: Guy Harris -Date: Thu Dec 19 02:41:27 2013 +0000 - - Use proto_tree_add_item() in cases where we don't actually look at the - value. - - svn path=/trunk/; revision=54243 - -commit 6762f7e -Author: Jeff Morriss -Date: Thu Dec 19 02:32:21 2013 +0000 - - Some patches from Peter Harris: - - [PATCH 1/5] X11 dissector: Sort declarations - This prevents pointless changes showing up in the diff when evaluating - unrelated changes to the generator. - - See http://search.cpan.org/dist/perl-5.18.0/pod/perldelta.pod#Hash_randomization - - [PATCH 2/5] X11 dissector: Silence warnings on perl 5.18, prevent 5.20 - Perl 5.18 retroactively marked "given/when" experimental, with a - promise to remove or dramatically change it in 5.20. - - Since there is no perl 5.20 yet, there is no way to make this script - compatible with it. - - [PATCH 3/5] X11 dissector: Support variable_param (at least for glCallLists) - (This patch makes the change in r54232 unnecessary by using the previously- - unused variable.) - - [PATCH 4/5] X11 dissector: Remove obsolete TODO item - This item was done in r53531 PATCH 09/11 - - svn path=/trunk/; revision=54242 - -commit cc15202 -Author: Michael Mann -Date: Thu Dec 19 01:37:54 2013 +0000 - - Exposing a couple of more constant arrays for ANSI-637. Bug 9471 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9471) - - From Michael Lum - - svn path=/trunk/; revision=54241 - -commit 10670dc -Author: Jeff Morriss -Date: Wed Dec 18 23:45:09 2013 +0000 - - Regenerate the X11 dissector in order to pick up the change from r54232. Also update to the latest mesa (though this resulted in no changes). - - svn path=/trunk/; revision=54240 - -commit 099294d -Author: Jakub Zawadzki -Date: Wed Dec 18 23:32:06 2013 +0000 - - Add charset table for ISO/IEC 8859-9 (ENC_ISO_8859_9) - - svn path=/trunk/; revision=54239 - -commit e49da69 -Author: Jakub Zawadzki -Date: Wed Dec 18 22:25:18 2013 +0000 - - Use ws_sign_ext64() - - svn path=/trunk/; revision=54238 - -commit 424fae1 -Author: Martin Kaiser -Date: Wed Dec 18 22:15:56 2013 +0000 - - initialize info_flags, fix compile error - - svn path=/trunk/; revision=54237 - -commit f882b63 -Author: Michael Mann -Date: Wed Dec 18 22:10:59 2013 +0000 - - Some proto_tree_add_xxx functions have a '_' in the function name so make sure they get counted in the proto_tree_add_text percentage. - - Makes a few dissectors look a little better. - - svn path=/trunk/; revision=54236 - -commit 4c4af54 -Author: Guy Harris -Date: Wed Dec 18 21:36:15 2013 +0000 - - Use FT_STRING for string-valued fields. - - Have RDP_FI_STRING set for all string-valued fields, with: - - RDP_FI_UNICODE set if the string is always "Unicode" (assumed to - be UTF-16-encoded); - - RDP_FI_ANSI set if the string is always "ANSI" (we should try to - use the code page indication); - - neither set if the string is "Unicode" or "ANSI" depending on - the INFO_UNICODE flag in the packet (the only strings that work - that way are in TS_INFO_PACKET or TS_EXTENDED_INFO_PACKET - packets, which also have the flags field with INFO_UNICODE). - - Use proto_tree_add_item() to add the string items. - - While we're at it, pull the code to get conversation data, creating it - if necessary, into a routine. - - svn path=/trunk/; revision=54235 - -commit fe7e178 -Author: Alexis La Goutte -Date: Wed Dec 18 21:21:08 2013 +0000 - - Remove unneeded #include epan/dissectors/packet-scsi.h - - svn path=/trunk/; revision=54234 - -commit 3b51943 -Author: Alexis La Goutte -Date: Wed Dec 18 21:20:57 2013 +0000 - - Add extern C for stat_cmd_args (for future use in Wireshark Qt) - - svn path=/trunk/; revision=54233 - -commit 5385c2d -Author: Gerald Combs -Date: Wed Dec 18 20:53:01 2013 +0000 - - Instead of assigning a variable to itself, avoid unused warnings similar - to the Q_UNUSED macro. - - svn path=/trunk/; revision=54232 - -commit b834b2a -Author: Gerald Combs -Date: Wed Dec 18 20:38:05 2013 +0000 - - "unsigned long" is not necessarily the same as "guint". - - svn path=/trunk/; revision=54231 - -commit 0c73eb6 -Author: Chris Maynard -Date: Wed Dec 18 20:00:06 2013 +0000 - - Update the example to match the ohter plugins in wireshark.nsi. - - svn path=/trunk/; revision=54230 - -commit 3947343 -Author: Evan Huus -Date: Wed Dec 18 19:22:24 2013 +0000 - - Remove unused variable. - - svn path=/trunk/; revision=54229 - -commit 00eb735 -Author: Michael Mann -Date: Wed Dec 18 19:19:17 2013 +0000 - - Remove other_decode_bitfield_value in favor of bitmasks in hf_ entry. - Replace "home grown" APIs for string->int conversions with more standard ones. - - svn path=/trunk/; revision=54228 - -commit f0a58ef -Author: Chris Maynard -Date: Wed Dec 18 18:27:07 2013 +0000 - - Call ptvcursor_new() to initialize cursor whether tree is NULL or not. - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9578 - #BACKPORT(1.10, 1.8) - - svn path=/trunk/; revision=54227 - -commit 72e5288 -Author: Bill Meier -Date: Wed Dec 18 16:52:51 2013 +0000 - - Per user request, revert reformatting of hf[] entries done in SVN #54005. - - See wireshark-dev message thread begining at: - https://wireshark.org/lists/wireshark-dev/201312/msg00156.html - - - svn path=/trunk/; revision=54226 - -commit 8f665d9 -Author: Evan Huus -Date: Wed Dec 18 15:54:32 2013 +0000 - - Add a sixteenth element to all BCD digit sets to avoid garbage values when - decoding corrupt bytes. Some of these digit sets could probably be - deduplicated... - - svn path=/trunk/; revision=54224 - -commit 197c2ff -Author: Michael Mann -Date: Wed Dec 18 15:15:39 2013 +0000 - - CIMD Error Code Dissection. Bug 9570 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9570) - - From Vineeth - - from me - make a few of the value_strings value_string_exts - - svn path=/trunk/; revision=54223 - -commit c1ceac5 -Author: Alexis La Goutte -Date: Wed Dec 18 14:31:14 2013 +0000 - - Fix -Wunused-const-variable found by Clang - - svn path=/trunk/; revision=54222 - -commit ad531c5 -Author: Stig Bjørlykke -Date: Wed Dec 18 14:19:12 2013 +0000 - - Added Column clear_fence(). - - svn path=/trunk/; revision=54221 - -commit 80150e1 -Author: Stig Bjørlykke -Date: Wed Dec 18 14:18:45 2013 +0000 - - Added col_clear_fence(). - - svn path=/trunk/; revision=54220 - -commit 4729c08 -Author: Irene Rüngeler -Date: Wed Dec 18 13:49:10 2013 +0000 - - Add 'Filter Association' to context menu in packet list. - - svn path=/trunk/; revision=54219 - -commit 485faca -Author: Martin Mathieson -Date: Wed Dec 18 13:37:20 2013 +0000 - - Add cast to try to fix buildbot failure - - svn path=/trunk/; revision=54218 - -commit ae50f1d -Author: Martin Mathieson -Date: Wed Dec 18 13:08:57 2013 +0000 - - Fix a test to allow deciphering to happen on the first pass, and close the gcrypt handles after use. - - svn path=/trunk/; revision=54216 - -commit 52a05e6 -Author: Stig Bjørlykke -Date: Wed Dec 18 12:55:43 2013 +0000 - - Added ByteArray base64_decode(). - - svn path=/trunk/; revision=54215 - -commit aa29612 -Author: Stig Bjørlykke -Date: Wed Dec 18 12:54:18 2013 +0000 - - Added support for continuation line in content type. - - svn path=/trunk/; revision=54214 - -commit d536d5f -Author: Martin Mathieson -Date: Wed Dec 18 12:19:42 2013 +0000 - - Remove unused variables to try to unbreak MAC buildbots - - svn path=/trunk/; revision=54213 - -commit 17e31af -Author: Martin Mathieson -Date: Wed Dec 18 12:05:11 2013 +0000 - - Only convert string key once, during update uat callback - - svn path=/trunk/; revision=54212 - -commit d54801b -Author: Irene Rüngeler -Date: Wed Dec 18 09:53:25 2013 +0000 - - Fix warning because of functions defined but not used. - - svn path=/trunk/; revision=54211 - -commit d65cb2e -Author: Irene Rüngeler -Date: Wed Dec 18 08:04:01 2013 +0000 - - Ignore the first line of the chunk statistics file. - - svn path=/trunk/; revision=54210 - -commit e8b935a -Author: Anders Broman -Date: Wed Dec 18 06:51:09 2013 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54209 - -commit 7dfbe30 -Author: Jeff Morriss -Date: Wed Dec 18 02:25:53 2013 +0000 - - Translate a little leftover German to English. - - svn path=/trunk/; revision=54208 - -commit 189a800 -Author: Jeff Morriss -Date: Wed Dec 18 02:16:42 2013 +0000 - - Fix compilation when we don't HAVE_GCRYPT. - - svn path=/trunk/; revision=54207 - -commit 5c8e650 -Author: Jeff Morriss -Date: Wed Dec 18 02:08:17 2013 +0000 - - Presumably ansi_tsb58_language_ind_vals shouldn't be static (since it's listed in the header file). - - svn path=/trunk/; revision=54206 - -commit 88b9db9 -Author: Michael Mann -Date: Wed Dec 18 01:30:50 2013 +0000 - - ANSI A-interface improvements. Bug 9471 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9471) - - From Michael Lum - - svn path=/trunk/; revision=54205 - -commit 01c048b -Author: Evan Huus -Date: Tue Dec 17 23:03:27 2013 +0000 - - Add two missing BASE_EXT_STRING flags as caught by Alexis's ASAN fuzzing. - - svn path=/trunk/; revision=54204 - -commit a2bb473 -Author: Evan Huus -Date: Tue Dec 17 22:38:40 2013 +0000 - - Fix what appears to be a misuse of pointers in the LLDP dissector as caught by - Alexis's ASAN fuzzing. Pass the address of a guid on the stack, not the address - of a pointer to a guid which doesn't actually point to anything... - - svn path=/trunk/; revision=54203 - -commit ff2a584 -Author: Jakub Zawadzki -Date: Tue Dec 17 22:16:06 2013 +0000 - - sign_ext.h: use G_GINT64_CONSTANT(), add sample for alternative method of sign extension. - - Alternative method looks much nicer in dissasembly. - - svn path=/trunk/; revision=54202 - -commit e6d09c1 -Author: Anders Broman -Date: Tue Dec 17 22:07:32 2013 +0000 - - Make local functions static. Include *.h when needed. - - svn path=/trunk/; revision=54201 - -commit be09c39 -Author: Jeff Morriss -Date: Tue Dec 17 22:03:37 2013 +0000 - - Add SVN properties. - - svn path=/trunk/; revision=54200 - -commit 9628624 -Author: Guy Harris -Date: Tue Dec 17 21:51:45 2013 +0000 - - Get rid of trailing periods in some error messages for consistency; the - others don't have trailing periods, and the caller adds a period as - desired. - - svn path=/trunk/; revision=54199 - -commit c8716a4 -Author: Jakub Zawadzki -Date: Tue Dec 17 21:38:59 2013 +0000 - - Put sign_ext.h in Makefile. - - svn path=/trunk/; revision=54198 - -commit 0de43ce -Author: Jakub Zawadzki -Date: Tue Dec 17 21:36:33 2013 +0000 - - Create sign extension routines in , use it in few places. - - svn path=/trunk/; revision=54197 - -commit 6db9eb0 -Author: Michael Mann -Date: Tue Dec 17 20:06:03 2013 +0000 - - Bugfix OpenSafety "heuristics" to only consider a packet "handled" if a subdissector is called. Fixes bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572) - - Also removed tree check in Modbus dissector because dissector_try_string() is being called under it. - - #BACKPORT(1.10) - - svn path=/trunk/; revision=54193 - -commit c03bcb5 -Author: Alexis La Goutte -Date: Tue Dec 17 18:53:01 2013 +0000 - - From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8805 - - Wireshark not recognizing skinny version 19 - - Allow Wireshark to decode skinny version 19 (0x13) - Only allow, no found spec to support all feature/packet of skinny 19 - - Also fix a encoding arg - - svn path=/trunk/; revision=54189 - -commit e9946f0 -Author: Alexis La Goutte -Date: Tue Dec 17 18:43:34 2013 +0000 - - Make Ubuntu Buildbot happy - - Fix following error: - ../../../ui/qt/sctp_chunk_statistics_dialog.cpp: In member function ‘void SCTPChunkStatisticsDialog::fillTable(bool)’: - ../../../ui/qt/sctp_chunk_statistics_dialog.cpp:145:29: error: ignoring return value of ‘char* fgets(char*, int, FILE*)’, declared with attribute warn_unused_result [-Werror=unused-result] - - svn path=/trunk/; revision=54188 - -commit f1a440b -Author: Alexis La Goutte -Date: Tue Dec 17 18:43:24 2013 +0000 - - Remove trailing whitespace and add modelines - - svn path=/trunk/; revision=54187 - -commit 69ac243 -Author: Michael Mann -Date: Tue Dec 17 17:32:20 2013 +0000 - - General cleanup of ZBEE ZCL dissector. Removed unnecessary casts and wrapping functions. - - Tried to remove zcl_cluster_id global, but it's used in a function that is called by other dissectors that I'm not sure if they are expecting the zcl_cluster_id to be "saved" (or if -1 could be passed in for cluster id from those dissectors). Removed as many uses of it as possible if someone knows the dissectors better to make that call. - - svn path=/trunk/; revision=54186 - -commit 79d336c -Author: Michael Mann -Date: Tue Dec 17 16:50:33 2013 +0000 - - Handle signed integers > 32 bits. Bug 8454 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8454) - - svn path=/trunk/; revision=54183 - -commit 1b4ea6b -Author: Martin Mathieson -Date: Tue Dec 17 16:40:42 2013 +0000 - - Preferences to control whether deciphering should be done for signalling and user plane - - svn path=/trunk/; revision=54182 - -commit 87e2aa3 -Author: Bill Meier -Date: Tue Dec 17 15:02:47 2013 +0000 - - From "bd": Fix " Wireshark stops showing new packets but dumpcap keeps writing them to the temp file" - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9571 - - From me: Fixed in a slightly different manner than sugested in the patch attached to the bug. - - - - svn path=/trunk/; revision=54181 - -commit e79de98 -Author: Martin Mathieson -Date: Tue Dec 17 14:49:21 2013 +0000 - - First working version of deciphering with AES (EEA2). Lots of improvements still to make - - svn path=/trunk/; revision=54180 - -commit d319ad5 -Author: Pascal Quantin -Date: Tue Dec 17 13:31:58 2013 +0000 - - Do not modify the bytes given to proto_tree_add_uint_format_value() in case there is a mask present in hf definition. - Otherwise the bits displayed in the tree are not the right ones. - - svn path=/trunk/; revision=54179 - -commit 30447ec -Author: Evan Huus -Date: Tue Dec 17 13:21:26 2013 +0000 - - Fix preprocessor macro and indentation. - - svn path=/trunk/; revision=54178 - -commit 894d8d0 -Author: Pascal Quantin -Date: Tue Dec 17 13:11:44 2013 +0000 - - Fix a crash when calling try_val_to_str_ext() - - svn path=/trunk/; revision=54177 - -commit 3d6c71e -Author: Alexis La Goutte -Date: Tue Dec 17 13:06:11 2013 +0000 - - Fix indent (use 4 spaces) and add modelines - - svn path=/trunk/; revision=54176 - -commit 2f3a943 -Author: Pascal Quantin -Date: Tue Dec 17 11:34:45 2013 +0000 - - Fix a typo and check that handle exists before calling call_dissector() - - svn path=/trunk/; revision=54175 - -commit 0f6429c -Author: Pascal Quantin -Date: Tue Dec 17 11:28:48 2013 +0000 - - Fix the offset when dissecting a Signal reserved field - - svn path=/trunk/; revision=54174 - -commit 0db7187 -Author: Pascal Quantin -Date: Tue Dec 17 10:54:57 2013 +0000 - - Comment a useless increment - - svn path=/trunk/; revision=54173 - -commit bde542b -Author: Alexis La Goutte -Date: Tue Dec 17 10:43:08 2013 +0000 - - From Fabio Tarabelloni via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9547 - - Zbee ZCL wrong cmdID in DefaultRespons - - Default Response command generated by Specific command cluster contains wrong cmdId decoding. The value shows the cross-cluster command id but not the specific cluster command id name. - Draft of solution is already created (now is under test). The idea is to add a cmdId function callback in zbee_zcl_init_cluster in order to call it when wireshark has to decode specific cluster cmd in default response. - - svn path=/trunk/; revision=54171 - -commit 7e2353f -Author: Alexis La Goutte -Date: Tue Dec 17 10:22:00 2013 +0000 - - Make translatable ready SCTP Graph for Qt - - svn path=/trunk/; revision=54170 - -commit 7eb5057 -Author: Irene Rüngeler -Date: Tue Dec 17 09:51:34 2013 +0000 - - Find the right frame when plottable was clicked. - - svn path=/trunk/; revision=54167 - -commit 25a74d3 -Author: Irene Rüngeler -Date: Tue Dec 17 08:56:47 2013 +0000 - - Fill the chunk statistics. Read line with fgets instead of getline. - - svn path=/trunk/; revision=54166 - -commit 555b8a5 -Author: Irene Rüngeler -Date: Tue Dec 17 08:54:54 2013 +0000 - - Add the header files only once. - - svn path=/trunk/; revision=54165 - -commit a1f179c -Author: Anders Broman -Date: Tue Dec 17 06:10:41 2013 +0000 - - Make local functions static. Include *.h when needed. - - svn path=/trunk/; revision=54164 - -commit 5c08517 -Author: Martin Mathieson -Date: Mon Dec 16 23:26:09 2013 +0000 - - Intialise a variable to avoid a (bogus) warning with my version of gcc - - svn path=/trunk/; revision=54163 - -commit f9abd6f -Author: Martin Mathieson -Date: Mon Dec 16 23:21:31 2013 +0000 - - Fix compilation for when HAVE_LIBGCRYPT is not defined - - svn path=/trunk/; revision=54162 - -commit 7851e21 -Author: Guy Harris -Date: Mon Dec 16 23:08:09 2013 +0000 - - Fix compiler warnings. - - svn path=/trunk/; revision=54161 - -commit e4a880b -Author: Guy Harris -Date: Mon Dec 16 23:00:58 2013 +0000 - - Get rid of unused variable. - - svn path=/trunk/; revision=54160 - -commit 8bbff41 -Author: Guy Harris -Date: Mon Dec 16 22:43:10 2013 +0000 - - Fix typo in formatting string (%%s should be %s). - - Mark unused argument as such. - - svn path=/trunk/; revision=54159 - -commit 068008f -Author: Guy Harris -Date: Mon Dec 16 22:39:41 2013 +0000 - - Use proto_tree_add_item() in preference to fetching the string and - adding it with proto_tree_add_string(). Use tvb_get_string_enc() rather - than tvb_get_unicode_string() to fetch strings. - - We assume a UTF-16 encoding for all "Unicode" strings. - - Use tvb_strsize() and tvb_unicode_strsize() to get the lengths of - null-terminated strings. - - Get rid of unused ett_nt_unicode_string variable. - - svn path=/trunk/; revision=54158 - -commit 54c2724 -Author: Michael Mann -Date: Mon Dec 16 21:39:44 2013 +0000 - - ANSI A-interface enhancements. Bug 9471 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9471) - - From Michael Lum: - 1. Allow mobile ID and service option to be shown in the INFO line for various messages. - 2. proto_tree_add_text -> proto_tree_add_item conversions. - - From me: - 1. Even more proto_tree_add_text -> proto_tree_add_item conversions. - - svn path=/trunk/; revision=54157 - -commit 09ce0cf -Author: Bill Meier -Date: Mon Dec 16 20:38:20 2013 +0000 - - From Peter Lemenkov: - - "This patch removes misleading dereferencing operator from the - array's name. E.g. consider the following declaration: - - guint32 ipaddr[4]; - - ipaddr points to the address of an array of guint32's, while &ipaddr - points to the first' guint32 object. E.g. &ipaddr == &ipaddr[0]. The - value is the same, but has different type which is necessary - sometimes. However inet_pton treats latest argument as void*, and - this information is left anyway. So no need to bother with types and - let's just pass pointer to the array." - - https://bugs.wireshark.org/bugzilla/attachment.cgi?id=12304 - - From me: Remove dereferencing operator from 'ipaddr' in two calls to - wmem_memdup(). - - svn path=/trunk/; revision=54156 - -commit 0afeb2a -Author: Bill Meier -Date: Mon Dec 16 20:22:50 2013 +0000 - - Change editor modelines value for 'indent-tabs-mode' from 'true' to 't' - so emacs doesn't complainab 'unsafe value'. - - svn path=/trunk/; revision=54153 - -commit 94b225a -Author: Martin Mathieson -Date: Mon Dec 16 18:53:14 2013 +0000 - - Now calling function that will decipher payloads, if possible, and return a new tvb. Actual deciphering still to come... - - svn path=/trunk/; revision=54149 - -commit d2e947f -Author: Bill Meier -Date: Mon Dec 16 18:44:04 2013 +0000 - - Fix alignment issue in GTK2 flowgraph "packet choice" window. - (Issue reported by Alexis Lagoutte). - - ##Backport 1.10 - - svn path=/trunk/; revision=54148 - -commit 71b281a -Author: Martin Kaiser -Date: Mon Dec 16 16:49:37 2013 +0000 - - when the default character table is used, - don't add af hf entry with len 0 to the tree - add a text element instead - - svn path=/trunk/; revision=54145 - -commit b71335c -Author: Michael Mann -Date: Mon Dec 16 16:32:51 2013 +0000 - - Fix PGN value computation - - svn path=/trunk/; revision=54144 - -commit c1a20e5 -Author: Martin Mathieson -Date: Mon Dec 16 15:03:41 2013 +0000 - - Reorganise main dissection function to that sequence analysis is done before signalling data payload - - svn path=/trunk/; revision=54143 - -commit e78173d -Author: Martin Mathieson -Date: Mon Dec 16 11:47:04 2013 +0000 - - Look up key (now by UEId, not RNTI) and display in security tree where known. - - svn path=/trunk/; revision=54142 - -commit 74d627d -Author: Martin Mathieson -Date: Mon Dec 16 11:18:53 2013 +0000 - - Add configuration of UE keys (by RNTI). Still to show and use this info... - - svn path=/trunk/; revision=54141 - -commit a6a53d2 -Author: Martin Kaiser -Date: Mon Dec 16 10:10:29 2013 +0000 - - no need for if(tree) - - svn path=/trunk/; revision=54140 - -commit 9e5143f -Author: Martin Kaiser -Date: Mon Dec 16 10:06:09 2013 +0000 - - TABs -> spaces, add editor modelines - - svn path=/trunk/; revision=54139 - -commit a1defaa -Author: Martin Kaiser -Date: Mon Dec 16 08:20:22 2013 +0000 - - From Wesley - fix "decode as" for time protocol - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9563 - - svn path=/trunk/; revision=54138 - -commit df30bf9 -Author: Anders Broman -Date: Mon Dec 16 06:03:17 2013 +0000 - - Make local functions static. - - svn path=/trunk/; revision=54137 - -commit 2363dd4 -Author: Anders Broman -Date: Mon Dec 16 05:56:42 2013 +0000 - - Make local functions static. - - svn path=/trunk/; revision=54136 - -commit c45475a -Author: Jakub Zawadzki -Date: Sun Dec 15 23:44:12 2013 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54135 - -commit 59dddc2 -Author: Guy Harris -Date: Sun Dec 15 19:48:15 2013 +0000 - - In dissect_ndr_byte_array(), use the field index from the dcerpc_info - structure, rather than a fixed field. Get rid of that fixed field, as - it's no longer needed. - - Use dissect_ndr_byte_array() rather than dissect_ndr_char_cvstring() in - a case where we have an opaque byte array. - - Have dissect_ndr_cvstring() and dissect_ndr_vstring() - and, therefore, - routines that call them, such as dissect_ndr_cstring(), - dissect_ndr_char_cvstring(), dissect_ndr_char_vstring(), and - dissect_ndr_wchar_vstring() - require that the field being used by an - FT_STRING field. Manually fix a case where the PIDL generator makes - such a field FT_NONE rather than FT_STRING. Also handle EBCDIC, just in - case we happen to see a packet with EBCDIC strings. - - Use tvb_get_string_enc(), rather than tvb_get_unicode_string() or - tvb_get_string(), in dissect_ndr_cvstring() and dissect_ndr_vstring(). - - svn path=/trunk/; revision=54134 - -commit afc0d8a -Author: Martin Kaiser -Date: Sun Dec 15 19:19:30 2013 +0000 - - use ISO 8859-5 for DVB-SI - - svn path=/trunk/; revision=54133 - -commit a07c0ff -Author: Martin Kaiser -Date: Sun Dec 15 19:13:31 2013 +0000 - - add support for ISO 8859-5 - - svn path=/trunk/; revision=54132 - -commit 93594d6 -Author: Alexis La Goutte -Date: Sun Dec 15 19:07:40 2013 +0000 - - Upgrade to HTTP2 draft-09 - - Add HTTP2 to Decode as - - svn path=/trunk/; revision=54131 - -commit c00a126 -Author: Alexis La Goutte -Date: Sun Dec 15 19:07:26 2013 +0000 - - Fix warning found by doxygen - - svn path=/trunk/; revision=54130 - -commit aae7200 -Author: Alexis La Goutte -Date: Sun Dec 15 19:07:09 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54129 - -commit 9f22d3a -Author: Martin Kaiser -Date: Sun Dec 15 18:38:35 2013 +0000 - - improve DVB-SI string handling - - new function dvb_add_chartbl() adds a tree entry for an encoding - use FT_BTYES as type for encoding hfs - string hfs for DVB-SI strings must have STR_UNICODE, not BASE_NONE - make dvb_string_encoding_vals[] internal to dvb_chartbl.c - - svn path=/trunk/; revision=54128 - -commit 9ce9b10 -Author: Alexis La Goutte -Date: Sun Dec 15 16:36:25 2013 +0000 - - From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9542 - - Enhancements for SEL Fast Message Dissector - - Additional functionality for SEL Fast Message dissector: - - Optional CRC16 validation for Fast SER messages that use those footers. Use built-in Wireshark functions to complete this - - Handle Fast Meter messages with scale factors present in the configuration message. Required some additions to the fm_conversation struct - - Some small cleanups for margins and comment locations. - - From me : - - Fix some encoding field - - unused variable... - - svn path=/trunk/; revision=54127 - -commit ee08b65 -Author: Alexis La Goutte -Date: Sun Dec 15 16:28:57 2013 +0000 - - Fix build with CMake (Missing dvb_chartbl.c...) Fix indent also in Makefile.common - - svn path=/trunk/; revision=54126 - -commit 57ed8b4 -Author: Alexis La Goutte -Date: Sun Dec 15 16:17:36 2013 +0000 - - From Fabio Tarabelloni via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9544 - - Zbee ZCL Identify dissector duplicated - - The packet-zbee-zcl.c contains duplication of ZCL Identify cluster dissector, already developed in packet-zbee-zcl-general.c file - - svn path=/trunk/; revision=54125 - -commit fea47a3 -Author: Alexis La Goutte -Date: Sun Dec 15 16:17:22 2013 +0000 - - Make checkAPI happy - - Error: hf_zbee_beacon_router_capacity: FT_BOOLEAN with a bitmask must specify a 'parent field width' for 'display' in packet-zbee-nwk.c - Error: hf_zbee_beacon_end_device_capacity: FT_BOOLEAN with a bitmask must specify a 'parent field width' for 'display' in packet-zbee-nwk.c - - svn path=/trunk/; revision=54124 - -commit c58f388 -Author: Alexis La Goutte -Date: Sun Dec 15 16:17:08 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9558 - - Mark generated fields as generated in RTPproxy dissector - - This patch is cosmetic. It just marks generated fields as generated (to avoid confusion) - - Signed-off-by: Peter Lemenkov - - svn path=/trunk/; revision=54123 - -commit 5c7c8e3 -Author: Alexis La Goutte -Date: Sun Dec 15 16:16:54 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9546 - - PSK stream does not get decrypted with other TLS streams - - Fix PSK decryption with keylog file - - Session IDs may be empty (length zero). Currently, these sessions are - still stored in the session cache which is quite useless as is is very - likely that multiple TLS streams have no Session ID in their Hello - messages. This causes the wrong premaster secret to be restored when the - ClientHello is dissected (via dissect_ssl3_hnd_hello_common). - - In the PSK case, this will prevent the SSL keylog file from being - consulted. When processing the ClientKeyExchange, the - ssl_generate_pre_master_secret function is called to set the pre-master - key... but this does not happen when ssl.psk is not available. In this - case, the PMK that was restored in ClientHello is used. This results in - faulty dissection. - - RSA does not have this problem because it always tries to use the - private server key (and falls back to the keylog file). - - This fix prevents empty session IDs from being stored with a PMK, - making the dissector use the keylog file for PSK. - - svn path=/trunk/; revision=54122 - -commit 1c85671 -Author: Alexis La Goutte -Date: Sun Dec 15 16:16:38 2013 +0000 - - From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9557 - - Add support for dissecting Gluster/NFS file handles - - The nfs dissector has support for dissecting several types (depending on the NFS-server) of file-handles. GlusterFS/NFS can not be dissected yet - - svn path=/trunk/; revision=54121 - -commit f247647 -Author: Evan Huus -Date: Sun Dec 15 15:52:15 2013 +0000 - - Add a MIN() to avoid reading past the end of a buffer in LDSS. Caught by - valgrind fuzzing. - - svn path=/trunk/; revision=54120 - -commit 971f1a1 -Author: Gerald Combs -Date: Sun Dec 15 15:03:42 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-12-15] - - svn path=/trunk/; revision=54117 - -commit f98af27 -Author: Martin Kaiser -Date: Sun Dec 15 12:51:33 2013 +0000 - - remove a line that sneaked in from some tests - - svn path=/trunk/; revision=54116 - -commit 9818914 -Author: Michael Mann -Date: Sun Dec 15 12:48:12 2013 +0000 - - Create separate dissection functions for TCP and UDP. - - svn path=/trunk/; revision=54115 - -commit 2c015bb -Author: Jakub Zawadzki -Date: Sun Dec 15 12:35:00 2013 +0000 - - Fix some const/ not const warnings. - - svn path=/trunk/; revision=54114 - -commit db1b70f -Author: Martin Kaiser -Date: Sun Dec 15 12:05:50 2013 +0000 - - as requested, move the functions/defines for DVB character tables - to separate files - - svn path=/trunk/; revision=54113 - -commit d6b2fb1 -Author: Michael Mann -Date: Sun Dec 15 02:56:29 2013 +0000 - - proto_tree_add_xxx -> proto_tree_add_item - - svn path=/trunk/; revision=54112 - -commit 35606f3 -Author: Guy Harris -Date: Sun Dec 15 01:10:47 2013 +0000 - - Fix a cut-and-pasteo. - - svn path=/trunk/; revision=54111 - -commit 465e466 -Author: Gerald Combs -Date: Sat Dec 14 23:44:25 2013 +0000 - - Use "(void) " to avoid unused variable warnings similar to - Qt's Q_UNUSED macro. - - svn path=/trunk/; revision=54110 - -commit 62d05c8 -Author: Jakub Zawadzki -Date: Sat Dec 14 22:07:26 2013 +0000 - - Fix some warnings - - svn path=/trunk/; revision=54109 - -commit 4120d74 -Author: Jakub Zawadzki -Date: Sat Dec 14 21:04:49 2013 +0000 - - sock diag netlink: dissect requests, stub for 'padding dissection'. - - svn path=/trunk/; revision=54108 - -commit defd185 -Author: Bill Meier -Date: Sat Dec 14 19:26:06 2013 +0000 - - Rework code slightly to prevent VS Code Analysis warning: - C6326: Potential comparison of a constant with another constant - - svn path=/trunk/; revision=54107 - -commit 02eea93 -Author: Gerald Combs -Date: Sat Dec 14 19:23:34 2013 +0000 - - More shorten-64-to-32 warnings. - - svn path=/trunk/; revision=54106 - -commit 478f83d -Author: Guy Harris -Date: Sat Dec 14 19:11:21 2013 +0000 - - Use proto_tree_add_item() rather than fetching a string an adding it, if - possible. If (possibly) not possible, use tvb_get_string_enc() rather - than tvb_get_unicode_string(). - - svn path=/trunk/; revision=54105 - -commit 81a67ce -Author: Bill Meier -Date: Sat Dec 14 18:50:23 2013 +0000 - - Fix (I think) VS Code Analyzer warnings: - C6297: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value. - Results might not be an expected value - - - svn path=/trunk/; revision=54104 - -commit 3ddb201 -Author: Bill Meier -Date: Sat Dec 14 18:33:55 2013 +0000 - - Create/use several extended value-strings; - (Sort & remove dups from underlying value_string arrays); - Reformat a few long lines; - Add editor modelines; - - - svn path=/trunk/; revision=54103 - -commit 1190f52 -Author: Bill Meier -Date: Sat Dec 14 18:25:42 2013 +0000 - - Fix VS Code Analysis warning: - C6297: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value. \ - Results might not be an expected value - - 'offset++' --> 'offset += 1' for consistency; - Add/adjust whitespace; - Add editor modelines - - - svn path=/trunk/; revision=54102 - -commit 75f1073 -Author: Gerald Combs -Date: Sat Dec 14 18:12:32 2013 +0000 - - Cast away shorten-64-to-32 warnings. - - svn path=/trunk/; revision=54101 - -commit 8fde852 -Author: Gerald Combs -Date: Sat Dec 14 18:07:01 2013 +0000 - - Squelch a bunch of shorten-64-to-32 warnings by parsing all of our - numeric values using strtoul and casting it the result to a guint32. - Hopefully no user or session IDs are negative or greater than 32 bits. - - svn path=/trunk/; revision=54100 - -commit c729725a -Author: Bill Meier -Date: Sat Dec 14 17:00:56 2013 +0000 - - Fix bug found by VS Code Analysis: - warning C6385: Invalid data: accessing 'tag_to_type', \ - the readable size is '136' bytes, but '140' might be read - - svn path=/trunk/; revision=54099 - -commit 862b30c -Author: Chris Maynard -Date: Sat Dec 14 17:00:36 2013 +0000 - - Take a preemptive strike at some likely future VS Code Analyzer warnings about strings possibly not being zero-terminated. - - svn path=/trunk/; revision=54098 - -commit 07a8d1b -Author: Jakub Zawadzki -Date: Sat Dec 14 16:47:52 2013 +0000 - - xmpp_attr_info, xmpp_attr_info_ext: Pass pointer to hf - - This should fix most of warnings: - initializer element is not computable at load time - - svn path=/trunk/; revision=54097 - -commit b4acad6 -Author: Bill Meier -Date: Sat Dec 14 16:36:07 2013 +0000 - - Prevent VS Code Analyzer warning; (AFAICT: not an actual bug). - - svn path=/trunk/; revision=54096 - -commit 715e2d6 -Author: Jakub Zawadzki -Date: Sat Dec 14 16:09:57 2013 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54095 - -commit 5a4720b -Author: Bill Meier -Date: Sat Dec 14 16:01:00 2013 +0000 - - Set Proto col & Clear Info col before fetching data from the tvb; - Almost all of the dissection code can be under 'if (tree)'; - Do some whitespace changes. - - svn path=/trunk/; revision=54094 - -commit aa16494 -Author: Evan Huus -Date: Sat Dec 14 14:44:52 2013 +0000 - - Add a cast to silence an unnecessary warning. - - svn path=/trunk/; revision=54093 - -commit e0e86ba -Author: Jakub Zawadzki -Date: Sat Dec 14 14:33:46 2013 +0000 - - Fix const warnings. - - svn path=/trunk/; revision=54092 - -commit 2754c08 -Author: Evan Huus -Date: Sat Dec 14 14:11:30 2013 +0000 - - From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158 - - Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit - and SSAP CR bit as separate items in the proto tree. This gives an impression - that these entries are separate fields in the LLC header while in reality, they - are only the least significant bits in DSAP/SSAP octets. In addition, the - importance of these bits is relatively low in today's LLC-based protocols (they - are mostly set to 0), so having them always displayed in the proto tree is - somewhat of a luxury. - - Modify the LLC dissector by having added a subtree to both DSAP and SSAP items - that displays the IG and CR bits as bits in a bitfield, and moved the display - of IG and CR bits into these subtrees. - - It may seem that adding a text item instead of a FT_UINT8 value is not a - sensible approach because such item is not filterable. However, if filtering by - the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this - value is always added to the tree in its entirety and indexed by "llc.dsap" and - "llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig" - and "llc.ssap.cr" filter strings are available. Searching for the value of the - DSAP/SSAP & 0xFE which would be the value currently added by the - proto_tree_add_text() is not done and should not be done, as IEEE stipulates: - "An individual actual address value does not necessarily have any relationship - with a group address of the same actual address value." - (http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this - consideration, the choice of displaying the SAP "actual address" using - proto_tree_add_text() is acceptable. - - svn path=/trunk/; revision=54091 - -commit a990dfa -Author: Jakub Zawadzki -Date: Sat Dec 14 13:36:54 2013 +0000 - - rdp_field_info_t struct: Pass pointer to hf - - This should fix most of errors: - warning: initializer element is not computable at load time [enabled by default] - - svn path=/trunk/; revision=54090 - -commit 1053e72 -Author: Jakub Zawadzki -Date: Sat Dec 14 12:45:57 2013 +0000 - - Fix warnings - - svn path=/trunk/; revision=54089 - -commit 4d92f60 -Author: Jakub Zawadzki -Date: Sat Dec 14 11:12:20 2013 +0000 - - Remove not needed ';' - - svn path=/trunk/; revision=54088 - -commit fde0410 -Author: Jakub Zawadzki -Date: Sat Dec 14 11:03:16 2013 +0000 - - Fix constiness of GET_VALSP() macro. - - svn path=/trunk/; revision=54087 - -commit 53f438b -Author: Jakub Zawadzki -Date: Sat Dec 14 10:43:29 2013 +0000 - - Allow -Wmissing-prototypes only for C - - It should fix: - cc1plus: warning: command line option `-Wmissing-prototypes' is valid for Ada/C/ObjC but not for C++ [enabled by default] - - (only g++ complains, clang is OK with -Wmissing-prototypes) - - svn path=/trunk/; revision=54086 - -commit 5c79cbf -Author: Jakub Zawadzki -Date: Sat Dec 14 10:29:26 2013 +0000 - - Fix some trivial warnings. - - svn path=/trunk/; revision=54085 - -commit 5dd7b73 -Author: Guy Harris -Date: Sat Dec 14 03:44:12 2013 +0000 - - Use proto_tree_add_item() for UTF-16 strings when dissecting string - descriptors. - - Make sure the length in string descriptors is at least 2, so that we - have a valid string or string-list length. - - svn path=/trunk/; revision=54084 - -commit e57d150 -Author: Evan Huus -Date: Sat Dec 14 01:40:39 2013 +0000 - - Fix string length typo causing unitialized-value warnings caught by valgrind - fuzzing. - - svn path=/trunk/; revision=54083 - -commit cb73c37 -Author: Evan Huus -Date: Sat Dec 14 01:34:02 2013 +0000 - - It seems sscanf requires the input string to be null-terminated, even if it is - longer than the maximum possible amount to read based on the format string. For - this reason, don't use sscanf on tvb_get_ptr directly, copy and null-terminate - the bytes we want. - - Fixes an uninitialized value caught by valgrind fuzzing. - - svn path=/trunk/; revision=54082 - -commit 2f11c8f -Author: Gerald Combs -Date: Sat Dec 14 00:07:27 2013 +0000 - - Add a bunch of tooltips. - - svn path=/trunk/; revision=54081 - -commit 0510eeb -Author: Guy Harris -Date: Fri Dec 13 23:32:00 2013 +0000 - - Pass the information from ATP to the conversation dissector. - - svn path=/trunk/; revision=54080 - -commit 8a3191f -Author: Jakub Zawadzki -Date: Fri Dec 13 23:22:28 2013 +0000 - - It should halve warnings count in tn5250 dissector. - - svn path=/trunk/; revision=54079 - -commit d6da7a0 -Author: Jakub Zawadzki -Date: Fri Dec 13 23:11:14 2013 +0000 - - Fix warnings + remove some v. old comment from strutil.h - - - svn path=/trunk/; revision=54078 - -commit 24360c9 -Author: Evan Huus -Date: Fri Dec 13 23:08:32 2013 +0000 - - Make sure all unused bits are 0 in bacapp, fixes uninitialized memory found by - valgrind. - - svn path=/trunk/; revision=54077 - -commit 4043db5 -Author: Guy Harris -Date: Fri Dec 13 22:44:58 2013 +0000 - - Rename spotlight_get_utf16_string_encoding() to - spotlight_get_utf16_string_byte_order(), and have it return - ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN if it finds a BOM and 0xFFFFFFFF if - it doesn't, to make it a bit clearer what it's doing. - - Use tvb_get_string_enc() rather than tvb_get_unicode_string(). - - svn path=/trunk/; revision=54075 - -commit 30ab019 -Author: Guy Harris -Date: Fri Dec 13 22:35:50 2013 +0000 - - In tvb_get_unicode_string(), if the byte count is odd, ignore the last - byte. (We should perhaps add an expert info indication in those cases.) - - svn path=/trunk/; revision=54074 - -commit bbc3e14 -Author: Jakub Zawadzki -Date: Fri Dec 13 22:34:10 2013 +0000 - - netlink: update - - - set pinfo->p2p_dir based on portid - - check for nlmsg type in dissect_netlink_sock_diag() - - sock diag support LINUX_AF_INET6, LINUX_AF_PACKET - - naming cleanup - - svn path=/trunk/; revision=54073 - -commit 4cb6a92 -Author: Evan Huus -Date: Fri Dec 13 22:15:29 2013 +0000 - - Change the exit status of a fuzz failure to 255 so that if you use it with xargs - the failures don't get suppressed. - - svn path=/trunk/; revision=54071 - -commit 2d5c1c8 -Author: Guy Harris -Date: Fri Dec 13 21:36:50 2013 +0000 - - Note that apparently some BACnet implementations misuse the "ANSI X3.4" - encoding for ISO 8859-1; this means that those strings won't be - correctly interpreted if they're interpreted as UTF-8. - - svn path=/trunk/; revision=54069 - -commit fde7a4c -Author: Gerald Combs -Date: Fri Dec 13 21:31:01 2013 +0000 - - Simplify column sizing. - - svn path=/trunk/; revision=54068 - -commit 9d21f52 -Author: Bill Meier -Date: Fri Dec 13 21:30:25 2013 +0000 - - Fix various issues: - - Display of header bit fields was incorrect; - - Computation of the data length was incorrect; - - Display of trailer 'indicator enable' & 'indicator' bit fields was incorrect; - - 'Display' field of certain hf[] entries was incorrect. - - Pedantic: Use ENC_BIG_ENDIAN instead of ENC_NA in certain places. - - See Bug #9539 - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9539 - - - svn path=/trunk/; revision=54067 - -commit 34b93ed -Author: Evan Huus -Date: Fri Dec 13 21:26:59 2013 +0000 - - Replace wmem_alloc with wmem_new in a few places, and wmem_new with wmem_new0 in - a few places to avoid uninitialized memory found while fuzz-testing with - valgrind. - - svn path=/trunk/; revision=54066 - -commit 0905bff -Author: Chris Maynard -Date: Fri Dec 13 21:25:48 2013 +0000 - - Return FALSE from dissect_iwarp_mpa() if data is NULL. Note that this is the conservative/safest approach since there do appear to be some code paths that don't rely on the data. - - svn path=/trunk/; revision=54065 - -commit 7aaa0b2 -Author: Chris Maynard -Date: Fri Dec 13 21:15:49 2013 +0000 - - Return FALSE from dissect_zbee_nwk_heur() if data is NULL. - - svn path=/trunk/; revision=54064 - -commit 629c13c -Author: Chris Maynard -Date: Fri Dec 13 21:08:21 2013 +0000 - - Add data arg to dissect_wassp_heur() in case it's ever used. - - svn path=/trunk/; revision=54063 - -commit 7ba2ee5 -Author: Chris Maynard -Date: Fri Dec 13 20:59:45 2013 +0000 - - Return FALSE from dissect_tapa_heur() if data is NULL. - - svn path=/trunk/; revision=54062 - -commit 305055b -Author: Chris Maynard -Date: Fri Dec 13 20:50:19 2013 +0000 - - Add data arg to dissect_skype_heur() so it compiles cleanly if/when SKYPE_HEUR is ever defined. - - svn path=/trunk/; revision=54061 - -commit cbeaa89 -Author: Guy Harris -Date: Fri Dec 13 20:31:02 2013 +0000 - - Handle NFS4_OP_ILLEGAL (and other potential array bounds errors). - - svn path=/trunk/; revision=54058 - -commit c88431c -Author: Chris Maynard -Date: Fri Dec 13 20:16:53 2013 +0000 - - Remove _U_ - - svn path=/trunk/; revision=54057 - -commit 4b6ef3f -Author: Evan Huus -Date: Fri Dec 13 20:09:17 2013 +0000 - - Add another check to radiotap-iter initialization to catch another out-of-bounds - read found while fuzzing with valgrind. Hopefully doesn't break valid captures. - - svn path=/trunk/; revision=54056 - -commit 7d016fc -Author: Chris Maynard -Date: Fri Dec 13 20:07:44 2013 +0000 - - If data is NULL, return FALSE. - - svn path=/trunk/; revision=54055 - -commit 2147ff9 -Author: Chris Maynard -Date: Fri Dec 13 19:01:02 2013 +0000 - - Remove _U_ - - svn path=/trunk/; revision=54054 - -commit be1aa48 -Author: Gerald Combs -Date: Fri Dec 13 19:00:51 2013 +0000 - - Add recent Qt additions. - - svn path=/trunk/; revision=54053 - -commit a2835dd -Author: Gerald Combs -Date: Fri Dec 13 18:36:59 2013 +0000 - - Capture Interfaces dialog cleanup. - - Apply layouts as needed to allow resizing. Select the interface list by - row. We might want to switch the interface list to a QTreeWidget. Today - I learned that you can make QGroupBox titles checkable. Do that where we - enable and disable groups of items. Flatten all of the group boxes. - Change the output format combo to radio buttons. There are only two - choices and we have lots of real estate available. Use a - QDialogButtonBox so Qt can size and order the buttons appropriately. - - svn path=/trunk/; revision=54052 - -commit 093ace5 -Author: Chris Maynard -Date: Fri Dec 13 18:25:06 2013 +0000 - - Fix Visual Studio Code Analysis warning C6011: Dereferencing NULL pointer 'returnedDevmode' - - svn path=/trunk/; revision=54051 - -commit 4cabb63 -Author: Chris Maynard -Date: Fri Dec 13 18:13:58 2013 +0000 - - Fix Visual Studio Code Analysis warning C6001: Using uninitialized memory 'keylist' - - svn path=/trunk/; revision=54050 - -commit 97964f3 -Author: Chris Maynard -Date: Fri Dec 13 17:13:33 2013 +0000 - - Fix Visual Studio Code Analysis warning C6054: String 'szStr' might not be zero-terminated - - svn path=/trunk/; revision=54049 - -commit fae2172 -Author: Bill Meier -Date: Fri Dec 13 14:56:39 2013 +0000 - - Fix (presumably) a VS Code analysis warning: - C6385: Invalid data: accessing 'dgt->out', the readable size is '15' bytes, but '18' bytes might be read - - Also: Do some trivial whitespace and formatting changes. - - svn path=/trunk/; revision=54048 - -commit 099efcf -Author: Bill Meier -Date: Fri Dec 13 14:39:19 2013 +0000 - - Value_string.h: Minor changes to comment text - value_string.c: value_string_ext_validate() always fails on Windows - when called from a different DLL (i.e. a plugin). - So: Add #ifndef _WIN32 around the offending code. - - svn path=/trunk/; revision=54047 - -commit aa08f7b -Author: Bill Meier -Date: Fri Dec 13 14:19:52 2013 +0000 - - (Trivial) remove some trailing whitespace. - - svn path=/trunk/; revision=54046 - -commit 18fe640 -Author: Alexis La Goutte -Date: Fri Dec 13 14:16:54 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9556 - - Cosmetic change in a LF field representation in the RTPproxy dissector - - Don't display any value for LF field - - Signed-off-by: Peter Lemenkov - - svn path=/trunk/; revision=54045 - -commit 14b210c -Author: Alexis La Goutte -Date: Fri Dec 13 14:16:46 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=54044 - -commit 719cc1e -Author: Alexis La Goutte -Date: Fri Dec 13 14:06:18 2013 +0000 - - From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9499 - - DLTS: add cipher version for OpenSSL pre 0.9.8f - - OpenSSL pre 0.9.8f uses the TLS version 0x0100 and is not completely - compatible with DTLS 1.0 or 1.2. One difference is that the encrypted - pre master from TLS 1.0 does not have an own length, which is needed by - TLS and DTLS 1.0, this makes decrypting impossible. This patch makes it - possible for the code to distinguish between this OpenSSL version and - real DTLS 1.0, because they are not using the same code any more. This - is needed to fix the snakeoil-dtls test. - - Signed-off-by: Hauke Mehrtens - - svn path=/trunk/; revision=54043 - -commit ec9642f -Author: Michael Tüxen -Date: Fri Dec 13 13:31:34 2013 +0000 - - May this silences a warning of code that will go out next week. - - svn path=/trunk/; revision=54042 - -commit 9a5d23c -Author: Michael Tüxen -Date: Fri Dec 13 13:00:29 2013 +0000 - - Try to silence warnings and add a comment for Irene to - fix these appropriately next week. - - svn path=/trunk/; revision=54041 - -commit 0c5eccc -Author: Michael Tüxen -Date: Fri Dec 13 11:34:37 2013 +0000 - - Try to silence a warning due to a temporary workaround. - - svn path=/trunk/; revision=54040 - -commit ec32b61 -Author: Alexis La Goutte -Date: Fri Dec 13 11:30:24 2013 +0000 - - From Peter Wu - - ssl-utils: remove SIG, rename mode and formatting - - The changes seem huge, but actually involve a few structural changes - that do not change functionality, but aim to make maintenance easier and - lines shorter. The following changes were made: - - 1. Remove the "sig" field and `SIG_*` constants as they are not used - anywhere. - 2. Convert `SSL_CIPHER_MODE_*` macros to an enum, change the type in - SslCipherSuite, change the field terminator in cipher_suites and - drop the `SSL_CIPHER_` prefix to make it shorter. - 3. Add whitespace to align the cipher suites and convert the numbers to - hex to match common usage (e.g. IANA docs). Done with the awk script - below. - - AWK script that takes the lines with `,KEX_` and applies changes (3): - - #!/usr/bin/gawk -f - BEGIN { FS="[, {]+" } - { - split($0, c, "}, *"); - comment="";if(c[2])comment=" "c[2]; - sub("}", "", $10); # comment } - printf(" {0x%04X,%-12s%-16s%2d,%3d,%3d,%-11s %-22s},%s\n", - strtonum($2), - $3 ",", # Key exchange - # $4 is SIG_ - remove - $5 ",", # Cipher - $6, # blocksize - $7, # keysize - $8, # export keysize - $9 ",", # Digest - $10, # mode - comment); - } - - Signed-off-by: Peter Wu - - svn path=/trunk/; revision=54039 - -commit 4f32d66 -Author: Alexis La Goutte -Date: Fri Dec 13 11:29:11 2013 +0000 - - Add Copyright and modelines (Fix also indent to use 4 spaces) - - svn path=/trunk/; revision=54038 - -commit 894bc27 -Author: Irene Rüngeler -Date: Fri Dec 13 11:20:21 2013 +0000 - - Fix typo - - svn path=/trunk/; revision=54037 - -commit a2a4809 -Author: Irene Rüngeler -Date: Fri Dec 13 11:03:13 2013 +0000 - - Fix typo. - - svn path=/trunk/; revision=54036 - -commit 92ed24d -Author: Irene Rüngeler -Date: Fri Dec 13 10:56:31 2013 +0000 - - Fix gboolean bool conflict. - - svn path=/trunk/; revision=54035 - -commit 3ad28a9 -Author: Alexis La Goutte -Date: Fri Dec 13 10:56:14 2013 +0000 - - Fix build when use Qt4 - - ui/qt/sctp_chunk_statistics_dialog.cpp:16:40: error: ‘class QHeaderView’ has no member named ‘setSectionsClickable’ - ui/qt/sctp_chunk_statistics_dialog.cpp:17:40: error: ‘class QHeaderView’ has no member named ‘setSectionsMovable’ - - svn path=/trunk/; revision=54034 - -commit a1da50b -Author: Irene Rüngeler -Date: Fri Dec 13 10:39:13 2013 +0000 - - Add sctp files to Makefile.am - - svn path=/trunk/; revision=54033 - -commit dafe3d0 -Author: Irene Rüngeler -Date: Fri Dec 13 09:52:41 2013 +0000 - - Address more Windows errors. - - svn path=/trunk/; revision=54032 - -commit 7cfa3d0 -Author: Irene Rüngeler -Date: Fri Dec 13 09:14:20 2013 +0000 - - Address Windows warning - - svn path=/trunk/; revision=54031 - -commit 9792fe5 -Author: Jörg Mayer -Date: Fri Dec 13 09:10:35 2013 +0000 - - "Fix" - /home/jmayer/work/wireshark/svn/trunk/ui/qt/sctp_graph_byte_dialog.cpp:36:13: error: variable ‘minBytes’ set but not used [-Werror=unused-but-set-variable] - guint32 minBytes, maxBytes; - ^ - cc1plus: all warnings being treated as errors - - - svn path=/trunk/; revision=54030 - -commit ecbca40 -Author: Jörg Mayer -Date: Fri Dec 13 09:09:06 2013 +0000 - - "Fix" 'set but not used' warning turning error. - - svn path=/trunk/; revision=54029 - -commit 66d0882 -Author: Irene Rüngeler -Date: Fri Dec 13 08:41:26 2013 +0000 - - Address Windows warning. - - svn path=/trunk/; revision=54028 - -commit 2c6d94b -Author: Irene Rüngeler -Date: Fri Dec 13 08:01:24 2013 +0000 - - Take sctp_stat.c off the list because it has been removed. - - svn path=/trunk/; revision=54027 - -commit 796bf40 -Author: Irene Rüngeler -Date: Fri Dec 13 07:25:30 2013 +0000 - - Add dialogs and graphs to analyse SCTP behavior similar to the GTK version. - - svn path=/trunk/; revision=54026 - -commit 28e6aa4 -Author: Anders Broman -Date: Fri Dec 13 06:55:20 2013 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=54025 - -commit 4e3e8d2 -Author: Anders Broman -Date: Fri Dec 13 06:52:02 2013 +0000 - - Try to fix building of captype - - svn path=/trunk/; revision=54024 - -commit 62f5450 -Author: Anders Broman -Date: Fri Dec 13 06:36:00 2013 +0000 - - Add a file that probably should have been a part of - http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=54015 - - svn path=/trunk/; revision=54023 - -commit 86149a1 -Author: Evan Huus -Date: Fri Dec 13 04:11:49 2013 +0000 - - Don't use optind, we don't actually call getopt or friends and we don't include - the necessary headers on all platforms to have optind defined. Just check that - we got arguments in addition to the executable name. - - svn path=/trunk/; revision=54022 - -commit e954ce0 -Author: Evan Huus -Date: Fri Dec 13 04:04:10 2013 +0000 - - Add what appears to be a missing #include for windows. - - svn path=/trunk/; revision=54020 - -commit 746e796 -Author: Bill Meier -Date: Fri Dec 13 03:24:08 2013 +0000 - - (Try to) fix VS Clang Analysis warning: - C6297: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value. Results might not be an expected value - - svn path=/trunk/; revision=54019 - -commit afa9f61 -Author: Guy Harris -Date: Fri Dec 13 03:13:40 2013 +0000 - - And another one. - - svn path=/trunk/; revision=54018 - -commit 70e8da2 -Author: Guy Harris -Date: Fri Dec 13 03:12:42 2013 +0000 - - Add some more file types misidentified as VWR files. - - svn path=/trunk/; revision=54017 - -commit 644e804 -Author: Guy Harris -Date: Fri Dec 13 03:02:09 2013 +0000 - - Fix command name. - - svn path=/trunk/; revision=54016 - -commit e21fd7c -Author: Guy Harris -Date: Fri Dec 13 02:59:16 2013 +0000 - - Add a "captype" file that just reports the type of a capture file, based - on what libwiretap thinks it is. - - Update some comments to reflect the death of the hack used to include - (libwiretap) plugin support in programs not built with libwireshark. - - svn path=/trunk/; revision=54015 - -commit ed9865a -Author: Chris Maynard -Date: Fri Dec 13 02:58:34 2013 +0000 - - Fix packet-lapd.c:186: warning: comparison between signed and unsigned. - - svn path=/trunk/; revision=54014 - -commit e2d46b8 -Author: Chris Maynard -Date: Fri Dec 13 02:55:05 2013 +0000 - - Fix 4 instances of Visual Studio Code Analysis warnings C6001: Using uninitialized memory 'pduType2', 'numberCapabilities' (2x), and 'pduType' - - svn path=/trunk/; revision=54013 - -commit c34050d -Author: Guy Harris -Date: Fri Dec 13 02:38:11 2013 +0000 - - The IxVeriWave heuristic now gets more false positives (after, I - suspect, the change to handle VWR files with no packets); shuffle it - after all the types we've seen misidentified as VWR files. - - svn path=/trunk/; revision=54012 - -commit 6544ea2 -Author: Bill Meier -Date: Fri Dec 13 02:36:27 2013 +0000 - - Let's see if this fixes VS Code Analysis warnings: - C6297: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value. \ - Results might not be an expected value - - svn path=/trunk/; revision=54011 - -commit 18398c9 -Author: Chris Maynard -Date: Fri Dec 13 02:35:26 2013 +0000 - - Fix Visual Studio Code Analysis warning C6204: Possible buffer overrun in call to 'memcpy': use of unchecked parameter 'data_len' - - svn path=/trunk/; revision=54010 - -commit e45b95f -Author: Chris Maynard -Date: Fri Dec 13 02:04:39 2013 +0000 - - Try to appease Visual Studio Code Analysis to avoid a false warning (as far as I can tell), namely: warning C6054: String 'forbidden' might not be zero-terminated - - svn path=/trunk/; revision=54009 - -commit bd9b32a -Author: Chris Maynard -Date: Fri Dec 13 01:56:40 2013 +0000 - - Fix Visual Studio Code Analysis warning C6001: Using uninitialized memory 'obj_type' - - svn path=/trunk/; revision=54008 - -commit 10d8530 -Author: Gerald Combs -Date: Fri Dec 13 01:40:36 2013 +0000 - - Switch the cherry-pick merge strategy to "recursive + theirs", which - seems to pull in fewer changes and be less prone to conflitcs. This was - the case for r53086, at least. Add "-x" which adds a "cherry picked - from..." line to the commit message. - - Show a diff before pushing. - - svn path=/trunk/; revision=54007 - -commit d708f93 -Author: Jakub Zawadzki -Date: Fri Dec 13 00:51:30 2013 +0000 - - netlink: update - - - add netlink socket diag, - - dissect socket diag meminfo structures, - - add prototypes. - - svn path=/trunk/; revision=54006 - -commit 721b5d2 -Author: Bill Meier -Date: Fri Dec 13 00:44:32 2013 +0000 - - Do one or more of the following: - - Convert "4 space tabs" to spaces; - - Remove some unneeded initializers; - - 'offset++' --> 'offset += 1' for consistency; - - Reformat hf[] entries; - - Rework/add whitespace; - - Adjust editor modelines (set tab-width to 8). - - svn path=/trunk/; revision=54005 - -commit 2fd6bb7 -Author: Chris Maynard -Date: Fri Dec 13 00:08:16 2013 +0000 - - Trivial: Spaces -> tabs - - svn path=/trunk/; revision=54004 - -commit a43efdb -Author: Gerald Combs -Date: Fri Dec 13 00:05:32 2013 +0000 - - Fix redirection. - - svn path=/trunk/; revision=54003 - -commit 3a35dd5 -Author: Chris Maynard -Date: Fri Dec 13 00:05:14 2013 +0000 - - Trivial: Spaces -> tabs - - svn path=/trunk/; revision=54002 - -commit 07b56cf -Author: Gerald Combs -Date: Fri Dec 13 00:03:19 2013 +0000 - - Don't cherry-pick if we have changes. - - svn path=/trunk/; revision=54001 - -commit db59fd8 -Author: Gerald Combs -Date: Fri Dec 13 00:02:46 2013 +0000 - - Add .gitreview - - svn path=/trunk/; revision=54000 - -commit 9b0b757 -Author: Gerald Combs -Date: Thu Dec 12 23:38:54 2013 +0000 - - Add a "backport-change" script which cherry-picks a proposed backport - and pushes it to Gerrit. - - svn path=/trunk/; revision=53999 - -commit 37f60fa -Author: Bill Meier -Date: Thu Dec 12 23:11:04 2013 +0000 - - In one or more of the files: - - Create/use some extended value-strings; - - Remove some unneeded initializers; - - 'offset++' --> 'offset += 1' for consistency; - - Set editor modelines 'tab-width' to 8 (not 4); - - tabs --> spaces (to match editor modelines); - - Rework/add whitespace. - - svn path=/trunk/; revision=53998 - -commit 5db2d62 -Author: Pascal Quantin -Date: Thu Dec 12 22:35:45 2013 +0000 - - From Michael Lum via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9554 : - GSM SMS: remove some globals and expose some UDH fields through dis_field_udh() - - svn path=/trunk/; revision=53997 - -commit 8d67e7b -Author: Guy Harris -Date: Thu Dec 12 22:22:09 2013 +0000 - - The dissector table has never been used, and the name of the dissector - table doesn't correspond to any obvious field, so I'm not sure why it - needs to exist. Remove it. - - svn path=/trunk/; revision=53996 - -commit 76eebd5 -Author: Chris Maynard -Date: Thu Dec 12 22:02:46 2013 +0000 - - Appease Visual Studio Code Analysis by ensuring that the string in csec[] is NULL-terminated. - - svn path=/trunk/; revision=53995 - -commit 3e8ea51 -Author: Guy Harris -Date: Thu Dec 12 21:45:35 2013 +0000 - - Get rid of a dissector table that has never been used. - - Get rid of a field that was hidden, always set to 0, and not obviously - used anywhere. - - svn path=/trunk/; revision=53994 - -commit b3922f9 -Author: Bill Meier -Date: Thu Dec 12 21:42:10 2013 +0000 - - Create/use two extended value-strings; - Reformat some hf[] entries; - Reformat a long line; - tabs --> spaces 9to match editor-modelines); - Rework/Add whitespace. - - svn path=/trunk/; revision=53993 - -commit f049bec -Author: Jakub Zawadzki -Date: Thu Dec 12 21:29:51 2013 +0000 - - DHCPv6: update list of message types and options (from IANA) - - svn path=/trunk/; revision=53992 - -commit 24c15c9 -Author: Bill Meier -Date: Thu Dec 12 21:15:03 2013 +0000 - - Reformat some hf[] entries; - Reformat some long lines; - tabs --> spaces (to match editor modelines); - Rework/add whitespace; - - svn path=/trunk/; revision=53991 - -commit 09d84f3 -Author: Bill Meier -Date: Thu Dec 12 21:11:30 2013 +0000 - - Create/use an extended value-string; - Localize some vars; - Remove some unneeded initializers; - Reformat some hf[] entries; - Reformat a long commenty for readability; - Break up some long lines; - Use consistent indentation; - Rework/add whitespace; - Fix inconsistent editor modelines. - - - svn path=/trunk/; revision=53990 - -commit 859cd68 -Author: Guy Harris -Date: Thu Dec 12 21:06:55 2013 +0000 - - In r12060, use of the "aim.family" subdissector table was eliminated, in - favor of the AIM dissector having its own private way of handing off to - subdissectors. Get rid of the subdissector table. - - svn path=/trunk/; revision=53989 - -commit b54c6ea -Author: Bill Meier -Date: Thu Dec 12 21:02:25 2013 +0000 - - Reformat hf[] entries; - tabs --> spaces to match editor modelines; - Rework/add whitespace. - - svn path=/trunk/; revision=53988 - -commit d63a5cf -Author: Bill Meier -Date: Thu Dec 12 20:56:31 2013 +0000 - - Remove 'if (tree)' around (indirect) calls to expert functions; - Reformat hf[] entries; - 'offset++' --> 'offset += 1' for consistency; - tabs --> spaces to match editor modelines; - Rework/add whitespace. - - svn path=/trunk/; revision=53987 - -commit 62a62aa -Author: Bill Meier -Date: Thu Dec 12 20:51:40 2013 +0000 - - Remove two text arrays (flagged with _U_); - Remove unneeded initializers; - Change tabs --> spaces (to match edirtor modelines); - Rework/add some whitespace. - - svn path=/trunk/; revision=53986 - -commit 01fd11a -Author: Bill Meier -Date: Thu Dec 12 20:44:08 2013 +0000 - - (Trivial): - tabs --> spaces (to match editor modelines); - 'offset++' --> 'offset += 1' for consistency; - Break up a long text constant; - Reformat some lines for readability. - - svn path=/trunk/; revision=53985 - -commit 06282f3 -Author: Chris Maynard -Date: Thu Dec 12 20:40:12 2013 +0000 - - Fix Visual Studio Code Analysis warning C6385: Invalid data: accessing 'tag_to_type', the readable size is '136' bytes, but '540' bytes might be read - - svn path=/trunk/; revision=53984 - -commit 5a2dd0e -Author: Bill Meier -Date: Thu Dec 12 20:39:11 2013 +0000 - - Use a consistent indentation: 4 spaces; - Use #if 0/#endif instead of '/* */' to comment out some code; - - svn path=/trunk/; revision=53983 - -commit 226e9ca -Author: Bill Meier -Date: Thu Dec 12 20:35:58 2013 +0000 - - (Trivial) - - Remove two lines of commented out code; - - Specify 'tab-width: 8' (not 4) in editor modelines; - - Rework/add whitespace; - - svn path=/trunk/; revision=53982 - -commit b03a63f -Author: Chris Maynard -Date: Thu Dec 12 20:33:30 2013 +0000 - - Fix Visual Studio Code Analysis warning C6287: Redundant code: the left and right sub-expressions are identical - - svn path=/trunk/; revision=53981 - -commit e566611 -Author: Bill Meier -Date: Thu Dec 12 20:33:17 2013 +0000 - - (Trivial); - - localize some vars; - - Specify 'tab-width: 8' (not 4) in editor modelines; - - tabs --> spaces; - - svn path=/trunk/; revision=53980 - -commit 394b50d -Author: Bill Meier -Date: Thu Dec 12 20:25:53 2013 +0000 - - (Trivial) - tabs --> spaces to match editor modelines; - Specify 'tab-width: 8' (not 4) in editor modelines; - - svn path=/trunk/; revision=53979 - -commit ebaeed5 -Author: Bill Meier -Date: Thu Dec 12 20:16:30 2013 +0000 - - (Trivial) - - Fix indentation to match editor modelines (tabs-->spaces); - - Rework/add some whitespace; - - svn path=/trunk/; revision=53978 - -commit e14b04c -Author: Martin Kaiser -Date: Thu Dec 12 20:15:06 2013 +0000 - - remove unused dissector tables - http://www.wireshark.org/lists/wireshark-dev/201312/msg00137.html - - svn path=/trunk/; revision=53977 - -commit 03e8f5b -Author: Martin Kaiser -Date: Thu Dec 12 20:09:40 2013 +0000 - - correct the function names in order to fix compile errors - - svn path=/trunk/; revision=53976 - -commit bc1b084 -Author: Chris Maynard -Date: Thu Dec 12 20:09:33 2013 +0000 - - Trivial: Spaces -> tabs. - - svn path=/trunk/; revision=53975 - -commit bacfeda -Author: Bill Meier -Date: Thu Dec 12 19:59:23 2013 +0000 - - Move proto_reg_handoff...() to the file end as per convevntion; - Reformat certain lines to use a consistent style; - tabs --> spaces (to match the editor modelines); - Rework some whitespace; - - svn path=/trunk/; revision=53974 - -commit 0b2dc70 -Author: Chris Maynard -Date: Thu Dec 12 19:56:35 2013 +0000 - - Fix Coverity CID 1135557: Structurally dead code, by moving the break statement to the most sensible place. - - svn path=/trunk/; revision=53973 - -commit 54a8c31 -Author: Anders Broman -Date: Thu Dec 12 19:54:15 2013 +0000 - - Try to fix "initializer element is not computable at load time" - - svn path=/trunk/; revision=53972 - -commit 4058146 -Author: Anders Broman -Date: Thu Dec 12 19:52:14 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53971 - -commit 13cc753 -Author: Bill Meier -Date: Thu Dec 12 19:48:46 2013 +0000 - - Move proto_reg_handoff...() to file end as per convention; - Reformat various hf[] entries; - #include params.h (not prefs.h); - 'offset++' --> 'offset += 1' for consistency; - Localize some variable defintions; - Tabs --> spaces (to match editor modelines); - Rework some whitespace; - - svn path=/trunk/; revision=53970 - -commit 69dbd3f -Author: Chris Maynard -Date: Thu Dec 12 19:38:20 2013 +0000 - - Reject the packet if info is NULL under conditions where it'll be used. - - svn path=/trunk/; revision=53969 - -commit 1de8943 -Author: Bill Meier -Date: Thu Dec 12 19:26:55 2013 +0000 - - Create/use a number of extended value-strings; - Remove or comment out dups from several value-string arrays; - Sort a number of value-string arrays; - Reformat many hf[] entries; - Remove some unneeded initializers; - Add editor-modelines; - Use consistent indentation; - Reformat whitespace. - - svn path=/trunk/; revision=53968 - -commit c96d5a9 -Author: Chris Maynard -Date: Thu Dec 12 19:20:30 2013 +0000 - - Trivial: Tab -> spaces. - - svn path=/trunk/; revision=53967 - -commit c21370b -Author: Chris Maynard -Date: Thu Dec 12 19:10:24 2013 +0000 - - Reject the packet if data is NULL under conditions where it'll be used. - - svn path=/trunk/; revision=53966 - -commit 4b609d4 -Author: Chris Maynard -Date: Thu Dec 12 19:04:38 2013 +0000 - - Reject the packet if data is NULL. For now, leave the DISSECTOR_ASSERT's since both get_rose_ctx() and get_asn1_ctx() also check signatures. - - svn path=/trunk/; revision=53965 - -commit a97a315 -Author: Chris Maynard -Date: Thu Dec 12 18:10:08 2013 +0000 - - Reject the packet if data is NULL. Remove _U_ where data is actually used. For now, leave the DISSECTOR_ASSERT's since both get_rose_ctx() and get_asn1_ctx() also check signatures. - - (Arguably it's the responsibility of the dissector passing this information to set the signature correctly so if there's an invalid signature, the bug is with the calling dissector and not with the one receiving the invalid signature.) - - svn path=/trunk/; revision=53964 - -commit 74b5816 -Author: Anders Broman -Date: Thu Dec 12 17:45:22 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53963 - -commit 138ce6f -Author: Anders Broman -Date: Thu Dec 12 17:32:22 2013 +0000 - - Try to fix "initializer element is not computable at load time" - - svn path=/trunk/; revision=53962 - -commit aad04d5 -Author: Martin Mathieson -Date: Thu Dec 12 13:25:12 2013 +0000 - - Remove some TODOs that have now been addressed - - svn path=/trunk/; revision=53961 - -commit 25cc056 -Author: Martin Mathieson -Date: Thu Dec 12 13:23:28 2013 +0000 - - Missing from last commit - copy hfn into stored result for PDU - - svn path=/trunk/; revision=53960 - -commit 9a6d3cf -Author: Martin Mathieson -Date: Thu Dec 12 11:07:53 2013 +0000 - - Show other security inputs (apart from keys) - - svn path=/trunk/; revision=53959 - -commit b781d6c -Author: Anders Broman -Date: Thu Dec 12 06:11:05 2013 +0000 - - - Make local functions static. - - Forward declaration of register functions. - - svn path=/trunk/; revision=53958 - -commit 018157c -Author: Gerald Combs -Date: Thu Dec 12 02:41:08 2013 +0000 - - Fix the path to dumpcap. - - svn path=/trunk/; revision=53957 - -commit 12ef64b -Author: Gerald Combs -Date: Thu Dec 12 01:46:09 2013 +0000 - - Remove the checks for ../../lib. If it still exists it likely means that - there's a stale LIBRARY_OUTPUT_PATH in CMakeCache.txt. - - svn path=/trunk/; revision=53956 - -commit 8470f36 -Author: Gerald Combs -Date: Thu Dec 12 01:36:44 2013 +0000 - - Update library searches to reflect r53780. - - svn path=/trunk/; revision=53955 - -commit a2459dc -Author: Chris Maynard -Date: Wed Dec 11 23:04:09 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53954 - -commit 8cacdfa -Author: Chris Maynard -Date: Wed Dec 11 23:03:01 2013 +0000 - - Reject the packet if data is NULL. Leave the DISSECTOR_ASSERT(actx != NULL) since get_asn1_ctx() also checks the signature. - - svn path=/trunk/; revision=53953 - -commit a814243 -Author: Gerald Combs -Date: Wed Dec 11 22:29:05 2013 +0000 - - Be more consistent with the name "Wireshark" and its two UI - flavors. Upgrade the Qt flavor from "experimental" to "alpha". I also - apologize in advance to all of the people who installed previous versions - of the 1.11.x packages and who will now have extra shortcuts lying around. - - svn path=/trunk/; revision=53952 - -commit 6e79e1f -Author: Jörg Mayer -Date: Wed Dec 11 21:51:30 2013 +0000 - - Fix - svn/trunk/epan/dissectors/packet-netlink-netfilter.c:164:11: error: variable ‘is_req’ set but not used [-Werror=unused-but-set-variable] - gboolean is_req; - ^ - cc1: all warnings being treated as errors - - - svn path=/trunk/; revision=53951 - -commit 57e66ad -Author: Jakub Zawadzki -Date: Wed Dec 11 21:30:23 2013 +0000 - - Fix buildbot: - - packet-netlink-netfilter.c:94: warning: 'dissect_netlink_netfilter_queue' defined but not used - - svn path=/trunk/; revision=53950 - -commit d5f1c9e -Author: Chris Maynard -Date: Wed Dec 11 21:25:35 2013 +0000 - - Trivial: tabs -> spaces. - - svn path=/trunk/; revision=53949 - -commit 6120f6a -Author: Chris Maynard -Date: Wed Dec 11 21:23:32 2013 +0000 - - New-style dissectors return the number of bytes dissected, not TRUE/FALSE. - - svn path=/trunk/; revision=53948 - -commit 7fe87b5 -Author: Jakub Zawadzki -Date: Wed Dec 11 21:11:42 2013 +0000 - - fix buildbot: - - packet-netlink-netfilter.c:93: warning: unused parameter 'tvb' - - svn path=/trunk/; revision=53947 - -commit ae9e6df -Author: Chris Maynard -Date: Wed Dec 11 21:06:09 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53946 - -commit 212ee66 -Author: Chris Maynard -Date: Wed Dec 11 20:57:53 2013 +0000 - - Be sure tcpinfo is not NULL before dereferencing it. - - svn path=/trunk/; revision=53945 - -commit 1482ce4 -Author: Jakub Zawadzki -Date: Wed Dec 11 20:52:05 2013 +0000 - - Revert part of r53874 - - svn path=/trunk/; revision=53944 - -commit 804bf90 -Author: Jakub Zawadzki -Date: Wed Dec 11 20:48:18 2013 +0000 - - Add new & update netlink dissectors. - - svn path=/trunk/; revision=53943 - -commit 2939977 -Author: Anders Broman -Date: Wed Dec 11 20:04:37 2013 +0000 - - - Make local functions static. - - Forward declaration of register functions. - - svn path=/trunk/; revision=53942 - -commit 7a5d4ed -Author: Anders Broman -Date: Wed Dec 11 19:46:38 2013 +0000 - - - Make local functions static. - - Forward declaration of register functions. - - svn path=/trunk/; revision=53941 - -commit b4020a8 -Author: Pascal Quantin -Date: Wed Dec 11 18:47:15 2013 +0000 - - From Michael Lum via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9550 : - GSM SMS UDH EMS control expects 4 octets instead of 3 with OPTIONAL 4th - - svn path=/trunk/; revision=53940 - -commit 95b25a4 -Author: Chris Maynard -Date: Wed Dec 11 17:08:23 2013 +0000 - - Remove _U_ from dissect_openwire_tcp()'s data parameter; technically it is used since it is passed to tcp_dissect_pdus(), even though dissect_openwire() doesn't actually use it. - - svn path=/trunk/; revision=53939 - -commit 4c19d29 -Author: Chris Maynard -Date: Wed Dec 11 16:52:40 2013 +0000 - - Improve tshark command-line error help. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9548 and adds addtional help, better formatting, sorting and some minimal documentation of the -u option to the tshark man page. - - svn path=/trunk/; revision=53938 - -commit 1bd68e7 -Author: Chris Maynard -Date: Wed Dec 11 15:20:29 2013 +0000 - - Trivial: Fix typo. - - svn path=/trunk/; revision=53937 - -commit 8617423 -Author: Alexis La Goutte -Date: Wed Dec 11 13:14:08 2013 +0000 - - Update .gitignore - - wireshark-tap-register* is used by gtk and Qt - - svn path=/trunk/; revision=53936 - -commit 16f8513 -Author: Alexis La Goutte -Date: Wed Dec 11 13:14:00 2013 +0000 - - Fix (-W)unused-const-variable error found by Clang - - svn path=/trunk/; revision=53935 - -commit 3b59a3b -Author: Pascal Quantin -Date: Wed Dec 11 12:54:10 2013 +0000 - - Fix an out of bounds access found by ASAN and reported by Alexis: - - ==21553==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fffbc0b2a5e at pc 0x7fe8684147a3 bp 0x7fffbc0b2950 sp 0x7fffbc0b2948 - READ of size 2 at 0x7fffbc0b2a5e thread T0 - #0 0x7fe8684147a2 in dissect_schedule_message /home/alagoutte/wireshark-clang/epan/dissectors/packet-gsm_cbch.c:309 - #1 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 - #2 0x7fe867eda42c in call_dissector_only /home/alagoutte/wireshark-clang/epan/packet.c:2139 - #3 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 - #4 0x7fe867ed735b in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030 - #5 0x7fe868a3ebd4 in decode_udp_ports /home/alagoutte/wireshark-clang/epan/dissectors/packet-udp.c:411 - #6 0x7fe868a41886 in dissect /home/alagoutte/wireshark-clang/epan/dissectors/packet-udp.c:747 - #7 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 - #8 0x7fe867ed6d03 in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030 - #9 0x7fe8684eaa1f in dissect_ip /home/alagoutte/wireshark-clang/epan/dissectors/packet-ip.c:2401 - #10 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 - #11 0x7fe867ed735b in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030 - #12 0x7fe868333e98 in dissect_ethertype /home/alagoutte/wireshark-clang/epan/dissectors/packet-ethertype.c:305 - #13 0x7fe867ed707d in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:508 - #14 0x7fe867eda42c in call_dissector_only /home/alagoutte/wireshark-clang/epan/packet.c:2139 - #15 0x7fe8683328ad in dissect_eth_common /home/alagoutte/wireshark-clang/epan/dissectors/packet-eth.c:472 - #16 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 - #17 0x7fe867ed735b in dissector_try_uint_new /home/alagoutte/wireshark-clang/epan/packet.c:1030 - #18 0x7fe868382460 in dissect_frame /home/alagoutte/wireshark-clang/epan/dissectors/packet-frame.c:485 - #19 0x7fe867ed70a9 in call_dissector_through_handle /home/alagoutte/wireshark-clang/epan/packet.c:512 - #20 0x7fe867eda42c in call_dissector_only /home/alagoutte/wireshark-clang/epan/packet.c:2139 - #21 0x7fe867ed5baf in call_dissector /home/alagoutte/wireshark-clang/epan/packet.c:2169 - #22 0x7fe867eb6388 in epan_dissect_run_with_taps /home/alagoutte/wireshark-clang/epan/epan.c:329 - #23 0x4a0ef9 in process_packet /home/alagoutte/wireshark-clang/tshark.c:3434 - #24 0x49c985 in load_cap_file /home/alagoutte/wireshark-clang/tshark.c:3237 - #25 0x7fe860e8ede4 in __libc_start_main /build/buildd/eglibc-2.17/csu/libc-start.c:260 - #26 0x48586c in _start ??:? - - Address 0x7fffbc0b2a5e is located in stack of thread T0 at offset 126 in frame - #0 0x7fe86841353f in dissect_cbch /home/alagoutte/wireshark-clang/epan/dissectors/packet-gsm_cbch.c:345 - - This frame has 2 object(s): - [32, 80) 'new_slots.i' - [128, 224) 'other_slots.i' <== Memory access at offset 126 underflows this variable - HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext - (longjmp and C++ exceptions *are* supported) - SUMMARY: AddressSanitizer: stack-buffer-overflow ??:0 ?? - - - svn path=/trunk/; revision=53934 - -commit c25611b -Author: Martin Mathieson -Date: Wed Dec 11 11:15:35 2013 +0000 - - Remove an unused variable - - svn path=/trunk/; revision=53933 - -commit c72fa5e -Author: Martin Mathieson -Date: Wed Dec 11 11:03:29 2013 +0000 - - Convert to new-style dissector, change crcStatusValid to a gboolean, and rework DRX timers (again) - - svn path=/trunk/; revision=53932 - -commit 453f98c -Author: Anders Broman -Date: Wed Dec 11 06:29:17 2013 +0000 - - #if 0 unused function. - - svn path=/trunk/; revision=53931 - -commit 07c5bb3 -Author: Anders Broman -Date: Wed Dec 11 06:10:45 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53930 - -commit a155364 -Author: Evan Huus -Date: Tue Dec 10 23:23:26 2013 +0000 - - Pass the correct uuid when recursing (the other one is a temporary var that may - not be initialized). - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9535 - - svn path=/trunk/; revision=53929 - -commit 3889cfc -Author: Gerald Combs -Date: Tue Dec 10 22:38:35 2013 +0000 - - From Deon van der Westhuysen via bug 9537: - - ---- - The qt version of wireshark (stats_tree_dialog.cpp) by default expands - all nodes within a stats_tree (see for example the "Statistics" > "IP - Statistics" > "IP Destinations" stats_tree; you need this patch - installed before the item is added to the stats menu: - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9528). This - behaviour is fine for small trees but becomes counter productive in - trees with many items or levels. - - This patch changes the qt ui to act like the gtk ui: the first level of - nodes are expanded by default while deeper levels are collapsed. - ---- - - From me: "Expand all" makes sense for a small number of items. Do so if - we have less than 100. - - svn path=/trunk/; revision=53928 - -commit 20c7414 -Author: Martin Kaiser -Date: Tue Dec 10 22:08:07 2013 +0000 - - use large positve values for illegal DVB-SI string encodings - - interpret encoding fields as UINT32 so that the displayed value matches - the actual bytes in the packet - - svn path=/trunk/; revision=53927 - -commit 67912bf -Author: Chris Maynard -Date: Tue Dec 10 22:06:22 2013 +0000 - - Trivial: The file name is prefs_capture.c, not capture_prefs.c - - svn path=/trunk/; revision=53926 - -commit c856b1b -Author: Martin Kaiser -Date: Tue Dec 10 22:05:54 2013 +0000 - - use the new SI string routines in DVB-CI - - svn path=/trunk/; revision=53925 - -commit 3ec7cbf -Author: Chris Maynard -Date: Tue Dec 10 22:04:30 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53924 - -commit 90f5dea -Author: Chris Maynard -Date: Tue Dec 10 22:04:00 2013 +0000 - - Where appropriate, reject the packet entirely or at least protect against data being NULL. - - svn path=/trunk/; revision=53923 - -commit a57b528 -Author: Chris Maynard -Date: Tue Dec 10 22:01:55 2013 +0000 - - Reject packets if data (and usb_trans_info) are NULL. Also, new-syle dissectors return the number of bytes dissected, not TRUE/FALSE. - - svn path=/trunk/; revision=53922 - -commit 1032078 -Author: Chris Maynard -Date: Tue Dec 10 21:56:48 2013 +0000 - - Trival: spaces -> tab. - - svn path=/trunk/; revision=53921 - -commit c8c5ea1 -Author: Gerald Combs -Date: Tue Dec 10 21:44:12 2013 +0000 - - QComboBox::setCurrentText() exits in Qt3 and Qt5 but not Qt4. - - svn path=/trunk/; revision=53920 - -commit ed80d7a -Author: Gerald Combs -Date: Tue Dec 10 21:43:14 2013 +0000 - - Add a missing semicolon. - - svn path=/trunk/; revision=53919 - -commit 440a180 -Author: Anders Broman -Date: Tue Dec 10 21:30:13 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53918 - -commit 7b4b912 -Author: Gerald Combs -Date: Tue Dec 10 21:27:09 2013 +0000 - - Fix prototypes. - - svn path=/trunk/; revision=53917 - -commit 4cd6759 -Author: Chris Maynard -Date: Tue Dec 10 21:12:52 2013 +0000 - - Remove _U_ from dissect_usb_com_bulk()'s data parameter; it is used. - - svn path=/trunk/; revision=53916 - -commit 1c9b5df -Author: Gerald Combs -Date: Tue Dec 10 21:07:26 2013 +0000 - - Add "Decode As" to the packet list and protocol tree context menus. - Automatically add a new item if "Decode As" is triggered from the - context menus. - - svn path=/trunk/; revision=53915 - -commit b007fcc -Author: Chris Maynard -Date: Tue Dec 10 20:49:11 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53914 - -commit 5be6dd5 -Author: Gerald Combs -Date: Tue Dec 10 20:23:33 2013 +0000 - - Remove config.h includes from proto.h and tap.h. - - svn path=/trunk/; revision=53913 - -commit 61461cc -Author: Gerald Combs -Date: Tue Dec 10 20:00:02 2013 +0000 - - Fix compilation on Windows. - - svn path=/trunk/; revision=53912 - -commit 9bdd3bb -Author: Anders Broman -Date: Tue Dec 10 19:50:20 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53911 - -commit 17a67c3 -Author: Gerald Combs -Date: Tue Dec 10 19:23:26 2013 +0000 - - Get the "Decode As" dialog working, albeit with a few warts. It differs - from the GTK flavor in two major ways: - - - The "Decode As" and "User Specified Decodes" dialog have been unified. - - You can modify the decode as behavior at any time, not just when you - have a packet selected. - - Revert part of 53498 so that we can move items marked - - /*** THE FOLLOWING SHOULD NOT BE USED BY ANY DISSECTORS!!! ***/ - - from epan/decode_as.h to ui/decode_as_utils.h. - - Move "save" code from decode_as_dlg.c to decode_as_utils.c as well. - - In packet-dcerpc.c don't register a table named "ethertype". We might - want to add checks for duplicate table names. - - To do: - - Add support for ranges? - - Either add support for DCERPC or make DCERPC use a regular dissector - table. - - Fix string selectors (i.e. BER). - - - svn path=/trunk/; revision=53910 - -commit 5fa7d37 -Author: Jakub Zawadzki -Date: Tue Dec 10 19:13:09 2013 +0000 - - Fix epan building with undefined HAVE_PLUGINS - - + guard prototypes with HAVE_PLUGINS in .h files to get errors before linking. - - svn path=/trunk/; revision=53909 - -commit 25ce6c2 -Author: Anders Broman -Date: Tue Dec 10 17:41:57 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53908 - -commit 706c629 -Author: Irene Rüngeler -Date: Tue Dec 10 15:39:16 2013 +0000 - - Add uat preferences to SCTP (QT only). - - svn path=/trunk/; revision=53907 - -commit 85d8477 -Author: Irene Rüngeler -Date: Tue Dec 10 15:33:07 2013 +0000 - - Use PT_TXTMOD_NONE for columns that should not be editable. - - svn path=/trunk/; revision=53906 - -commit 939e04e -Author: Chris Maynard -Date: Tue Dec 10 15:31:29 2013 +0000 - - In dissect_ldss_transfer(), reject the packet if data is NULL. Fix some typos. - - svn path=/trunk/; revision=53905 - -commit 7eb15db -Author: Irene Rüngeler -Date: Tue Dec 10 15:29:43 2013 +0000 - - Do not show uat preferences if not registered for the gui. - - svn path=/trunk/; revision=53904 - -commit 0d31c84 -Author: Stig Bjørlykke -Date: Tue Dec 10 14:43:15 2013 +0000 - - Removed debug output. - - svn path=/trunk/; revision=53903 - -commit ff42551 -Author: Martin Kaiser -Date: Tue Dec 10 10:52:29 2013 +0000 - - comment out unused functions - - fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9538 - reported by Yaniv Kaul - - svn path=/trunk/; revision=53902 - -commit acf2fed -Author: Anders Broman -Date: Tue Dec 10 06:01:16 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53901 - -commit af4cbd0 -Author: Chris Maynard -Date: Tue Dec 10 03:56:51 2013 +0000 - - Remove _U_ from dissect_wol's and dissect_wolheur's data argument; they both pass it to dissect_wol_pdu, which doesn't actually use it, but technically they do. - - svn path=/trunk/; revision=53900 - -commit 6e37321 -Author: Chris Maynard -Date: Tue Dec 10 03:33:50 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53899 - -commit c5e3581 -Author: Chris Maynard -Date: Tue Dec 10 03:25:04 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53898 - -commit ca174ae -Author: Chris Maynard -Date: Tue Dec 10 03:11:34 2013 +0000 - - Remove _U_ from dissect_carp's data argument; it's passed to test_carp_packet(), which doesn't actually use it, but dissect_carp technically does. - - svn path=/trunk/; revision=53897 - -commit babc735 -Author: Chris Maynard -Date: Mon Dec 9 22:38:42 2013 +0000 - - Reject the packet if data is NULL. For now, leave the DISSECTOR_ASSERT(rose_ctx_tmp) since get_rose_ctx() also checks the signature, which might be invalid even if data is not NULL. - - svn path=/trunk/; revision=53896 - -commit 79fa0d0 -Author: Chris Maynard -Date: Mon Dec 9 22:23:44 2013 +0000 - - Reject the packet if data is NULL without doing anything else. - - Note: We *might* want to do _something_ but that _something_ should be well-defined and consistent across all dissectors. Previously, some dissectors called proto_tree_add_text() to add some error message text to the tree, while others called DISSECTOR_ASSERT(). - - svn path=/trunk/; revision=53895 - -commit e3c369e -Author: Chris Maynard -Date: Mon Dec 9 21:33:54 2013 +0000 - - Minor whitespace changes and to keep the GNU-syle indentation scheme consistent. - - svn path=/trunk/; revision=53894 - -commit aba06b5 -Author: Chris Maynard -Date: Mon Dec 9 21:20:52 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53893 - -commit b369351 -Author: Martin Kaiser -Date: Mon Dec 9 21:14:45 2013 +0000 - - ignore empty texts - - svn path=/trunk/; revision=53892 - -commit 17cb36a -Author: Martin Kaiser -Date: Mon Dec 9 21:06:58 2013 +0000 - - use the DVB-SI string hadling for the short event descriptor - - svn path=/trunk/; revision=53891 - -commit 3dbf837 -Author: Martin Kaiser -Date: Mon Dec 9 20:58:57 2013 +0000 - - add editor modelines - - svn path=/trunk/; revision=53890 - -commit cdd716e -Author: Chris Maynard -Date: Mon Dec 9 20:55:49 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53889 - -commit 5422134 -Author: Martin Kaiser -Date: Mon Dec 9 20:52:39 2013 +0000 - - TABs -> spaces - add editor modelines - - svn path=/trunk/; revision=53888 - -commit e383ad9 -Author: Chris Maynard -Date: Mon Dec 9 20:51:32 2013 +0000 - - From packet-ua, pass a pointer to direction rather than direction itself. In packet-ua3g, reject the packet if data is NULL. - - svn path=/trunk/; revision=53887 - -commit cb1cb94 -Author: Martin Kaiser -Date: Mon Dec 9 20:46:27 2013 +0000 - - From Jakub - support DVB-SI character tables (EN 300 468) in a generic way - - From me - move things to charsets.c/.h - distinguish between single and multi byte encoding for some tables - (so that the highlighted bytes match the displayed value) - no character table byte -> length 0, use default table - - svn path=/trunk/; revision=53886 - -commit 3ae2e5e -Author: Jakub Zawadzki -Date: Mon Dec 9 20:15:47 2013 +0000 - - Fix warnings - - svn path=/trunk/; revision=53885 - -commit 8aebe15 -Author: Martin Kaiser -Date: Mon Dec 9 17:51:48 2013 +0000 - - fix compilation without GNUTLS and libgcrypt - - move from_hex_char() and from_hex() outside ifdef gnutls - add dummy ssl_generate_pre_master_secret() - - this should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9529 - - svn path=/trunk/; revision=53884 - -commit edce820 -Author: Chris Maynard -Date: Mon Dec 9 16:32:15 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53883 - -commit 494d32a -Author: Chris Maynard -Date: Mon Dec 9 15:45:59 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53882 - -commit 3be739a -Author: Jörg Mayer -Date: Mon Dec 9 11:54:05 2013 +0000 - - Add TLV 16 (Interface name) - - svn path=/trunk/; revision=53881 - -commit a2b2dd4 -Author: Irene Rüngeler -Date: Mon Dec 9 10:07:33 2013 +0000 - - Add a function and an enum to register an uat preference for QT only. - - svn path=/trunk/; revision=53880 - -commit 293e390 -Author: Pascal Quantin -Date: Mon Dec 9 08:56:06 2013 +0000 - - Use an item for USSD text - - svn path=/trunk/; revision=53879 - -commit 2f79fbd -Author: Irene Rüngeler -Date: Mon Dec 9 07:34:52 2013 +0000 - - Fix clang warning. - - svn path=/trunk/; revision=53878 - -commit b693f74 -Author: Anders Broman -Date: Mon Dec 9 06:50:09 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53877 - -commit 0d46cda -Author: Anders Broman -Date: Mon Dec 9 06:20:42 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53876 - -commit f91eba7 -Author: Jakub Zawadzki -Date: Sun Dec 8 23:16:06 2013 +0000 - - Fix some warnings: cast discards `__attribute__((const))' qualifier from pointer target type - - svn path=/trunk/; revision=53875 - -commit 2b0797a -Author: Jakub Zawadzki -Date: Sun Dec 8 22:16:22 2013 +0000 - - It's DTLS failing not DVB_CI. - - svn path=/trunk/; revision=53874 - -commit 6e2465b -Author: Anders Broman -Date: Sun Dec 8 22:11:18 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53873 - -commit 4124b7a -Author: Anders Broman -Date: Sun Dec 8 22:02:12 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53872 - -commit 23c9eb2 -Author: Jakub Zawadzki -Date: Sun Dec 8 21:29:30 2013 +0000 - - Try to check why test.sh fails. - - svn path=/trunk/; revision=53871 - -commit 3ccec6e -Author: Graham Bloice -Date: Sun Dec 8 21:28:29 2013 +0000 - - Add MSC version for VS2013. - - svn path=/trunk/; revision=53870 - -commit a944c8e -Author: Pascal Quantin -Date: Sun Dec 8 20:15:07 2013 +0000 - - Remove proto_tree_add_unicode_string() - - svn path=/trunk/; revision=53869 - -commit 0826029 -Author: Pascal Quantin -Date: Sun Dec 8 20:13:50 2013 +0000 - - Add a reference to STR_ASCII and STR_UNICODE - - svn path=/trunk/; revision=53868 - -commit 93398e7 -Author: Pascal Quantin -Date: Sun Dec 8 20:03:15 2013 +0000 - - Use STR_UNICODE display instead of proto_tree_add_unicode_string() in the remaining dissectors - - svn path=/trunk/; revision=53867 - -commit 2dd25c2 -Author: Jakub Zawadzki -Date: Sun Dec 8 20:00:19 2013 +0000 - - check licence: fix FSF address. - - svn path=/trunk/; revision=53866 - -commit b61dd3c -Author: Jakub Zawadzki -Date: Sun Dec 8 19:55:46 2013 +0000 - - Encoding table for ISO/IEC 8859-2: make code points in the range 0x80-0x9F map to 0x80-0x9F (Guy Harris). - - svn path=/trunk/; revision=53865 - -commit 6445626 -Author: Jakub Zawadzki -Date: Sun Dec 8 19:30:33 2013 +0000 - - Improve netlink dissection: - - - add standard message types - - add dissection for WS_RTM_*NEIGH - - add BASE_CUSTOM functions to print bitfields - - svn path=/trunk/; revision=53864 - -commit fab9e52 -Author: Pascal Quantin -Date: Sun Dec 8 18:46:38 2013 +0000 - - Try to please OSX-10.5-x86 buildbot - - svn path=/trunk/; revision=53863 - -commit 5db0452 -Author: Anders Broman -Date: Sun Dec 8 16:50:07 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53862 - -commit 8983ae0 -Author: Anders Broman -Date: Sun Dec 8 16:40:49 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53861 - -commit c9884f5 -Author: Anders Broman -Date: Sun Dec 8 15:52:29 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53860 - -commit b630cce -Author: Anders Broman -Date: Sun Dec 8 15:40:10 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53859 - -commit b7d6205 -Author: Anders Broman -Date: Sun Dec 8 15:14:32 2013 +0000 - - ../../epan/address.h:63:17: warning: comma at end of enumerator list [-pedantic] - - svn path=/trunk/; revision=53856 - -commit 4f446fe -Author: Gerald Combs -Date: Sun Dec 8 15:03:43 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-12-08] - - svn path=/trunk/; revision=53855 - -commit 17a94af -Author: Jakub Zawadzki -Date: Sun Dec 8 13:28:01 2013 +0000 - - netlink-route: extend Interface IP address dissections - - + try to fix make dist - - svn path=/trunk/; revision=53854 - -commit d6ca007 -Author: Jakub Zawadzki -Date: Sun Dec 8 12:43:46 2013 +0000 - - Fix buildbot: - packet-netlink-route.c:672: warning: request for implicit conversion from 'void *' to 'struct packet_netlink_data *' not permitted in C++ - - svn path=/trunk/; revision=53853 - -commit fa01b39 -Author: Jakub Zawadzki -Date: Sun Dec 8 12:42:10 2013 +0000 - - Add more LINUX_AF_* values, create value_string_ext for them. Use it in netlink, nflog. - - svn path=/trunk/; revision=53852 - -commit 4af107e -Author: Jakub Zawadzki -Date: Sun Dec 8 12:34:56 2013 +0000 - - Make VALUE_STRING_EXT_INIT use G_N_ELEMENTS macro instead of array_length. - - array_length() requires including packet.h - - svn path=/trunk/; revision=53851 - -commit 6e928c4 -Author: Jakub Zawadzki -Date: Sun Dec 8 12:01:32 2013 +0000 - - Add initial dissectors for netlink, and netlink route subsystem. - - svn path=/trunk/; revision=53850 - -commit 5ed31d2 -Author: Alexis La Goutte -Date: Sun Dec 8 11:10:04 2013 +0000 - - From David Ameiss via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9509 - - qtshark Flow Graph displays wrong information in comments column - - In qtshark, the flow graph is displaying the the frame label in the comments field. A simple fix, the patch is attached. - - svn path=/trunk/; revision=53849 - -commit 006f84a -Author: Alexis La Goutte -Date: Sun Dec 8 11:09:54 2013 +0000 - - From Deon van der Westhuysen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452 - - Patch: Stats_tree enhancements for sorting, averages and burst rate - - Add sort, save-as and new columns to Qt ui, remove old functions - - stats_tree.c / stats_tree_priv.h: Make all columns sortable. Remove unneeded functions stats_tree_get_strs_from_node, stats_tree_branch_to_str and stats_tree_is_sortable_column. - - stats_tree_stat.c: Set all columns sortable. - - stats_tree_dialog.cpp / stats_tree_dialog.h: Add new stats_tree columns. Make columns sortable. Remove copy to csv and copy to yaml buttons. Add copy to clipboard as plain text and save as buttons. - - stats_tree_dialog.ui: Remove copy to csv and copy to yaml buttons. Add copy to clipboard as plain text and save as buttons. Only define one column in ui, rest are added dynmically. - - From me : fix trailing whitespace - - svn path=/trunk/; revision=53848 - -commit 4ed05f2 -Author: Alexis La Goutte -Date: Sun Dec 8 11:09:43 2013 +0000 - - Remove trailing whitespace - - svn path=/trunk/; revision=53847 - -commit 4a33c88 -Author: Alexis La Goutte -Date: Sun Dec 8 11:09:30 2013 +0000 - - Fix indent (use 4 spaces) and add modelines - - svn path=/trunk/; revision=53846 - -commit 34ac401 -Author: Michael Mann -Date: Sun Dec 8 02:48:24 2013 +0000 - - RLC dissector cannot assemble PDUs with SNs skipped and wrap-arounded. Bug 9505 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9505) - - From Nobuyuki Tsushima - - svn path=/trunk/; revision=53845 - -commit 30b49ce -Author: Michael Mann -Date: Sun Dec 8 02:27:52 2013 +0000 - - IPsec ESP: add AES-GCM decryption. Bug 8395 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8395) - - Insert Any 64bit authnetication option so AES-GCM with 8 byte ICV - - From Alexandru Juncu - - svn path=/trunk/; revision=53844 - -commit 6c5a93d -Author: Michael Mann -Date: Sun Dec 8 02:12:48 2013 +0000 - - Fix invalid read and correct PSK upper bound. Bug 9512 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9512) - - From Peter Wu. - - svn path=/trunk/; revision=53843 - -commit 21ca76a -Author: Michael Mann -Date: Sun Dec 8 01:52:02 2013 +0000 - - dtls: fix buffer overflow in mac check. Bug 9512 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9512) - - From Hauke Mehrtens - - svn path=/trunk/; revision=53842 - -commit 20e0d85 -Author: Michael Mann -Date: Sun Dec 8 01:35:39 2013 +0000 - - Fix signed/insigned mismatch in ErlDP dissector. Bug 9525 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9525) - - From Peter Lemenkov - - svn path=/trunk/; revision=53841 - -commit e1c994f -Author: Guy Harris -Date: Sun Dec 8 01:28:00 2013 +0000 - - It's ISO 8859-1, not "ISO 18859-1", at least according to ANSI/ASHRAE - Standard 135-2004. - - Use tvb_get_string_enc() wherever possible. - - svn path=/trunk/; revision=53840 - -commit b4b18b3 -Author: Guy Harris -Date: Sun Dec 8 01:21:58 2013 +0000 - - Expand a comment. - - svn path=/trunk/; revision=53839 - -commit 5c4a125 -Author: Michael Mann -Date: Sun Dec 8 01:15:55 2013 +0000 - - Correctly update the data length of the SCSI payload within ISCSI. Bug 9521 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9521) - - From Yaniv Kaul - - svn path=/trunk/; revision=53838 - -commit 562348f -Author: Guy Harris -Date: Sun Dec 8 01:05:35 2013 +0000 - - Add ENC_ISO_8859_1. - - Move the Wikipedia links for the code page layouts in front of the - tables whose contents reflect the code page layouts. - - svn path=/trunk/; revision=53837 - -commit 0f05597 -Author: Michael Mann -Date: Sun Dec 8 00:58:06 2013 +0000 - - DTLS decryption enhancements. Bug 9499 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9499) - - From Hauke Mehrtens - - 1. dtls: set ssl_set_server() in DTLS dissector so wireshark knows if this is client or server - 2. SSL: add decrypt support for CCM and CCM_8 Ciphers per rfc 6655 - 3. dtls: add psk decrypt support - - svn path=/trunk/; revision=53836 - -commit 7d10a41 -Author: Chris Maynard -Date: Sat Dec 7 23:27:36 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53835 - -commit 4904620 -Author: Jakub Zawadzki -Date: Sat Dec 7 23:25:36 2013 +0000 - - Add WTAP_ENCAP_NETLINK which maps to DLT_NETLINK /253/ - - svn path=/trunk/; revision=53834 - -commit 3c2bd00 -Author: Guy Harris -Date: Sat Dec 7 22:45:37 2013 +0000 - - Note what the two new character encoding tables in charsets.c are. - - svn path=/trunk/; revision=53833 - -commit c193f9c -Author: Jakub Zawadzki -Date: Sat Dec 7 19:46:05 2013 +0000 - - Use strutil xml_escape() function - - svn path=/trunk/; revision=53832 - -commit a2b9f02 -Author: Guy Harris -Date: Sat Dec 7 19:43:59 2013 +0000 - - Fix some cases where STR_UNICODE was used with FT_DOUBLE. - - svn path=/trunk/; revision=53831 - -commit f38af18 -Author: Martin Kaiser -Date: Sat Dec 7 17:56:39 2013 +0000 - - add a decryption test for DVB-CI to the testsuite - - svn path=/trunk/; revision=53830 - -commit 333fea4 -Author: Jakub Zawadzki -Date: Sat Dec 7 17:49:41 2013 +0000 - - Add missing consts. - - svn path=/trunk/; revision=53829 - -commit fa5083e -Author: Martin Kaiser -Date: Sat Dec 7 17:40:02 2013 +0000 - - make SAC message padding filterable - - svn path=/trunk/; revision=53828 - -commit 7ab1866 -Author: Jakub Zawadzki -Date: Sat Dec 7 15:48:35 2013 +0000 - - Drop proto_tree_add_unicode_string() from IP, IPv6, JSON dissectors. - - Set .display to STR_UNICODE (instead of STR_ASCII). - - svn path=/trunk/; revision=53827 - -commit 0e5bc8a -Author: Jakub Zawadzki -Date: Sat Dec 7 15:02:55 2013 +0000 - - Add string encoding for ISO/IEC 8859-2 (ENC_ISO_8859_2) - - svn path=/trunk/; revision=53826 - -commit e67762e -Author: Pascal Quantin -Date: Sat Dec 7 14:38:16 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9524 : - Fix typo in erldp dissector - - svn path=/trunk/; revision=53825 - -commit cff7d45 -Author: Pascal Quantin -Date: Sat Dec 7 14:36:54 2013 +0000 - - From Mathias Guettler via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9523 : - Fix ISO 10747 (IDRP) incorrect handling of data in IDRP ERROR PDU's - - svn path=/trunk/; revision=53824 - -commit 1560949 -Author: Jakub Zawadzki -Date: Sat Dec 7 11:55:22 2013 +0000 - - gadu-gadu: use STR_UNICODE display instead of proto_tree_add_unicode_string(). - - svn path=/trunk/; revision=53823 - -commit ffb4e79 -Author: Jakub Zawadzki -Date: Sat Dec 7 11:50:43 2013 +0000 - - Add STR_ASCII, STR_UNICODE as possible displays for field_display_e - - svn path=/trunk/; revision=53822 - -commit eb252d2 -Author: Anders Broman -Date: Sat Dec 7 11:37:58 2013 +0000 - - - Make local functions static. - - Forward declaration of register functions. - - svn path=/trunk/; revision=53821 - -commit c67d38c -Author: Jakub Zawadzki -Date: Sat Dec 7 10:41:42 2013 +0000 - - Rename base_display_* to field_display - - This is preparation to support ->display for FT_STRING values. - - svn path=/trunk/; revision=53820 - -commit 113b078 -Author: Jakub Zawadzki -Date: Sat Dec 7 10:10:03 2013 +0000 - - Add new string proto encoding for windows-1250 (ENC_WINDOWS_1250) - - - Move windows-1250 to unicode encoding table to charset.c - - Add tvb_get_string_unichar2, tvb_get_stringz_unichar2 functions which recode tvb-string to UTF-8. - - svn path=/trunk/; revision=53819 - -commit b3c9332 -Author: Jakub Zawadzki -Date: Sat Dec 7 09:14:35 2013 +0000 - - Remove #if 0 inverse_bit_mask8 array. - - It was only used by tvb_get_bits_buf (removed in r53183). - - svn path=/trunk/; revision=53818 - -commit cc71d21 -Author: Anders Broman -Date: Sat Dec 7 08:34:39 2013 +0000 - - - Make local functions static. - - Forward declaration of register function. - - svn path=/trunk/; revision=53817 - -commit cc5543f -Author: Michael Mann -Date: Sat Dec 7 01:01:31 2013 +0000 - - Bluetooth enhancements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446) - - Bluetooth: SCO: Add Source/Destination addresses - Bluetooth: HCRP: Use information from SDP to decoding PSM payload - - From Michal Labedzki - - svn path=/trunk/; revision=53816 - -commit c1ef044 -Author: Jakub Zawadzki -Date: Fri Dec 6 23:23:44 2013 +0000 - - Move tvb_uncompress() to tvbuff_zlib.c - - svn path=/trunk/; revision=53815 - -commit 895f83b -Author: Alexis La Goutte -Date: Fri Dec 6 16:41:05 2013 +0000 - - Fix indent (use 4 spaces) Remove trailing whitespace Add Modelines - - svn path=/trunk/; revision=53814 - -commit e820340 -Author: Alexis La Goutte -Date: Fri Dec 6 16:40:55 2013 +0000 - - Add Modelines info - - svn path=/trunk/; revision=53813 - -commit d5c3c08 -Author: Alexis La Goutte -Date: Fri Dec 6 16:40:44 2013 +0000 - - Fix (-W)unused-const-variable error found by Clang - - svn path=/trunk/; revision=53812 - -commit 138cb0e -Author: Pascal Quantin -Date: Fri Dec 6 16:37:20 2013 +0000 - - Update svn properties - - svn path=/trunk/; revision=53811 - -commit ae37302 -Author: Irene Rüngeler -Date: Fri Dec 6 14:45:06 2013 +0000 - - Add assoc_index to the properties that can be filtered. - Find the association for each packet. - - svn path=/trunk/; revision=53810 - -commit d1e904b -Author: Alexis La Goutte -Date: Fri Dec 6 10:24:58 2013 +0000 - - From Thomas ERSFELD (GSoC13) - - Hiding monitor column when not available - - svn path=/trunk/; revision=53809 - -commit f9c27ac -Author: Alexis La Goutte -Date: Fri Dec 6 10:24:50 2013 +0000 - - Fix warning when launch Qt Port - - QMetaObject::connectSlotsByName: No matching signal for on_tbInterfaces_hideEvent(QHideEvent*) - QMetaObject::connectSlotsByName: No matching signal for on_tbInterfaces_showEvent(QShowEvent*) - Object::connect: No such slot CaptureInterfacesDialog::tableItemPressed(QTableWidgetItem *) - Object::connect: (sender name: 'tbInterfaces') - Object::connect: (receiver name: 'CaptureInterfacesDialog') - - svn path=/trunk/; revision=53808 - -commit 8cfb238 -Author: Alexis La Goutte -Date: Fri Dec 6 10:24:41 2013 +0000 - - Fix ui/qt/capture_interfaces_dialog.ui: Warning: The name 'layoutWidget' (QWidget) is already in use - - svn path=/trunk/; revision=53807 - -commit 7a5cf63 -Author: Alexis La Goutte -Date: Fri Dec 6 08:37:48 2013 +0000 - - Fix wireshark/epan/dissectors/packet-j1939.c:313: multiple definition of `proto_register_devicenet' - - svn path=/trunk/; revision=53806 - -commit 04a8ed2 -Author: Alexis La Goutte -Date: Fri Dec 6 08:09:56 2013 +0000 - - Fix packet-j1939.c:160:42: error: declaration of 'address' shadows a global declaration [-Werror=shadow] - - svn path=/trunk/; revision=53805 - -commit f5136e3 -Author: Alexis La Goutte -Date: Fri Dec 6 08:04:09 2013 +0000 - - Fix unused parameter 'pinfo' - - svn path=/trunk/; revision=53804 - -commit 643f9ef -Author: Michael Mann -Date: Fri Dec 6 04:33:58 2013 +0000 - - Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) - - svn path=/trunk/; revision=53802 - -commit b2be51c -Author: Jörg Mayer -Date: Thu Dec 5 22:50:42 2013 +0000 - - Only try to fix absolute Unix paths. - - svn path=/trunk/; revision=53801 - -commit 13fb0f3 -Author: Martin Kaiser -Date: Thu Dec 5 21:35:25 2013 +0000 - - int -> gboolean - - svn path=/trunk/; revision=53800 - -commit 1f9d8c5 -Author: Martin Kaiser -Date: Thu Dec 5 21:32:05 2013 +0000 - - dissect Operator Profile's error flag - - svn path=/trunk/; revision=53799 - -commit f251011 -Author: Martin Mathieson -Date: Thu Dec 5 15:06:21 2013 +0000 - - Include epan/conv_id.h - some of the buildbot machines have errors without it - - svn path=/trunk/; revision=53798 - -commit eb85d08 -Author: Martin Mathieson -Date: Thu Dec 5 14:45:03 2013 +0000 - - Make launching TCP graphs from conversations window work again, by supplying stream and direction when graph is first created - - svn path=/trunk/; revision=53797 - -commit 125a17f -Author: Guy Harris -Date: Thu Dec 5 09:30:22 2013 +0000 - - Initialize the error-reporting routines before scanning for plugins, as - the code to scan for them uses those routines. - - This means epan_init() no longer takes those routines as arguments - - which is just as well, given that the mechanism in question is no longer - part of libwireshark, but is part of libwsutil. - - This should fix bug 9508. - - svn path=/trunk/; revision=53796 - -commit 78c1172 -Author: Pascal Quantin -Date: Thu Dec 5 06:48:13 2013 +0000 - - Remove non-ASCII character - - svn path=/trunk/; revision=53795 - -commit 5331c54 -Author: Pascal Quantin -Date: Thu Dec 5 06:46:58 2013 +0000 - - Try to please OSX-10.5-x86 buildbot - - svn path=/trunk/; revision=53794 - -commit 03085a5 -Author: Pascal Quantin -Date: Thu Dec 5 06:23:17 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9503 : - Fix dissection of STK SEND SHORT MESSAGE proactive command - - svn path=/trunk/; revision=53793 - -commit 8d0dc9f -Author: Michael Mann -Date: Thu Dec 5 03:36:49 2013 +0000 - - CAN protocols have a CAN ID and up to 8 bytes of data. How the CAN ID and data are presented is the responsibility of the previous layer. Make the interface be passing the CAN ID in dissector data and have the (up to) 8 bytes be the tvb. CAN protocols should treat the CAN ID as "generated" data. - - svn path=/trunk/; revision=53792 - -commit 0ccb4a7 -Author: Jakub Zawadzki -Date: Wed Dec 4 23:59:31 2013 +0000 - - Regenerate ASN.1 dissectors - - It seems that around r53700 GenericChargingDataTypesV1171.asn was called 3GPPGenericChargingDataTypesV1171.asn. - - svn path=/trunk/; revision=53791 - -commit 6244f2f -Author: Jörg Mayer -Date: Wed Dec 4 22:07:26 2013 +0000 - - Finally successfully built with the msvc2010 GUI a Debug - and a RelWithDebInfo build, after adding the missing path - to the cygwin tools. - - svn path=/trunk/; revision=53790 - -commit d576ba0 -Author: Anders Broman -Date: Wed Dec 4 21:35:53 2013 +0000 - - - Forward declaration of register functions. - - svn path=/trunk/; revision=53789 - -commit bbc4a29 -Author: Anders Broman -Date: Wed Dec 4 21:33:38 2013 +0000 - - Try to fix a bunch of [-Wmissing-prototypes] - - svn path=/trunk/; revision=53788 - -commit 53394ac -Author: Jörg Mayer -Date: Wed Dec 4 21:32:16 2013 +0000 - - Fix - - [ 5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-diameter.c.o - /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-diameter.c: In function ‘dissect_diameter_avp’: - /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-diameter.c:621:37: error: ‘avp_str’ may be used uninitialized in this function [-Werror=maybe-uninitialized] - if (avp_str) proto_item_append_text(avp_item," val=%s", avp_str); - ^ - cc1: all warnings being treated as errors - make[2]: *** [epan/CMakeFiles/epan.dir/dissectors/packet-diameter.c.o] Error 1 - - - svn path=/trunk/; revision=53787 - -commit 1a7c42d -Author: Anders Broman -Date: Wed Dec 4 21:12:16 2013 +0000 - - - Make local functions static. - - Forward declaration of register function. - - svn path=/trunk/; revision=53786 - -commit 5c40dde -Author: Anders Broman -Date: Wed Dec 4 20:55:52 2013 +0000 - - "RFC 6733 [5] specifies the Experimental-Result AVP containing Vendor-Id AVP and Experimental-Result-Code AVP. The Experimental-Result-Code AVP (AVP Code 298) is of type Unsigned32 and contains a vendor-assigned value representing the result of processing a request." - - This means we have to store the value of the Vendor Id AVP in the grouped Experimental-Result AVP to be able to dissect the value of - Experimental-Result-Code according to the vendor specified values(if known). This patch implements that with a dissector table to register vendor dissectors for the result code. - - svn path=/trunk/; revision=53785 - -commit a8ed2cf -Author: Chris Maynard -Date: Wed Dec 4 15:59:29 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446 - r53051 introduced an incorrect DISSECTOR_ASSERT(acl_data), which led me to believe that acl_data must not be NULL. Except for the removal of the DISSECTOR_ASSERT(acl_data), this patch basically reverts r53735 and r53743, as acl_data can be NULL. - - svn path=/trunk/; revision=53784 - -commit 50989f3 -Author: Alexis La Goutte -Date: Wed Dec 4 15:13:24 2013 +0000 - - From Matt Texier - - Enhance BGP Dissector : Communities - - Use proto_tree_add_item - - From me - Missing space for well known community - - svn path=/trunk/; revision=53783 - -commit 0a626c3 -Author: Tomas Kukosa -Date: Wed Dec 4 14:45:32 2013 +0000 - - Ply parser updated to 3.5 (from GitHub github.com/dabeaz/ply) - - svn path=/trunk/; revision=53782 - -commit 9252681 -Author: Alexis La Goutte -Date: Wed Dec 4 13:55:53 2013 +0000 - - Add also heuristic for HTTP - - svn path=/trunk/; revision=53781 - -commit cf82d05 -Author: Jörg Mayer -Date: Wed Dec 4 10:41:38 2013 +0000 - - Create all binaries in one directory. After running setpath.bat - wireshark etc should now work, the basic stuff at least. - - Known problems/todos: - - The plugins are not searched for in the current directory, - so find out how to let Wireshark know to search for the - plugins - - Other supporting files are missing (COPYING.txt, AUTHORS*, ...) - - Your missing feature could be listed here ;) - - Ciao - Jörg - - svn path=/trunk/; revision=53780 - -commit 2e0fbbf -Author: Alexis La Goutte -Date: Wed Dec 4 09:53:51 2013 +0000 - - Regenerate dissector after change to add prototype - - svn path=/trunk/; revision=53779 - -commit 6b10f16 -Author: Alexis La Goutte -Date: Wed Dec 4 09:53:21 2013 +0000 - - From Anders request Add prototype for corba/idl dissector - - svn path=/trunk/; revision=53778 - -commit 470a022 -Author: Stig Bjørlykke -Date: Wed Dec 4 09:39:19 2013 +0000 - - Fix for dissecting cdt without having a tree. - - svn path=/trunk/; revision=53777 - -commit 55546d5 -Author: Jörg Mayer -Date: Wed Dec 4 09:10:35 2013 +0000 - - On Windows: - - Add instructions how to build zlib - - Add information how to build with msbuild - - - svn path=/trunk/; revision=53776 - -commit c0663d9 -Author: Jörg Mayer -Date: Wed Dec 4 07:39:37 2013 +0000 - - - Include config.h - - Merge two ifdef _WIN32 sections - - svn path=/trunk/; revision=53775 - -commit b75354e -Author: Jakub Zawadzki -Date: Tue Dec 3 23:49:51 2013 +0000 - - Avoid including in dissectors. - - svn path=/trunk/; revision=53774 - -commit 477add4 -Author: Pascal Quantin -Date: Tue Dec 3 23:08:50 2013 +0000 - - Dissect comprehension-tlv address object - - svn path=/trunk/; revision=53773 - -commit 9812f55 -Author: Guy Harris -Date: Tue Dec 3 23:08:46 2013 +0000 - - Include in files that use display filter - routines. - - svn path=/trunk/; revision=53772 - -commit 2118d75 -Author: Jakub Zawadzki -Date: Tue Dec 3 22:59:29 2013 +0000 - - missing stdlib.h include for wslua. - - svn path=/trunk/; revision=53771 - -commit 5afbad4 -Author: Jakub Zawadzki -Date: Tue Dec 3 22:26:07 2013 +0000 - - Rename struct _epan_dissect_t to epan_dissect. - - svn path=/trunk/; revision=53770 - -commit 65db828 -Author: Jakub Zawadzki -Date: Tue Dec 3 22:16:49 2013 +0000 - - When including don't force inclusion of - - svn path=/trunk/; revision=53769 - -commit dbd9c13 -Author: Jörg Mayer -Date: Tue Dec 3 21:49:28 2013 +0000 - - - Fix lots of "C:\wireshark\trunk\ui\qt\qcustomplot.cpp(16589) : - warning C4305: 'argument' : truncation from 'double' to 'float'" - - Remove trailing whitespace - - - svn path=/trunk/; revision=53768 - -commit bf0de43 -Author: Jakub Zawadzki -Date: Tue Dec 3 21:35:36 2013 +0000 - - Rename struct _uat_t to epan_uat - - Leave typedef (uat_t) unchanged. - - svn path=/trunk/; revision=53767 - -commit cedb73c -Author: Jakub Zawadzki -Date: Tue Dec 3 21:31:04 2013 +0000 - - Dissectors should not use dfilter.h, don't include it. - - XXX ncp2222 dissector is using dfilter_compile(), why? - - svn path=/trunk/; revision=53766 - -commit 82f1fec -Author: Jakub Zawadzki -Date: Tue Dec 3 20:59:25 2013 +0000 - - struct _dfilter_t: rename to epan_dfilter. - - typedef (dfilter_t) not renamed. - - svn path=/trunk/; revision=53765 - -commit 01e08ae -Author: Jakub Zawadzki -Date: Tue Dec 3 20:35:50 2013 +0000 - - wiretap: start using - - svn path=/trunk/; revision=53764 - -commit f98625c -Author: Chris Maynard -Date: Tue Dec 3 19:45:10 2013 +0000 - - Don't forget to test even the simplest fixes. - - svn path=/trunk/; revision=53763 - -commit 8b3f82d -Author: Pascal Quantin -Date: Tue Dec 3 19:44:32 2013 +0000 - - Add request / response tracking to MBIM_FUNCTION_ERROR_MSG messages - - svn path=/trunk/; revision=53762 - -commit c28c8ed -Author: Chris Maynard -Date: Tue Dec 3 19:40:23 2013 +0000 - - Wrap usage text at column 80. - - svn path=/trunk/; revision=53761 - -commit 2d49720 -Author: Pascal Quantin -Date: Tue Dec 3 19:32:10 2013 +0000 - - Add Qualcomm proprietary UUID - - svn path=/trunk/; revision=53760 - -commit a6dea76 -Author: Gerald Combs -Date: Tue Dec 3 18:16:38 2013 +0000 - - The ip.proto table isn't limited to the IPv4 dissector. - - svn path=/trunk/; revision=53759 - -commit e55e699 -Author: Alexis La Goutte -Date: Tue Dec 3 13:48:08 2013 +0000 - - Fix encoding arg Remove tab and trailing whitespace Add modelines info - - svn path=/trunk/; revision=53758 - -commit 062f8a5 -Author: Alexis La Goutte -Date: Tue Dec 3 13:39:10 2013 +0000 - - Manual fix of Dead Store (Dead assignement/Dead increment) warning found by Clang No found how to fix the generator... - - svn path=/trunk/; revision=53757 - -commit 043b37a -Author: Alexis La Goutte -Date: Tue Dec 3 13:38:56 2013 +0000 - - Regenerate idl dissector after last change in generator ! - - svn path=/trunk/; revision=53756 - -commit 6efd311 -Author: Alexis La Goutte -Date: Tue Dec 3 13:38:46 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=53755 - -commit 3fc5a3e -Author: Alexis La Goutte -Date: Tue Dec 3 13:38:38 2013 +0000 - - Add modelines info to idl generate file - - svn path=/trunk/; revision=53754 - -commit de65892 -Author: Alexis La Goutte -Date: Tue Dec 3 13:38:30 2013 +0000 - - Fix indent for generated file (Use 4 space) - - svn path=/trunk/; revision=53753 - -commit a637d81 -Author: Alexis La Goutte -Date: Tue Dec 3 13:38:23 2013 +0000 - - Fix generator don't generate trailing whitespace - - svn path=/trunk/; revision=53752 - -commit 225161b -Author: Alexis La Goutte -Date: Tue Dec 3 13:38:15 2013 +0000 - - Remove trailing whitespace and add modelines info - - svn path=/trunk/; revision=53751 - -commit ede151c -Author: Alexis La Goutte -Date: Tue Dec 3 13:38:07 2013 +0000 - - Remove whitespace and add modelines info - - svn path=/trunk/; revision=53750 - -commit b2445d4 -Author: Alexis La Goutte -Date: Tue Dec 3 13:37:58 2013 +0000 - - Fix - - warning: argument 'data' of command @param is not found in the argument list of dissector_all_tables_foreach_changed(DATFunc func, gpointer user_data) - - warning: The following parameters of dissector_all_tables_foreach_changed(DATFunc func, gpointer user_data) are not documented: parameter 'user_data' - - svn path=/trunk/; revision=53749 - -commit 420b33d -Author: Alexis La Goutte -Date: Tue Dec 3 13:37:49 2013 +0000 - - Fix warning: The following parameters of proto_tree_add_expert_format(proto_tree *tree, packet_info *pinfo, expert_field *eiindex, tvbuff_t *tvb, gint start, gint length, const char *format,...) are not documented: parameter 'format' - - svn path=/trunk/; revision=53748 - -commit 0940471 -Author: Alexis La Goutte -Date: Tue Dec 3 13:37:40 2013 +0000 - - Fix warning: argument 'out/in' of command @param is not found in the argument list of SE_COPY_ADDRESS(to, from) - - svn path=/trunk/; revision=53747 - -commit 76db825 -Author: Alexis La Goutte -Date: Tue Dec 3 13:37:31 2013 +0000 - - Add #pragma to idl generator... - - svn path=/trunk/; revision=53746 - -commit 30d0d8f -Author: Jörg Mayer -Date: Tue Dec 3 13:18:37 2013 +0000 - - Move stats_tree_stat.c back to clean files. - - svn path=/trunk/; revision=53745 - -commit 024c4fc -Author: Michael Mann -Date: Tue Dec 3 12:53:09 2013 +0000 - - Don't allow conversation_data to be NULL. Bug 9493 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9493) - - svn path=/trunk/; revision=53744 - -commit 18e532b -Author: Guy Harris -Date: Tue Dec 3 11:02:00 2013 +0000 - - Remove some no-longer-necessary null pointer checks, as pointed out by - Coverity; dissect_btl2cap() now returns immediately if handed a null - private-data pointer. - - svn path=/trunk/; revision=53743 - -commit 7538119 -Author: Guy Harris -Date: Tue Dec 3 10:54:10 2013 +0000 - - Clean up indentation. - - svn path=/trunk/; revision=53742 - -commit 089e4d9 -Author: Anders Broman -Date: Tue Dec 3 06:20:18 2013 +0000 - - Try to fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=53741 - -commit a21898c -Author: Anders Broman -Date: Tue Dec 3 05:22:47 2013 +0000 - - - copy paste error in parlay - - Add pragmas to remove warnings, this should go into the generation script. - - svn path=/trunk/; revision=53740 - -commit 203ecca -Author: Guy Harris -Date: Mon Dec 2 23:09:08 2013 +0000 - - Space between STANAG and the standard number. - - svn path=/trunk/; revision=53739 - -commit a4c7893 -Author: Jakub Zawadzki -Date: Mon Dec 2 22:38:00 2013 +0000 - - Fix encap_table_base[] array. - - svn path=/trunk/; revision=53738 - -commit 231e52a -Author: Chris Maynard -Date: Mon Dec 2 21:52:46 2013 +0000 - - Reject the packet if data is NULL without doing anything else. - - svn path=/trunk/; revision=53737 - -commit a441a51 -Author: Guy Harris -Date: Mon Dec 2 21:46:06 2013 +0000 - - Link with -lcodecs on UN*X as well. Link with -lwsutil after - -lwireshark, -lwiretap, and -lcodecs, just in case the linker requires - that, if library A uses something from library B, library B be read - after library A. - - svn path=/trunk/; revision=53736 - -commit ae2e12d -Author: Chris Maynard -Date: Mon Dec 2 21:34:23 2013 +0000 - - Reject the packet if data is NULL without doing anything else. - - svn path=/trunk/; revision=53735 - -commit ce7b831 -Author: Guy Harris -Date: Mon Dec 2 21:18:25 2013 +0000 - - No C++/C99 comments, as not all compilers handle them. Use #if 0/#endif - instead. - - svn path=/trunk/; revision=53734 - -commit b5e3775 -Author: Chris Maynard -Date: Mon Dec 2 21:13:29 2013 +0000 - - eject the packet if data is NULL without doing anything else. - - svn path=/trunk/; revision=53733 - -commit 99d9c3d -Author: Chris Maynard -Date: Mon Dec 2 21:05:11 2013 +0000 - - Reject the packet if data is NULL without doing anything else. - - svn path=/trunk/; revision=53732 - -commit ba0e04e -Author: Anders Broman -Date: Mon Dec 2 20:31:42 2013 +0000 - - Character conversion error. - - svn path=/trunk/; revision=53731 - -commit c0407d6 -Author: Anders Broman -Date: Mon Dec 2 20:18:48 2013 +0000 - - Add pragmas to remove warnings, this should go into the generation script. - - svn path=/trunk/; revision=53730 - -commit fb289ae -Author: Guy Harris -Date: Mon Dec 2 19:20:35 2013 +0000 - - Explicitly convert an int to an enum. - - svn path=/trunk/; revision=53729 - -commit 93f15d6 -Author: Chris Maynard -Date: Mon Dec 2 19:17:12 2013 +0000 - - Specify SI units for the max filesize autostop condition. For now, keep the capture buffer size in IEC units, but document it as such. - #BACKPORT(1.10, 1.8(?)) - - svn path=/trunk/; revision=53728 - -commit 5e7b58a -Author: Guy Harris -Date: Mon Dec 2 19:15:14 2013 +0000 - - Make the declaration of stats_tree_format_node_as_str() match the - definition. - - svn path=/trunk/; revision=53727 - -commit 28a1c45 -Author: Guy Harris -Date: Mon Dec 2 19:12:59 2013 +0000 - - Use g_strlcpy() and g_strlcat() to squelch API checker warnings. - - svn path=/trunk/; revision=53726 - -commit e313b15 -Author: Guy Harris -Date: Mon Dec 2 18:58:40 2013 +0000 - - Use ws_fopen() so we properly handle UTF-8 file names on Windows. - - svn path=/trunk/; revision=53725 - -commit 72065e7 -Author: Jörg Mayer -Date: Mon Dec 2 15:55:36 2013 +0000 - - stats_tree_stat.c currently procudes warnings - move to dirty - - svn path=/trunk/; revision=53724 - -commit 3f8128d -Author: Alexis La Goutte -Date: Mon Dec 2 13:46:39 2013 +0000 - - Fix (-W)documentation error found by Clang - - parameter 'sai' not found in the function declaration [-Werror,-Wdocumentation] - - svn path=/trunk/; revision=53723 - -commit 5d53a72 -Author: Alexis La Goutte -Date: Mon Dec 2 13:46:30 2013 +0000 - - Fix (-W)documentation error found by Clang - - error: parameter '...' not found in the function declaration [-Werror,-Wdocumentation] - - svn path=/trunk/; revision=53722 - -commit bd5f16a -Author: Alexis La Goutte -Date: Mon Dec 2 13:46:20 2013 +0000 - - Fix (-W)documentation error found by Clang - - ../../epan/strutil.h:95:11: error: parameter 'line' not found in the function declaration [-Werror,-Wdocumentation] - * @param line A pointer to the input string - ^~~~ - ../../epan/strutil.h:95:11: note: did you mean 'string'? - * @param line A pointer to the input string - ^~~~ - string - - svn path=/trunk/; revision=53721 - -commit 1f3261d -Author: Alexis La Goutte -Date: Mon Dec 2 13:46:10 2013 +0000 - - Fix (-W)documentation error found by Clang - - error: parameter 'addr*[in]' not found in the function declaration [-Werror,-Wdocumentation] - - svn path=/trunk/; revision=53720 - -commit 67c0418 -Author: Alexis La Goutte -Date: Mon Dec 2 13:45:59 2013 +0000 - - Fix (-W)documentation error found by Clang - - error: parameter '...' not found in the function declaration [-Werror,-Wdocumentation] - - svn path=/trunk/; revision=53719 - -commit acccbc7 -Author: Jörg Mayer -Date: Mon Dec 2 13:00:06 2013 +0000 - - nmake: Allow setting the wireshark base dir via env variable - - svn path=/trunk/; revision=53718 - -commit 20799bd -Author: Jörg Mayer -Date: Mon Dec 2 09:50:30 2013 +0000 - - Remove /msvc2010 after ${QT5_BASE_DIR}, it should be part of - the QT5_BASE_DIR value. - - svn path=/trunk/; revision=53717 - -commit 55544b5 -Author: Guy Harris -Date: Mon Dec 2 09:30:31 2013 +0000 - - Get rid of a stray semicolon, as it upsets Sun^WOracle Studio's C - compiler. - - Clean up escape_xml_chars() a bit, so that there's no extra unreached - "return s;", and so that it's clearer that it runs until it hits a NUL. - (XXX - are there GLib routines that will do this?) - - svn path=/trunk/; revision=53716 - -commit 111ee4c -Author: Guy Harris -Date: Mon Dec 2 09:10:29 2013 +0000 - - Don't include wslua headers if we don't have Lua. - - svn path=/trunk/; revision=53715 - -commit c3de2cb -Author: Guy Harris -Date: Mon Dec 2 09:10:13 2013 +0000 - - Don't assume we have Lua just because we have plugin support. - - svn path=/trunk/; revision=53714 - -commit 7c10c3d -Author: Guy Harris -Date: Mon Dec 2 09:06:00 2013 +0000 - - We need to link with the codecs library. - - svn path=/trunk/; revision=53713 - -commit c123b13 -Author: Guy Harris -Date: Mon Dec 2 08:55:38 2013 +0000 - - Make the declaration of stats_tree_format_as_str() match the definition. - - svn path=/trunk/; revision=53712 - -commit 40b60cb -Author: Guy Harris -Date: Mon Dec 2 08:51:46 2013 +0000 - - Do something less catastrophic than crashing if the same name is used in - two codec registrations. - - svn path=/trunk/; revision=53711 - -commit 0cc1545 -Author: Guy Harris -Date: Mon Dec 2 08:30:29 2013 +0000 - - Move most of the plugin code from epan to wsutil and remove all - knowledge of particular types of plugins. Instead, let particular types - of plugins register with the common plugin code, giving a name and a - routine to recognize that type of plugin. - - In particular applications, only process the relevant plugin types. - - Add a Makefile.common to the codecs directory. - - svn path=/trunk/; revision=53710 - -commit baf5691 -Author: Chris Maynard -Date: Mon Dec 2 02:31:33 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53709 - -commit 9b38829 -Author: Chris Maynard -Date: Mon Dec 2 02:31:04 2013 +0000 - - Reject the packet if data is NULL without doing anything else. - - svn path=/trunk/; revision=53708 - -commit acc5fd7 -Author: Chris Maynard -Date: Mon Dec 2 02:18:21 2013 +0000 - - Reject the packet if data is NULL. - - svn path=/trunk/; revision=53707 - -commit 42a64c3 -Author: Chris Maynard -Date: Mon Dec 2 02:07:42 2013 +0000 - - If data is NULL, the bug, if any, is not with *this* dissector, but with whichever one failed to pass the data properly. - - svn path=/trunk/; revision=53706 - -commit a990037 -Author: Chris Maynard -Date: Mon Dec 2 01:53:13 2013 +0000 - - Fix Coverity CID 1134045: Printf format string issue. (As documented in the printf man page for the ' option, "Note that many versions of gcc(1) cannot parse this option and will issue a warning." (r47940 reverted a similar change, so this keeps things consistent.) - - svn path=/trunk/; revision=53705 - -commit 87d3630 -Author: Chris Maynard -Date: Mon Dec 2 00:45:44 2013 +0000 - - Fix Coverity CID 1134046: Structurally dead code. - - svn path=/trunk/; revision=53704 - -commit 70f4223 -Author: Jörg Mayer -Date: Sun Dec 1 22:24:59 2013 +0000 - - The changes to work around the msbuild deficiencies broke - dependeny tracking (replaced the list of dissectors by the file - containing the dissectors). Fix that. - - svn path=/trunk/; revision=53703 - -commit 40c6d9a -Author: Jörg Mayer -Date: Sun Dec 1 21:56:40 2013 +0000 - - Copy over rev 53700 to cmake - - svn path=/trunk/; revision=53702 - -commit 6a34c8c -Author: Jörg Mayer -Date: Sun Dec 1 21:55:21 2013 +0000 - - Small style changes. - - svn path=/trunk/; revision=53701 - -commit 9baa935 -Author: Anders Broman -Date: Sun Dec 1 20:34:21 2013 +0000 - - Update to V11.7.1 (2013-09) - - svn path=/trunk/; revision=53700 - -commit eb8b506 -Author: Bill Meier -Date: Sun Dec 1 16:50:05 2013 +0000 - - If we're including "config.h" when compiling a codec, then /I.. must be part of CFLAGS. - - svn path=/trunk/; revision=53699 - -commit 0c9aa51 -Author: Michael Mann -Date: Sun Dec 1 15:44:22 2013 +0000 - - Patch to include YAML export. Bug 9452 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452) - - From Deon van der Westhuysen - From me: use switch statements instead of if-else - - svn path=/trunk/; revision=53698 - -commit 98c8454 -Author: Gerald Combs -Date: Sun Dec 1 15:03:49 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-12-01] - - svn path=/trunk/; revision=53695 - -commit 7ee8d48 -Author: Michael Mann -Date: Sun Dec 1 13:47:11 2013 +0000 - - Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492) - - From Peter Paluch - - svn path=/trunk/; revision=53694 - -commit c0f974f -Author: Jörg Mayer -Date: Sun Dec 1 10:58:17 2013 +0000 - - Too litte modify in copy - modify - paste cycle - - svn path=/trunk/; revision=53693 - -commit 38b8e4e -Author: Jörg Mayer -Date: Sun Dec 1 10:34:01 2013 +0000 - - Graham Bloice - - Using gtk[23] is a hack. Implement a clean solution. - - Me - - In the current setup, building Qt ONLY is not supported as - lots of required support libraries are only found in gtk2 and - gtk3. Print an error in that case. - - Small style changes (lowercasing, whitespace) - - svn path=/trunk/; revision=53692 - -commit 402df00 -Author: Jörg Mayer -Date: Sun Dec 1 10:10:24 2013 +0000 - - Looks like the problem with redefined symbols is not new, it - just got a few new ones. - Add HAVE_STRING_H and HAVE_STDLIB_H to the list. - - svn path=/trunk/; revision=53691 - -commit 2440000 -Author: Jörg Mayer -Date: Sun Dec 1 10:05:16 2013 +0000 - - - Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying - pcap probably is different from the WinPcap version. - - Set WINPCAP_VERSION for cmake builds to "unknown" - - Oh, the NEWS file changed again. - - svn path=/trunk/; revision=53690 - -commit 6cd4ad7 -Author: Jörg Mayer -Date: Sun Dec 1 09:18:19 2013 +0000 - - SBC -> sbc - On Unix case is relevant, so fix it. - Please try to avoid filenames starting with Upper case, it - makes completion so much easier as I only need to remember the - name and not the case. - - svn path=/trunk/; revision=53689 - -commit a9bd097 -Author: Martin Mathieson -Date: Sun Dec 1 08:52:06 2013 +0000 - - Start teid_data field from the correct offset - - svn path=/trunk/; revision=53688 - -commit da7af5c -Author: Martin Mathieson -Date: Sun Dec 1 08:51:07 2013 +0000 - - Also add filter and expert info for ICMPv6 requests with no responses. - - svn path=/trunk/; revision=53687 - -commit 9972e5f -Author: Michael Mann -Date: Sun Dec 1 03:53:57 2013 +0000 - - Move codecs.[ch] out of epan and into codecs directory. - - This may break easy_codec plugins, but it appears a better/more consistent way is needed to register codecs. See Guy's comments in bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893) - - svn path=/trunk/; revision=53686 - -commit 4e2b6b1 -Author: Gerald Combs -Date: Sun Dec 1 01:53:26 2013 +0000 - - Use 4-space (PEP 8) indentation. Add modelines. - - svn path=/trunk/; revision=53685 - -commit c02bbf9 -Author: Gerald Combs -Date: Sun Dec 1 01:46:45 2013 +0000 - - Use indentation recommended by PEP 8. - - svn path=/trunk/; revision=53684 - -commit 80b4bc0 -Author: Gerald Combs -Date: Sun Dec 1 01:35:13 2013 +0000 - - Fix compatibility with Python 2.5. Tested with 2.5, 2.6, 2.7, and 3.3. - - svn path=/trunk/; revision=53683 - -commit e30fd2f -Author: Jörg Mayer -Date: Sat Nov 30 23:40:25 2013 +0000 - - Looks like the WinPcap version can only be determined from the - name of the compressed archive - which currently means "only by - manual developer intervention". - - svn path=/trunk/; revision=53682 - -commit fbaac2c -Author: Guy Harris -Date: Sat Nov 30 22:17:15 2013 +0000 - - The HAVE_xxx definitions come from config.h; include it. - - svn path=/trunk/; revision=53681 - -commit 8bdf0ad -Author: Guy Harris -Date: Sat Nov 30 22:16:09 2013 +0000 - - Tag arguments to decodeXXX routines as unused iff we don't support the - codec. - - svn path=/trunk/; revision=53680 - -commit ac9b982 -Author: Michael Mann -Date: Sat Nov 30 21:00:21 2013 +0000 - - Better fix for uninitialized variable warning. Part of bug 9452 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452) - - From Peter Wu. - From me: Leave the "result" variable initialized because I'm not sure code analyzers will consider g_assert_not_reached() enough prevention from using uninitialized "result" - - svn path=/trunk/; revision=53679 - -commit fd2f054 -Author: Michael Mann -Date: Sat Nov 30 20:48:46 2013 +0000 - - Update documentation for tcp_dissect_pdus. Bug 9491 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9491) - - From Peter Wu: update to README.dissector - From me: update to WSDG_chapter_dissection.xml - - svn path=/trunk/; revision=53678 - -commit e2d2d12 -Author: Michael Mann -Date: Sat Nov 30 19:26:18 2013 +0000 - - Replace "btsdp" tap with function to query service_infos tree, since that's all dissectors were doing with it. Not used outside of dissectors and cuts down on a few redundant global variables. - - svn path=/trunk/; revision=53677 - -commit d1e4422 -Author: Michael Mann -Date: Sat Nov 30 15:42:14 2013 +0000 - - Add G.722, G.726 and SBC codecs. G.722 and G.726 are from bug 5619 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5619) and SBC is from bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893). - - Codecs are added, but (intentionally) not hooked to the RTP player as a "more generic architecture" is desired. There are some discussions in bug 7893 on how to do this. One thing to add would be how to handle codecs that may not be supported on all platforms. Should the codec not be "registered" at all (with a #define over the whole module) or should it's register functions be stubbed (with a #define in each function that requires a non-supported library) - - svn path=/trunk/; revision=53676 - -commit 021efe4 -Author: Pascal Quantin -Date: Sat Nov 30 12:31:36 2013 +0000 - - Try to please GCC 4.3.2 - - svn path=/trunk/; revision=53675 - -commit d62b116 -Author: Guy Harris -Date: Sat Nov 30 10:17:30 2013 +0000 - - Make the code testing the Rx MCS Bitmask subfield of the Supported MCS - Set field of the HT Capabilities element a bit clearer, and add - comments. - - Fix it so it doesn't assign a variable to itself, as clang warns about - that. - - svn path=/trunk/; revision=53674 - -commit 4e3d829 -Author: Pascal Quantin -Date: Sat Nov 30 09:50:04 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9490 : - Couple packets in RTPproxy dissector not only with CookieID but also with Call-IDs - - svn path=/trunk/; revision=53673 - -commit 8b17996 -Author: Pascal Quantin -Date: Sat Nov 30 08:30:04 2013 +0000 - - Update release notes - - svn path=/trunk/; revision=53672 - -commit 0e669d5 -Author: Michael Mann -Date: Sat Nov 30 01:50:12 2013 +0000 - - README update. Bug 9174 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174) - - From Peter Wu - - svn path=/trunk/; revision=53671 - -commit e1532f3 -Author: Michael Mann -Date: Sat Nov 30 01:35:03 2013 +0000 - - Tx MCS set is not interpreted properly in WLAN beacon frame. Bug 8894 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8894) - - #BACKPORT - - svn path=/trunk/; revision=53670 - -commit 6d3d155 -Author: Michael Mann -Date: Sat Nov 30 01:18:22 2013 +0000 - - STANAG 5066 DTS Layer dissector. Bug 9217 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9217) - - From İbrahim Can Yüce - - From me: Update to new tcp_dissect_pdus format, minor whitespace issues noticed in wiretap files. - - svn path=/trunk/; revision=53669 - -commit e52bce9 -Author: Guy Harris -Date: Sat Nov 30 00:53:03 2013 +0000 - - Fix indentation. - - svn path=/trunk/; revision=53668 - -commit 00737f8 -Author: Michael Mann -Date: Sat Nov 30 00:30:56 2013 +0000 - - Add wifi display port to the RTSP dissector. Bug 9339 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9339) - - From chaitanya - - From me: Add another obsolete preference and cleanup whitespace - - svn path=/trunk/; revision=53667 - -commit c6efc22 -Author: Guy Harris -Date: Sat Nov 30 00:10:18 2013 +0000 - - Strings are usually unwritable; squelch "constness is being assigned - away" warnings. - - svn path=/trunk/; revision=53666 - -commit 8c338ea -Author: Guy Harris -Date: Sat Nov 30 00:07:15 2013 +0000 - - Squelch a "parentheses suggested" warning. - - Casts from void * are required in C++. - - svn path=/trunk/; revision=53665 - -commit 216f631 -Author: Guy Harris -Date: Sat Nov 30 00:05:24 2013 +0000 - - Casts required from void * in C++. - - svn path=/trunk/; revision=53664 - -commit 1d80b1e -Author: Guy Harris -Date: Sat Nov 30 00:02:46 2013 +0000 - - Constify to squelch some warnings. - - svn path=/trunk/; revision=53663 - -commit 52cfff9 -Author: Guy Harris -Date: Fri Nov 29 23:57:23 2013 +0000 - - Squelch some "use parentheses" warnings. - - Use tab indentation uniformly. - - svn path=/trunk/; revision=53662 - -commit 488e61f -Author: Guy Harris -Date: Fri Nov 29 23:54:12 2013 +0000 - - Rename variable to avoid collisions with standard function names. - - Use the st_format_type type. - - svn path=/trunk/; revision=53661 - -commit 8a849e8 -Author: Chris Maynard -Date: Fri Nov 29 23:52:32 2013 +0000 - - When a snaplength isn't specifically set by the user, the default snaplength is used. In this case, rather than display the text, "default", display the actual value so the user always knows which value will be used. Other tools (tcpdump, for example) uses a different default snaplength, so it may not have been obvious to all users which value Wireshark uses for its default snaplength (even if it is documented in the man pages). - - svn path=/trunk/; revision=53660 - -commit 1ca9613 -Author: Guy Harris -Date: Fri Nov 29 23:46:48 2013 +0000 - - A typedef has to actually define a type. - - svn path=/trunk/; revision=53659 - -commit 68c8c7e -Author: Pascal Quantin -Date: Fri Nov 29 22:56:34 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9487 : - Use RTP payload descriptions from RTP dissector in RTPproxy codec param value - - svn path=/trunk/; revision=53658 - -commit 60d6b05 -Author: Michael Mann -Date: Fri Nov 29 22:47:59 2013 +0000 - - Stats_tree enhancements for sorting, averages and burst rate. Bug 9452 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452) - - From Deon van der Westhuysen - - - Bug fix: object leak in stats_tree after a tap reset (for example apply statistics preferences with a stats_tree window open) - - Bug fix: correct sample code in README.stats_tree - - Add: slash in plug-in name now creates submenu as docs describe (was a bug?) - - Add: menu separator before the stat_tree registered plug-ins - - Add: stats_tree can now calculate averages for nodes; automatically calculated for range nodes. Add section in README.stats_tree describing averages. - - Add: stats_tree can now calculate burst rate of each node (like rate but with a shorter, sliding time window) - - Add: sorting for stats_tree plug-ins. Can sort on node name, count, average, min, max values and burst rate. - - Add: preferences for stats_tree system (default sort column, burst calc params) - - Add: stats_tree window copy to clipboard and export and plain text, csv and XML. - - Added sample of new functionality in $srcdir/plugins/stats_tree/pinfo_stats_tree.c - - Moved all stats_tree sample plug-ins to "IP Statistics" submenu. - - svn path=/trunk/; revision=53657 - -commit eaaf443 -Author: Jörg Mayer -Date: Fri Nov 29 21:07:23 2013 +0000 - - Graham Bloice - - Ensure we use the correct value for MSC_VER_REQUIRED (similar to - nmake build) - - svn path=/trunk/; revision=53656 - -commit 82e2675 -Author: Jakub Zawadzki -Date: Fri Nov 29 20:53:00 2013 +0000 - - Avoid including in dissectors. - - svn path=/trunk/; revision=53655 - -commit fb22ecc -Author: Jörg Mayer -Date: Fri Nov 29 19:57:00 2013 +0000 - - Graham Bloice - - I've now got tshark to build from a VS solution file, had to do some hacks - to get there though, patch files attached for others to peruse, as I'm not - sure if they are the optimal solutions: - - 3. As mentioned in my previous message, the VS solution chops out every - 8192nd byte from the command line passed to make-dissector-reg.py. My - patch (make-reg.patch) gets CMake to write out the required source file - list to a file and modifies the python script to read in the file. The - python changes *should* be backwards compatible. - - Me: Small fix to UseMakeDissectorReg.cmake (elseif() -> else()) - - svn path=/trunk/; revision=53654 - -commit d99fdfd -Author: Jakub Zawadzki -Date: Fri Nov 29 19:21:20 2013 +0000 - - Replace macros: BSWAP16, BSWAP32, BSWAP64 with glib-version. - - - XXX, people are not aware that expression of this macros might be evaluated multiple times, like: - - BSWAP16(tvb_get_letohs(tvb, off)) : \ - + GUINT16_SWAP_LE_BE(tvb_get_letohs(tvb, off)) : \ - - Should be tvb_get_ntohs() called? - - - svn path=/trunk/; revision=53653 - -commit 5ac6474 -Author: Jakub Zawadzki -Date: Fri Nov 29 18:59:06 2013 +0000 - - Rename some of pint.h macros to match common style (bits number on the end). - - pntohs -> pntoh16 - pntohl -> pntoh32 - pletohs -> pletoh16 - pletohl -> pletoh32 - phtons -> phton16 - phtonl -> phton32 - - - svn path=/trunk/; revision=53652 - -commit 288efa5 -Author: Jakub Zawadzki -Date: Fri Nov 29 18:44:00 2013 +0000 - - Expand macros: htoles(), htolel(), htolell() - - svn path=/trunk/; revision=53651 - -commit 9c9a038 -Author: Michael Mann -Date: Fri Nov 29 17:51:56 2013 +0000 - - General "Prosody" placeholder parameter ("prosody-") is broken down to a 6 new "Prosody" specific parameters. Bug 9425 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9425) - - From zeljko - - svn path=/trunk/; revision=53650 - -commit 73f042a -Author: Martin Mathieson -Date: Fri Nov 29 17:42:08 2013 +0000 - - Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_ - - svn path=/trunk/; revision=53649 - -commit 27089d6 -Author: Gerald Combs -Date: Fri Nov 29 15:46:50 2013 +0000 - - Clean up whitespace. - - svn path=/trunk/; revision=53648 - -commit 718568b -Author: Jörg Mayer -Date: Fri Nov 29 15:40:04 2013 +0000 - - Graham Bloice: - - Always include the "true" zlib includes first. This works around a - bug in the Windows setup of GTK[23] which has a faulty zconf.h. - - - svn path=/trunk/; revision=53647 - -commit bf9fdc8 -Author: Michael Mann -Date: Fri Nov 29 14:55:49 2013 +0000 - - Bugfix timestamp formatting of Gigamon trailer. Bug 9433 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9433) - - From Sandeep Dahiya - - svn path=/trunk/; revision=53646 - -commit 8821cb7 -Author: Michael Mann -Date: Fri Nov 29 13:42:09 2013 +0000 - - Bugfixes of r53636, part of bug 9423 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9423) - - From DSR Corporation - - svn path=/trunk/; revision=53645 - -commit 9a48c7e -Author: Pascal Quantin -Date: Fri Nov 29 10:38:00 2013 +0000 - - Improve request / response tracking in case you have several open / close commands in the capture - - svn path=/trunk/; revision=53644 - -commit 09770db -Author: Jörg Mayer -Date: Fri Nov 29 09:45:44 2013 +0000 - - At least winpcap checks for WIN32 and not for _WIN32, so - define it. This copies the behaviour of Makefile.nmake. - - svn path=/trunk/; revision=53643 - -commit 5cb8483 -Author: Alexis La Goutte -Date: Fri Nov 29 08:33:51 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=53642 - -commit 09e1e86 -Author: Alexis La Goutte -Date: Fri Nov 29 08:02:39 2013 +0000 - - Enable by default UDP conversation (Needed by udp.stream) - - svn path=/trunk/; revision=53641 - -commit 7e06455 -Author: Alexis La Goutte -Date: Fri Nov 29 08:02:30 2013 +0000 - - Add udp.stream display filter - - The result is the same filter used by Follow UDP (may be reuse the new filter in Follow) - - svn path=/trunk/; revision=53640 - -commit e2f4b54 -Author: Alexis La Goutte -Date: Fri Nov 29 08:02:19 2013 +0000 - - When clean remove also *.moc.cpp / *.rrc.ccp and ui_*.h ... - - svn path=/trunk/; revision=53639 - -commit 1107951 -Author: Alexis La Goutte -Date: Fri Nov 29 08:02:09 2013 +0000 - - Add HTTP2 heuristic when it is encapsulated in SSL - - the heuristic may be leak (only check if type > 10...) - - svn path=/trunk/; revision=53638 - -commit f60aba3 -Author: Anders Broman -Date: Fri Nov 29 07:14:13 2013 +0000 - - Add an application id. - - svn path=/trunk/; revision=53637 - -commit 563cf65 -Author: Michael Mann -Date: Fri Nov 29 03:40:16 2013 +0000 - - Improved ZCL dissectors. Bug 9423 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9423) - - From DSR Corporation - - svn path=/trunk/; revision=53636 - -commit 5acdfae -Author: Gerald Combs -Date: Fri Nov 29 03:14:24 2013 +0000 - - Restore disabled "decode as" settings. - - svn path=/trunk/; revision=53635 - -commit 9e0cd5d -Author: Jakub Zawadzki -Date: Thu Nov 28 23:09:55 2013 +0000 - - Fix typo (r53633) in one more place, fix typo in filename, make hex numbers capital. - - svn path=/trunk/; revision=53634 - -commit 26446f8 -Author: Guy Harris -Date: Thu Nov 28 22:36:10 2013 +0000 - - Fix (presumed) tpyo. - - svn path=/trunk/; revision=53633 - -commit 3bbfb68 -Author: Jakub Zawadzki -Date: Thu Nov 28 22:31:55 2013 +0000 - - Move MPEG section table id defines to packet-mpeg-sect.h - - svn path=/trunk/; revision=53632 - -commit 37660f4 -Author: Pascal Quantin -Date: Thu Nov 28 21:59:02 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9478 : - GSM SMS User Data header fill bits are wrong when using a 7 bits ASCII / IA5 encoding - - svn path=/trunk/; revision=53631 - -commit 710feed -Author: Guy Harris -Date: Thu Nov 28 20:40:46 2013 +0000 - - GUINT_TO_POINTER() does just enough casting to suppress complaints about - 32-bit integers and 64-bit pointers, so it needs to be handed a guint - (or equivalent type); it doesn't suppress warnings about 8-bit or 16-bit - integers, so those have to be cast up to guint first. - - svn path=/trunk/; revision=53630 - -commit a31d102 -Author: Michael Mann -Date: Thu Nov 28 18:33:26 2013 +0000 - - Bluetooth: HSP: Add support for HSP. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446) - - HSP is modest version of HFP. - - From Michal Labedzki. - - svn path=/trunk/; revision=53629 - -commit 8dab825 -Author: Michael Mann -Date: Thu Nov 28 18:11:02 2013 +0000 - - Bluetooth improvements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446) - - From Michal Labedzki. - - 1. Bluetooth: HFP: Fix recognizing roles. There is need to check which side SDP record is, then it is possible to recognize roles. - 2. Bluetooth: RFCOMM/HFP: Fix recognizing services and roles. Direction bit means only that device is initiator of connection or not. But need information who is owner of connection (remote device or localhost), so use this information from L2CAP. - 3. Bluetooth: HFP: Fix unexpected expert info - 4. Bluetooth: HCI: Set addresses to host/controller. Also optimize a little handing of dissectors handles. - - svn path=/trunk/; revision=53628 - -commit 30ae01c -Author: Balint Reczey -Date: Thu Nov 28 16:39:04 2013 +0000 - - Support long Domain Names in NTLMSSP v2 - - ... instead of crashing on them. :-) - - Discovered by Garming Sam - - svn path=/trunk/; revision=53626 - -commit 71d0517 -Author: Michael Mann -Date: Thu Nov 28 16:33:54 2013 +0000 - - USB: Enable Decode As. Bug 9445 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445) - - From Michal Labedzki - - From me: - Have #defines in packet-usb.c because they are only used in the module. - - Break out the value computation so that it can be properly wrapped in GUINT_TO_POINTER without adding more complexity. - - svn path=/trunk/; revision=53625 - -commit 2ec033d -Author: Balint Reczey -Date: Thu Nov 28 16:04:33 2013 +0000 - - Fix potential signed int overflow in Lemon - - This chrashed Solaris buildbot when -ftrapv was enabled. - Triaged by Guy Harris, see detail at: - http://www.wireshark.org/lists/wireshark-dev/201311/msg00185.html - - svn path=/trunk/; revision=53624 - -commit ea7bcf0 -Author: Michael Mann -Date: Thu Nov 28 15:56:53 2013 +0000 - - Add count() function to display filter. Bug 9480 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9480) - - From Martin Kaiser - - svn path=/trunk/; revision=53623 - -commit 3d9e55b -Author: Michael Mann -Date: Thu Nov 28 14:11:48 2013 +0000 - - RTPproxy dissector: Add expert info about timeouts. Bug 9484 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9484) - - From Peter Lemenkov - - svn path=/trunk/; revision=53622 - -commit f74c645 -Author: Michael Mann -Date: Thu Nov 28 14:00:23 2013 +0000 - - Adjust fc_stat.c to use newer fc_exchange_t structure for its stats. - - svn path=/trunk/; revision=53621 - -commit e450b9b -Author: Michael Mann -Date: Thu Nov 28 01:49:29 2013 +0000 - - Bugfix Negative Fibre Channel scsi_time value. Bug 3209 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3209) - - The solution was to move the itlq_nexus_t structure handling from the FC dissector to the FCS dissector since it's actually the one with the LUN field. OXID+LUN makes a unique exchange at FC layer so track that separately. Also needed some additional OXID->LUN mapping at the FC layer to keep LUN correctly persistent. - - Not backporting because this was partially made possible by r53569, which won't be backported. - - svn path=/trunk/; revision=53620 - -commit b5fd2fd -Author: Jörg Mayer -Date: Wed Nov 27 23:09:19 2013 +0000 - - Having a generated file in the source tree is not fun. - - svn path=/trunk/; revision=53619 - -commit d2fc017 -Author: Jörg Mayer -Date: Wed Nov 27 23:07:25 2013 +0000 - - - Avoid copying of the graphics, specify the graphics source - dir instead. - - (Finally!) fix the problem of missing admon graphics in out of - tree builds - specify the admin directory as an absolute path - This may need porting to Makefile.am - - svn path=/trunk/; revision=53618 - -commit be4e248 -Author: Martin Kaiser -Date: Wed Nov 27 21:52:44 2013 +0000 - - try to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9485 - fc dissector rejects the packet if data parameter is empty - - - svn path=/trunk/; revision=53617 - -commit c3a8eca -Author: Bill Meier -Date: Wed Nov 27 17:23:00 2013 +0000 - - Try fixing Sun compiler error: "warning: this decimal constant is unsigned only in ISO C90" - - svn path=/trunk/; revision=53616 - -commit 914605a -Author: Bill Meier -Date: Wed Nov 27 16:48:00 2013 +0000 - - Fix a badly formed comment; - - svn path=/trunk/; revision=53615 - -commit 04cdccd -Author: Bill Meier -Date: Wed Nov 27 16:30:20 2013 +0000 - - - Create/use several extended value_strings - (sort associated value_string arrays as needed); - - - Use new VALUE_STRING_LIST mechanism/macros to - create enums and value_string arrays for: - WERR_errors, DOS_errors, SRV_errors, and HRD_errors; - - - Declare certain global value_string arrays as static (local) - and use global extended value_strings to reference same; - (e.g., ms_coiuntry_codes value_string_array) - - - Rename SMBE_... defs used in several different value_string arrays - to prevent potential name collisions: - ( e.g., for SRV_errors: SMBE_... ==> SMBE_SRV_...) - Done for value_string arrays: DOS_errors, SRV_errors, HRD_errors; - - - WERR_errors value_string array: - Note that WERR associated defs no longer exist in the latest samba doserr.h. - (The WERR_errors defs were originally generated from the samba doserr.h). - For now: WERR_errors kept as is. - - - ToDo: Fix PIDL-generated dcerpc dissectors to use NT_errors_ext - and WERR_errors_ext extended value_strings. - - - Add editor modelines to a few files. - - - Make whitespace changes. - - - svn path=/trunk/; revision=53614 - -commit d1daa67 -Author: Bill Meier -Date: Wed Nov 27 14:37:33 2013 +0000 - - Create/use several extended value_strings; - Add editor modelines. - - svn path=/trunk/; revision=53613 - -commit ca8b7b1 -Author: Pascal Quantin -Date: Wed Nov 27 08:09:55 2013 +0000 - - Reinitialize counter between loops to avoid an out of bound access found with fuzz testing. - - svn path=/trunk/; revision=53612 - -commit 5d44edf -Author: Chris Maynard -Date: Wed Nov 27 05:31:10 2013 +0000 - - While r53608 fixed the "Use promiscuous mode on all interfaces" toggle button behavior, it wasn't enough, so use the technique from r53609 for the "Capture on all interfaces" toggle button to fix it completely. - #BACKPORT(1.10) - - svn path=/trunk/; revision=53611 - -commit eabd5d8 -Author: Chris Maynard -Date: Wed Nov 27 05:13:22 2013 +0000 - - OK, capture_all is only ever set to TRUE or FALSE, so just use it directly. - - svn path=/trunk/; revision=53610 - -commit 1360306 -Author: Chris Maynard -Date: Wed Nov 27 05:03:31 2013 +0000 - - Make "Capture on all interfaces" toggle button behave properly, particularly when all interfaces had been selected but one of them is deselected. - #BACKPORT(1.10) - - svn path=/trunk/; revision=53609 - -commit a01b501 -Author: Chris Maynard -Date: Wed Nov 27 03:02:51 2013 +0000 - - Make "Use promiscuous mode on all interfaces" toggle button work properly again. - #BACKPORT(1.10) - - svn path=/trunk/; revision=53608 - -commit 69017ac -Author: Jeff Morriss -Date: Tue Nov 26 23:43:18 2013 +0000 - - Overhaul rpm-building options a bit: as suggested by Anders, have the RPM follow - ./configure's options for gtk2 vs gtk3 vs qt. - - Make it possible to not build the GNOME package (now both UIs' packages are - optional). I think Chris requested this a while ago. - - If this works out it may make sense to control the rest of the options via - ./configure . - - svn path=/trunk/; revision=53607 - -commit cc538db -Author: Guy Harris -Date: Tue Nov 26 22:54:25 2013 +0000 - - Squelch a compiler warning. - - svn path=/trunk/; revision=53606 - -commit f2d28c0 -Author: Pascal Quantin -Date: Tue Nov 26 22:40:52 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9476 : - Add DTMF dissector setup based on the information found in RTPproxy requests - - svn path=/trunk/; revision=53605 - -commit a955db9 -Author: Pascal Quantin -Date: Tue Nov 26 22:32:33 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9444 : - Add initial parameter parser for commands in RTPproxy dissector - - svn path=/trunk/; revision=53604 - -commit dff6b2a -Author: Pascal Quantin -Date: Tue Nov 26 22:05:33 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9397 : - Add RTP/RTCP dissector setup based on the replies found in rtpproxy dissector - - svn path=/trunk/; revision=53603 - -commit a5d8e1a -Author: Martin Kaiser -Date: Tue Nov 26 21:49:31 2013 +0000 - - fix encoding args - - svn path=/trunk/; revision=53602 - -commit f5ed725 -Author: Bill Meier -Date: Tue Nov 26 20:53:43 2013 +0000 - - Create/use two extended value_strings; - Replace 'offset++' (and similar) by 'offset += 1' for consistency; - Remove some unneeded initializers; - Fix indentation & whitespace style to be consistent; - Add editor modelines. - - svn path=/trunk/; revision=53601 - -commit 861e033 -Author: Anders Broman -Date: Tue Nov 26 20:29:17 2013 +0000 - - From Vineeth: - Support for Nokias GSM MAP Private Extensions - - svn path=/trunk/; revision=53600 - -commit 730bd9c -Author: Anders Broman -Date: Tue Nov 26 19:54:02 2013 +0000 - - Correct one AVP, some flags and add comments with new AVP:s - - svn path=/trunk/; revision=53599 - -commit e72632c -Author: Martin Kaiser -Date: Tue Nov 26 12:18:23 2013 +0000 - - From Ralph Böhme - Add QUERY_FS_INFO info level SMB_QUERY_POSIX_WHOAMI - - from me - remove unnecessary if(tree) checks - add one check before guint16 *bcp is decremented - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9475 - - svn path=/trunk/; revision=53598 - -commit 1f88ca3 -Author: Guy Harris -Date: Tue Nov 26 09:33:56 2013 +0000 - - Note why refresh_local_interface_lists() is being called in various - cases. - - svn path=/trunk/; revision=53597 - -commit b01acd4 -Author: Guy Harris -Date: Tue Nov 26 09:10:50 2013 +0000 - - Add explanatory comments. - - svn path=/trunk/; revision=53596 - -commit dae2d02 -Author: Guy Harris -Date: Tue Nov 26 09:08:45 2013 +0000 - - Fix indentation. - - svn path=/trunk/; revision=53595 - -commit f9c662d -Author: Irene Rüngeler -Date: Tue Nov 26 08:29:30 2013 +0000 - - Initialize more values and set the current item explicitly. - - svn path=/trunk/; revision=53594 - -commit b5e6985 -Author: Guy Harris -Date: Tue Nov 26 03:13:16 2013 +0000 - - Report the interface when an open or an attempt to set the link-layer - header type fails, as we might be capturing on more than one interface. - - Report the failing interface name in single quotes in some places where - we weren't doing so, for stylistic consistency. - - svn path=/trunk/; revision=53593 - -commit 261f69b -Author: Guy Harris -Date: Tue Nov 26 02:44:21 2013 +0000 - - Actually, you can set the link-layer header type globally from the - command line, and it works as long as all interfaces on which you're - capturing support it and that's what you really want. - - There's some UI cleanup that calls for, however. - - svn path=/trunk/; revision=53592 - -commit 4558ff0 -Author: Guy Harris -Date: Tue Nov 26 02:43:06 2013 +0000 - - Add a comment explaining what setting - capture_opts->default_options.linktype to -1 means. - - svn path=/trunk/; revision=53591 - -commit 945d6d0 -Author: Guy Harris -Date: Tue Nov 26 02:25:20 2013 +0000 - - Add a comment about the "default options". - - svn path=/trunk/; revision=53590 - -commit 913bc4a -Author: Guy Harris -Date: Tue Nov 26 02:16:07 2013 +0000 - - Use prefs_to_capture_opts(); there's no harm in setting - global_capture_opts.auto_scroll_live from the preferences. - - svn path=/trunk/; revision=53589 - -commit aac0ba6 -Author: Martin Mathieson -Date: Mon Nov 25 23:01:37 2013 +0000 - - When there is no ICMP reply, add a filterable field and expert info warning - - svn path=/trunk/; revision=53588 - -commit 8993524 -Author: Jeff Morriss -Date: Mon Nov 25 22:57:24 2013 +0000 - - Delete the svn:executable property on added files (we might add it back later). - - svn path=/trunk/; revision=53587 - -commit 946d691 -Author: Guy Harris -Date: Mon Nov 25 22:36:06 2013 +0000 - - Clean up indentation, add a comment, use "== 0" to test the result of - strcmp() to make it clearer that it's testing whether the strings are - equal. - - svn path=/trunk/; revision=53586 - -commit af892f0 -Author: Pascal Quantin -Date: Mon Nov 25 22:25:03 2013 +0000 - - Fix typo errors - - svn path=/trunk/; revision=53585 - -commit c0dc54d -Author: Guy Harris -Date: Mon Nov 25 22:03:06 2013 +0000 - - capture_interfaces_dialog.h is processed by moc, so it has to include - config.h itself, so that HAVE_LIBPCAP is defined appropriately. - - svn path=/trunk/; revision=53584 - -commit 1fb476b -Author: Guy Harris -Date: Mon Nov 25 22:01:03 2013 +0000 - - Have to include config.h before including headers that use #defines, - such as HAVE_LIBPCAP, from config.h. - - svn path=/trunk/; revision=53583 - -commit e2735b1 -Author: Guy Harris -Date: Mon Nov 25 21:50:58 2013 +0000 - - No libpcap, no capturing, no capture interfaces. Ifdef the entire - capture interfaces dialog code, *and* the code that calls it, under - HAVE_LIBPCAP. - - Still more stuff to remove from the no-pcap UI, such as the Capture - menu, the capture filter in the main window, and the list of interfaces - in the main window. - - svn path=/trunk/; revision=53582 - -commit 2c9ea8a -Author: Guy Harris -Date: Mon Nov 25 21:21:25 2013 +0000 - - If we don't have any preference set for the link-layer header type for - an interface, don't destroy the default link-layer header type from the - list of types. - - I.e., first get the type from the preference (which sets the type to -1 - if there isn't a preference), and then loop through the list of types - and, if there was no value obtained from the preference (i.e., the type - is -1), set it to the first type in the list. - - Also, don't bother with the link-layer header type from the global - default options, as a global (all-interface) link-layer header type - makes little sense, given that the list of link-layer header types for - an interface depends on the type of interface and hence may differ from - interface to interface. - - Fixes bug 9473. - - svn path=/trunk/; revision=53581 - -commit 5e65315 -Author: Martin Kaiser -Date: Mon Nov 25 20:56:34 2013 +0000 - - there were two identical copies of the function to process a DVB-SI time - remove the one in DVB-CI, use the version in mpeg-sect instead - - svn path=/trunk/; revision=53580 - -commit 747ab4e -Author: Guy Harris -Date: Mon Nov 25 20:54:19 2013 +0000 - - Blank after comma for all arguments in that call. - - svn path=/trunk/; revision=53579 - -commit 1516e5f -Author: Bill Meier -Date: Mon Nov 25 20:04:25 2013 +0000 - - Create/use two extended value-strings; - Comment out an unused variable definition; - Do some whitespace changes & several other minor changes; - Add editor modelines. - - svn path=/trunk/; revision=53578 - -commit 21c772c -Author: Bill Meier -Date: Mon Nov 25 18:55:45 2013 +0000 - - Create/use an extended value_string; - Use 'offset += 1' instead of 'offset++' for consistency; - Replace 32767 (as a mask) with 0x7FFF for clarity; - Remove some unneeded boilerplate comments; - Do whitespace changes. - - - svn path=/trunk/; revision=53577 - -commit b023777 -Author: Jeff Morriss -Date: Mon Nov 25 18:29:40 2013 +0000 - - The defragment_xudt preference is used to control reassembly of both XUDTs - and also DT1s. Update the preference text to reflect that. - - (Don't change the actual preference name to avoid breaking backward - compatibility.) - - svn path=/trunk/; revision=53576 - -commit 12618aa -Author: Pascal Quantin -Date: Mon Nov 25 18:04:07 2013 +0000 - - Add command type to info column - - svn path=/trunk/; revision=53575 - -commit db25d43 -Author: Jeff Morriss -Date: Mon Nov 25 18:02:21 2013 +0000 - - Set SVN properties. - - svn path=/trunk/; revision=53574 - -commit de590ab -Author: Martin Kaiser -Date: Mon Nov 25 17:04:58 2013 +0000 - - fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9474 - - make mepg-sect a new-style dissector and do a length check on the - incoming tvb - - svn path=/trunk/; revision=53573 - -commit 393c769 -Author: Alexis La Goutte -Date: Mon Nov 25 17:01:10 2013 +0000 - - From Thomas ERSFELD (GSoC13) and me : Try to fix OSX-10.5-x86 (without pcap...) Buildbot - - svn path=/trunk/; revision=53572 - -commit 818ce4f -Author: Martin Kaiser -Date: Mon Nov 25 16:59:06 2013 +0000 - - mark unused parameter - - svn path=/trunk/; revision=53571 - -commit 3e3c976 -Author: Bill Meier -Date: Mon Nov 25 16:57:43 2013 +0000 - - Create/use extended value_string; - Move value_string array definitions from .h to .c file - (value_string definitions should never be in a .h file); - Add XXX comments re value_string arrays containing - duplicate values [ptp_opcode_names & ptp_respcode_names]; - Remove unneeded #includes (stdio.h, stdlib.h & string.h); - Remove some unneeded initializers; - Add editor modelines. - Do some whitespace & long-lines changes; - - svn path=/trunk/; revision=53570 - -commit a9dd765 -Author: Michael Mann -Date: Mon Nov 25 16:04:57 2013 +0000 - - Remove Fibre Channel specific fields from packet_info and just have the fc_hdr or fc_data_t structure passed between all necessary dissectors. - - svn path=/trunk/; revision=53569 - -commit d4c4e24 -Author: Alexis La Goutte -Date: Mon Nov 25 15:56:22 2013 +0000 - - Try to fix OSX-10.6-x64 Buildbot - - svn path=/trunk/; revision=53568 - -commit 056a5ed -Author: Alexis La Goutte -Date: Mon Nov 25 15:43:16 2013 +0000 - - Comment debug... - - svn path=/trunk/; revision=53567 - -commit 34d7df7 -Author: Alexis La Goutte -Date: Mon Nov 25 15:43:08 2013 +0000 - - From Thomas ERSFELD (GSoC13) : Try to fix Windows buildbot - - svn path=/trunk/; revision=53566 - -commit 1508335 -Author: Bill Meier -Date: Mon Nov 25 15:37:56 2013 +0000 - - Create/use some extended value_strings. - Add editor modelines. - - svn path=/trunk/; revision=53565 - -commit a427b58 -Author: Jeff Morriss -Date: Mon Nov 25 15:35:53 2013 +0000 - - Add svn:eol-style. - - svn path=/trunk/; revision=53564 - -commit 43b1f47 -Author: Alexis La Goutte -Date: Mon Nov 25 14:15:49 2013 +0000 - - From Thomas ERSFELD (GSoC13) : Add Capture interface dialog window - - * Reuse sparkline from welcome - * Split settings in tab (!= GTK) - * No all feature work (Work In Progress...) - * ... - - Comments (and review) are welcome ! - - svn path=/trunk/; revision=53563 - -commit 402fed4 -Author: Pascal Quantin -Date: Mon Nov 25 11:23:11 2013 +0000 - - Fix a shadowed declaration error when compiling with gcc 4.3.2 - - svn path=/trunk/; revision=53562 - -commit 17e16ae -Author: Pascal Quantin -Date: Mon Nov 25 11:16:24 2013 +0000 - - Prettify LTE Positioning Protocol dissection - - svn path=/trunk/; revision=53561 - -commit 0757ccc -Author: Anders Broman -Date: Mon Nov 25 07:22:17 2013 +0000 - - Add a temporary workaround for the duplicated filter name problem. - - svn path=/trunk/; revision=53560 - -commit 6505190 -Author: Michael Mann -Date: Mon Nov 25 00:14:50 2013 +0000 - - Move DCERPC data in packet_info needed for Decode As into packet scoped proto data. - - svn path=/trunk/; revision=53559 - -commit a15b7e9 -Author: Bill Meier -Date: Sun Nov 24 23:55:26 2013 +0000 - - Create/use a fair number of extended value_strings; - Add an XXX comment noting that the 'ndps_error_types' array has a - number of duplicate values; Also note the commenting out of those - dups which would not have been found via a linear search in the - original unsorted array. - - svn path=/trunk/; revision=53558 - -commit db7405b -Author: Pascal Quantin -Date: Sun Nov 24 23:09:48 2013 +0000 - - Dissect UE Rx - Tx time difference field - - svn path=/trunk/; revision=53557 - -commit 4dbed5f -Author: Guy Harris -Date: Sun Nov 24 22:51:44 2013 +0000 - - According to - - http://gcc.gnu.org/onlinedocs/gcc-4.8.2/gcc/Code-Gen-Options.html#Code-Gen-Options - - -ftrapv "generates traps for signed overflow on addition, subtraction, - multiplication operations." and -fwrapv "instructs the compiler to - assume that signed arithmetic overflow of addition, subtraction and - multiplication wraps around using twos-complement representation." - - Those seem mutually-exclusive to me, and we probably want wrapping, not - traps, as there's probably a fair bit of code out there that explicitly - or implicitly assumes wrapping. (Actually, we really want to avoid - signed arithmetic for the cases that most matter, such as offsets and - lengths, but, unfortunately, we currently have API conventions that - allow negative values for lengths, either with -1 meaning "to the end" - or with negative values meaning "relative to the end".) In addition, - there seem to be some bugs complaining that -ftrapv doesn't always cause - traps on signed integer overflow. - - We seem to be seeing crashes in Lemon on the Solaris buildbot subsequent - to adding -ftrapv; I don't know whether that's an overflow being - detected, a bug in the compiler, or something unrelated, especially - given that we're using Sun C, not GCC, on the Solaris buildbot. - However, we'll try removing -ftrapv, to see if it fixes the problem; the - MIT CSAIL paper in question wasn't really recommending all the GCC - options it mentioned (which, as noted, wouldn't make sense, as -ftrapv - and -fwrapv appear to be mutually-exclusive). - - svn path=/trunk/; revision=53556 - -commit 91159d9 -Author: Guy Harris -Date: Sun Nov 24 22:13:28 2013 +0000 - - Note that I've filed a Samba bug for one of the problems. - - svn path=/trunk/; revision=53555 - -commit 5877167 -Author: Guy Harris -Date: Sun Nov 24 21:21:42 2013 +0000 - - pidl would tag all pinfo arguments as unused, as it doesn't take the - effort to figure out whether they *are* used (and there's no point in it - doing so - might as well just flag them preemptively). - - pidl can't handle this, at least not on OS X, as it's not handling the - C++/C99-style dissectors in the IDL for NSPI, so we manually put the - _U_s back. - - svn path=/trunk/; revision=53554 - -commit 0f28eb7 -Author: Guy Harris -Date: Sun Nov 24 21:15:22 2013 +0000 - - Squelch a Coverity warning (not necessary, but it still complains). - - svn path=/trunk/; revision=53553 - -commit e2df7c8 -Author: Michael Mann -Date: Sun Nov 24 20:55:55 2013 +0000 - - Move dceprc_procedure_name from packet_info to dcerpc_info. Doesn't appear to be "used" by dissectors, just stored (for help in debugging?). - - svn path=/trunk/; revision=53552 - -commit ee14799 -Author: Balint Reczey -Date: Sun Nov 24 20:28:25 2013 +0000 - - Use GCC flags to avoid optimization problems due to undefined behaviour - - Adding flags suggested by article at: - http://pdos.csail.mit.edu/~xi/papers/stack-sosp13.pdf - - svn path=/trunk/; revision=53551 - -commit e36f3b0 -Author: Graham Bloice -Date: Sun Nov 24 19:12:07 2013 +0000 - - Ensure the WIRESHARK_BASE_DIR env var is in cmake format. Required for the regex in FindGTK3.cmake. - - svn path=/trunk/; revision=53550 - -commit 7510dee -Author: Bill Meier -Date: Sun Nov 24 15:55:10 2013 +0000 - - Create/use some extended value_strings; - Do a few trivial whitespace tweaks. - - svn path=/trunk/; revision=53549 - -commit 3b324fd -Author: Gerald Combs -Date: Sun Nov 24 15:03:43 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-11-24] - - svn path=/trunk/; revision=53546 - -commit a980729 -Author: Jeff Morriss -Date: Sun Nov 24 14:27:52 2013 +0000 - - Fix checkAPIs: don't try to feed VALS() into FT_BOOLEANs. - - Also, as per Peter Harris' request, update copyright date. - - svn path=/trunk/; revision=53545 - -commit 6aec20c -Author: Jakub Zawadzki -Date: Sun Nov 24 12:49:50 2013 +0000 - - Rmove packet_info argument from packet_list_append(), never used. - - Part of attachment 12060, from Didier Gautheron (bug #9419). - - svn path=/trunk/; revision=53544 - -commit 92fba9d -Author: Guy Harris -Date: Sun Nov 24 04:39:27 2013 +0000 - - Actually, the "1632" types do exist, and are 16-bit for NDR and 32-bit - for NDR64, and we handle them. The real problems are elsewhere. - - svn path=/trunk/; revision=53543 - -commit 0a2519f -Author: Guy Harris -Date: Sun Nov 24 04:15:25 2013 +0000 - - These are two of the problems that pidl has with dfs.idl. - - svn path=/trunk/; revision=53542 - -commit 61cce92 -Author: Guy Harris -Date: Sun Nov 24 04:14:00 2013 +0000 - - Get rid of trailing spaces, fix some proto_tree_add_item() calls as per - the result of pidl on dce.idl. - - (We can't just regenerate it, as there are some pidl bugs that cause bad - code to be generated.) - - svn path=/trunk/; revision=53541 - -commit f7e5e2d -Author: Guy Harris -Date: Sun Nov 24 03:33:17 2013 +0000 - - The issue with misc.idl was a .cnf file that needed to be updated. - - Give details of the problems with the other files. - - svn path=/trunk/; revision=53540 - -commit eb223ff -Author: Guy Harris -Date: Sun Nov 24 03:21:50 2013 +0000 - - Regenerate - new API changes, get rid of trailing whitespace. - - svn path=/trunk/; revision=53539 - -commit f070b9e -Author: Guy Harris -Date: Sun Nov 24 03:20:25 2013 +0000 - - Fix to match API changes. - - svn path=/trunk/; revision=53538 - -commit 9410fcc -Author: Guy Harris -Date: Sun Nov 24 03:18:22 2013 +0000 - - Fix line endings, set svn:eol-style to native. - - svn path=/trunk/; revision=53537 - -commit d30959d -Author: Guy Harris -Date: Sun Nov 24 02:58:26 2013 +0000 - - Update a date, explain what the problems are with a bunch of IDL files, - add another file that *might* be generating incorrect code. - - svn path=/trunk/; revision=53536 - -commit 3f6b85e -Author: Guy Harris -Date: Sun Nov 24 02:57:24 2013 +0000 - - Regenerate - for whatever reason, the fields come out in a different - random order, but nothing else changes. - - svn path=/trunk/; revision=53535 - -commit 70cea27 -Author: Guy Harris -Date: Sun Nov 24 02:51:36 2013 +0000 - - Regenerated with the current version of pidl; mainly removes trailing - white space, but also gets rid of an apparently-unnecessary _U_ for one - argument. - - svn path=/trunk/; revision=53534 - -commit cafef8b -Author: Guy Harris -Date: Sun Nov 24 02:45:38 2013 +0000 - - Updates to: - - suggest using our version of pidl, given that its Wireshark - parser generator has changes to support the current internal - Wireshark APIs for dissectors; - - suggest using "--includedir ." to make IDL files in - subdirectories of epan/dissectors/pidl work; - - update the list of IDL files with issues; - - reformat to 80x66 (if it's good enough for Herman Hollerith, - it's good enough for me!). - - svn path=/trunk/; revision=53533 - -commit de2a922 -Author: Jeff Morriss -Date: Sun Nov 24 01:32:55 2013 +0000 - - Some patches from Peter Harris to make it possible to build the X11 dissector - again (and some various other improvements): - - Rebuild the dissector with the latest xcbproto and mesa. - - - Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types - These types are used by the new Present extension. - - Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures - The xinput structs are used by the latest xcb/proto, and the xkb - struct has been removed. - - Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty - xinput:ChangeProperty should use switch/case, but only switch/bitcase - is supported at the moment. Add (hopefully temporary) hack. - - Subject: [PATCH 04/11] X11 dissector: Use namespace for types - In particular, the name of the xsync struct 'INT64' collides with a - basic type of the same name. - - Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events - All new extensions are using the new "Generic" events instead of - traditional events, because there aren't enough traditional event - numbers. - - Denoted by in xcb/proto. - - Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures - - Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase - XKB is weird. - - Subject: [PATCH 08/11] X11 dissector: Support sumof - - Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables - (This patch also reverts r53298/r53299.) - - svn path=/trunk/; revision=53532 - -commit a434d96 -Author: Jeff Morriss -Date: Sun Nov 24 01:32:20 2013 +0000 - - Some patches from Peter Harris to make it possible to build the X11 dissector - again (and some various other improvements): - - Rebuild the dissector with the latest xcbproto and mesa. - - - Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types - These types are used by the new Present extension. - - Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures - The xinput structs are used by the latest xcb/proto, and the xkb - struct has been removed. - - Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty - xinput:ChangeProperty should use switch/case, but only switch/bitcase - is supported at the moment. Add (hopefully temporary) hack. - - Subject: [PATCH 04/11] X11 dissector: Use namespace for types - In particular, the name of the xsync struct 'INT64' collides with a - basic type of the same name. - - Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events - All new extensions are using the new "Generic" events instead of - traditional events, because there aren't enough traditional event - numbers. - - Denoted by in xcb/proto. - - Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures - - Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase - XKB is weird. - - Subject: [PATCH 08/11] X11 dissector: Support sumof - - Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables - (This patch also reverts r53298/r53299.) - - svn path=/trunk/; revision=53531 - -commit 1db1b8e -Author: Evan Huus -Date: Sat Nov 23 22:37:33 2013 +0000 - - Convert ASN1 dissectors from ep_address_to_str to address_to_str. Clean up a bit - of ansi_tcap code while in the neighbourhood. - - svn path=/trunk/; revision=53530 - -commit 318d38b -Author: Michael Mann -Date: Sat Nov 23 22:29:31 2013 +0000 - - Use 32bit key in p_add_proto_data() and friends. Bug 9453 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9453) - - From Dirk - - svn path=/trunk/; revision=53529 - -commit d97c9e2 -Author: Evan Huus -Date: Sat Nov 23 22:17:27 2013 +0000 - - Implement address_to_str which is like ep_address_to_str and se_address_to_str - except it takes a wmem scope instead. Add the two emem equivalents to checkAPI - as (weakly) deprecated. - - svn path=/trunk/; revision=53528 - -commit df1aec4 -Author: Evan Huus -Date: Sat Nov 23 22:03:48 2013 +0000 - - Remove old (2009) and no-longer-necessary compatibility macro. - - svn path=/trunk/; revision=53527 - -commit ea63042 -Author: Michael Mann -Date: Sat Nov 23 21:41:08 2013 +0000 - - Bluetooth improvements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446) - - From Michal Labedzki - - svn path=/trunk/; revision=53525 - -commit 84e23ce -Author: Guy Harris -Date: Sat Nov 23 20:10:02 2013 +0000 - - Set a field to squelch a Coverity warning. - - svn path=/trunk/; revision=53524 - -commit a18cf19 -Author: Guy Harris -Date: Sat Nov 23 19:51:02 2013 +0000 - - Always check cf->edt before dereferencing it, so that Coverity doesn't - say "you checked it here, but you dereferenced it later even if it was - null when you checked it". - - This obviates the need for some checks of frame_selected, as cf->edt - will be non-null iff cf->current_frame is non-null. - - Always check *cf, not cfile, in set_menus_for_selected_packet(). - Currently, cf always == &cfile, but we aren't guaranteeing that will be - true forever. - - svn path=/trunk/; revision=53523 - -commit 55c6869 -Author: Michael Mann -Date: Sat Nov 23 19:16:05 2013 +0000 - - Remove ip_ttl from packet_info structure. - - Part of the fix includes having the IPv6 dissector populate as much of a ws_ip structure as possible to pass to subdissectors of the "ip.proto" table, so the ttl value can be picked up. - - svn path=/trunk/; revision=53522 - -commit 9150571 -Author: Pascal Quantin -Date: Sat Nov 23 12:30:19 2013 +0000 - - Check the packet length when using the "Force decoding of unknown USB control data as MBIM" option to reduce false positives. - Align text in info column. - - svn path=/trunk/; revision=53521 - -commit 9b7fb8a -Author: Michael Mann -Date: Sat Nov 23 02:20:13 2013 +0000 - - Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) - - I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. - - The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. - - All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. - - svn path=/trunk/; revision=53520 - -commit b3a24c5 -Author: Gerald Combs -Date: Sat Nov 23 01:06:30 2013 +0000 - - Replace similar code with a common routine. - - svn path=/trunk/; revision=53519 - -commit 11d8147 -Author: Evan Huus -Date: Fri Nov 22 23:46:00 2013 +0000 - - Add exception for cmake/TestWindowsFSeek.c it is copied from upstream under a - valid license, but has no recognizable header and there's no reason to carry the - delta. - - svn path=/trunk/; revision=53518 - -commit 455ccca -Author: Guy Harris -Date: Fri Nov 22 20:54:30 2013 +0000 - - Slap a BSD checksum onto in_cksum.h. - - svn path=/trunk/; revision=53517 - -commit 213d47a -Author: Gerald Combs -Date: Fri Nov 22 17:59:15 2013 +0000 - - Fix packet list selection signaling. - - It looks like resetting the packet list model during freezing and - thawing disconnects the selection changed signal between the model and - the main window. Rename the packet list's setMenusFollowStream signal to - packetSelectionChanged and use it to trigger menu updates in the main - window. - - svn path=/trunk/; revision=53516 - -commit 779f95a -Author: Gerald Combs -Date: Fri Nov 22 17:53:25 2013 +0000 - - Make the "decode as" dialog modal (for now, at least). - - svn path=/trunk/; revision=53515 - -commit 65e3e91 -Author: Martin Mathieson -Date: Fri Nov 22 17:18:11 2013 +0000 - - Tweak filter names for expert items, mostly to consistently use - rather than _ - - svn path=/trunk/; revision=53514 - -commit a906b1f -Author: Martin Mathieson -Date: Fri Nov 22 16:52:28 2013 +0000 - - Tidy up some TODOs - - svn path=/trunk/; revision=53513 - -commit f482d87 -Author: Alexis La Goutte -Date: Fri Nov 22 14:52:25 2013 +0000 - - Fix unused-const-variable error when build with clang 3.4 - - svn path=/trunk/; revision=53512 - -commit 2350754 -Author: Alexis La Goutte -Date: Fri Nov 22 14:52:15 2013 +0000 - - Fix unused-const-variable error when build with clang 3.4 - - svn path=/trunk/; revision=53511 - -commit 14ee1a5 -Author: Alexis La Goutte -Date: Fri Nov 22 14:52:04 2013 +0000 - - Fix unused-const-variable error when build with clang 3.4 - - svn path=/trunk/; revision=53510 - -commit 0d20064 -Author: Alexis La Goutte -Date: Fri Nov 22 14:51:52 2013 +0000 - - Fix unused-const-variable error when build with clang 3.4 - - svn path=/trunk/; revision=53509 - -commit f39f943 -Author: Alexis La Goutte -Date: Fri Nov 22 14:51:43 2013 +0000 - - Fix unused-const-variable error when build with clang 3.4 (with ugly hack... Maybe remove all ugly INIT_FIELD/ ADD_FIELD macro) - - svn path=/trunk/; revision=53508 - -commit 001d79c -Author: Alexis La Goutte -Date: Fri Nov 22 14:51:31 2013 +0000 - - Add -Wheader-guard to Autotools and CMake - - svn path=/trunk/; revision=53507 - -commit cebc175 -Author: Pascal Quantin -Date: Fri Nov 22 11:22:46 2013 +0000 - - Make use of ctrl_ack_vals value_string array - - svn path=/trunk/; revision=53506 - -commit 6e2b1c9 -Author: Alexis La Goutte -Date: Fri Nov 22 08:53:05 2013 +0000 - - Fix typo in top filename - - svn path=/trunk/; revision=53505 - -commit 9ba190f -Author: Michael Mann -Date: Fri Nov 22 02:52:41 2013 +0000 - - Create multiple dissection functions if packet_info->ipproto is used to distinguish behavior. - - svn path=/trunk/; revision=53504 - -commit 237c580 -Author: Michael Mann -Date: Fri Nov 22 02:49:00 2013 +0000 - - Replace packet_info->ipproto with packet_info->layers loop to determine TCP/UDP. - - svn path=/trunk/; revision=53503 - -commit 635a5b1 -Author: Gerald Combs -Date: Fri Nov 22 02:11:40 2013 +0000 - - Fix qmake builds on Unix. - - tap_register.variable_out adds wireshark-tap-register.c to SOURCES. We - don't have to add it again ourselves. - - svn path=/trunk/; revision=53502 - -commit 629d5f1 -Author: Gerald Combs -Date: Fri Nov 22 01:25:17 2013 +0000 - - Mark a parameter unused. - - svn path=/trunk/; revision=53501 - -commit e5c9616 -Author: Gerald Combs -Date: Fri Nov 22 01:11:49 2013 +0000 - - Remove a commented-out duplicate dissector_table definition. - - svn path=/trunk/; revision=53500 - -commit 78266fe -Author: Gerald Combs -Date: Fri Nov 22 01:07:36 2013 +0000 - - Add an initial "Decode As" dialog. Currently read-only. - - Fixup some of the Statistics menu items. - - svn path=/trunk/; revision=53499 - -commit 70709e1 -Author: Gerald Combs -Date: Fri Nov 22 00:20:23 2013 +0000 - - Move common "decode as" preference code to epan. - - We presumably want "decode as" behavior to be consistent across UIs so - call load_decode_as_entries() from read_prefs(). - - svn path=/trunk/; revision=53498 - -commit fc5adb9 -Author: Bill Meier -Date: Thu Nov 21 23:21:49 2013 +0000 - - Comment out *many* unused vars found by CLANG; - Fix 2 minor bugs wherein an incorrect (NULL) tree was always used; - Remove some unneeded initializers; - Localize some variables; - Use consistent indentation & whitespace formatting - Add editor modelines. - - svn path=/trunk/; revision=53497 - -commit 9f485b9 -Author: Bill Meier -Date: Thu Nov 21 23:17:59 2013 +0000 - - #if 0 some unused vars found by CLANG - - svn path=/trunk/; revision=53496 - -commit a5317f8 -Author: Martin Kaiser -Date: Thu Nov 21 22:30:55 2013 +0000 - - From Abhik Sarkar - improve relative offset calculations for Kyoto-Tycoon protocol - - from me: - use col_append_sep_str() - set the correct length in dissect_kt() - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9418 - - svn path=/trunk/; revision=53495 - -commit 36f11a7 -Author: Martin Kaiser -Date: Thu Nov 21 21:54:31 2013 +0000 - - next unprocessed descriptor 0xFF means that - all descriptors were processed - - svn path=/trunk/; revision=53494 - -commit 63c8b20 -Author: Guy Harris -Date: Thu Nov 21 20:50:13 2013 +0000 - - Widen the Ethertype to a guint, to avoid compiler warnings. - - Fix indentation while we're at it. - - svn path=/trunk/; revision=53493 - -commit dad2b94 -Author: Guy Harris -Date: Thu Nov 21 20:33:28 2013 +0000 - - Get rid of unused variable. - - svn path=/trunk/; revision=53492 - -commit fd51955 -Author: Gerald Combs -Date: Thu Nov 21 20:24:01 2013 +0000 - - Tap listeners have to be registered before we read our prefs. - - svn path=/trunk/; revision=53491 - -commit ebc4cbc -Author: Jeff Morriss -Date: Thu Nov 21 20:20:29 2013 +0000 - - Attempt to fix Qt dependencies for SUSE. - - svn path=/trunk/; revision=53490 - -commit eabadda -Author: Michael Mann -Date: Thu Nov 21 20:08:20 2013 +0000 - - Remove ethertype, mpls_label and ppids from packet_info structure. - - The information was converted to "proto" data within their respective dissectors strictly for use in "Decode As". - - svn path=/trunk/; revision=53489 - -commit 9fa6c9f -Author: Michael Mann -Date: Thu Nov 21 19:51:17 2013 +0000 - - Create new dissectors when a protocol goes across ethernet and "something else" instead a single dissector that uses pinfo->ethertype to determine if it's the "ethernet" or the "something else" case. - - svn path=/trunk/; revision=53488 - -commit 82f7344 -Author: Bill Meier -Date: Thu Nov 21 19:11:47 2013 +0000 - - Add some "helper" macros to: - Provide the capability to define a list of value_strings once and - then to expand the list as an enum and/or as a value_string array. - - - svn path=/trunk/; revision=53487 - -commit a36046c -Author: Guy Harris -Date: Thu Nov 21 18:50:44 2013 +0000 - - Get rid of C++ comments. - - svn path=/trunk/; revision=53486 - -commit a1f2a76 -Author: Guy Harris -Date: Thu Nov 21 18:48:36 2013 +0000 - - #if 0 out some currently-unused variables and the code that sets them, - to squelch compiler warnings. - - svn path=/trunk/; revision=53485 - -commit 7727623 -Author: Bill Meier -Date: Thu Nov 21 18:46:40 2013 +0000 - - Do some constification; - Create/use value_string_ext_free(); - Display certain numbers also as hex in the - "forced to fall back to linear search: ..." value-string warning msg - Add editor-modelines to some files; - Do some whitespace changes. - - svn path=/trunk/; revision=53484 - -commit de60c9c -Author: Bill Meier -Date: Thu Nov 21 18:37:26 2013 +0000 - - (Trivial) Formatting & whitespace changes .... - - svn path=/trunk/; revision=53483 - -commit 13124b7 -Author: Bill Meier -Date: Thu Nov 21 18:03:10 2013 +0000 - - Constify two vars; - Add editor modelines; - Rework some whitespace. - - svn path=/trunk/; revision=53482 - -commit 694d2cb -Author: Gerald Combs -Date: Thu Nov 21 17:44:12 2013 +0000 - - Add a note about UTF-8. - - svn path=/trunk/; revision=53481 - -commit 0f5f63b -Author: Bill Meier -Date: Thu Nov 21 17:41:17 2013 +0000 - - Constify a character array; - Fix a typo; - Add editor modelines. - - svn path=/trunk/; revision=53480 - -commit 22f8920 -Author: Gerald Combs -Date: Thu Nov 21 17:39:32 2013 +0000 - - Remove an unused function. - - svn path=/trunk/; revision=53479 - -commit f4360dc -Author: Michael Mann -Date: Thu Nov 21 17:18:11 2013 +0000 - - Create separate dissector function for TCP functionality so packet_info->ethertype doesn't need to be used. - - svn path=/trunk/; revision=53478 - -commit 774b7ca -Author: Bill Meier -Date: Thu Nov 21 17:12:05 2013 +0000 - - Create/use a number of extended value-strings; - Use FT_BOOLEAN instead of FT_UINT16 with 'ptp_bool_vals' value_string array; - Add editor modelines; - Do some whitespace & formatting changes. - - svn path=/trunk/; revision=53477 - -commit 64c6873 -Author: Michael Mann -Date: Thu Nov 21 16:42:10 2013 +0000 - - Remove packet_info->ipproto and packet_info->ethertype uses in the GUI. Convert to walking packet protocol list looking for desired protocols. - - I may eventually switch this to use proto_* values instead of strings, but just the addition of the loop is more jarring as compared to the simple comparing of ip or ethernet values. But it should lead to a smaller (less protocol specific) packet_info structure. - - svn path=/trunk/; revision=53476 - -commit d5433fd -Author: Martin Mathieson -Date: Thu Nov 21 15:42:22 2013 +0000 - - Cope with empty VWR files (bug 9428) - - svn path=/trunk/; revision=53475 - -commit 2e983ba -Author: Michael Mann -Date: Thu Nov 21 12:46:31 2013 +0000 - - Revert what I thought was a simple "compile" change for r53473, but causes Wireshark to crash at startup. - - svn path=/trunk/; revision=53474 - -commit ad1d471 -Author: Michael Mann -Date: Thu Nov 21 12:16:49 2013 +0000 - - Walk list of protocol strings to determine which protocols are present in a packet rather than rely on protocol specific items in packet_info in an effort to (eventually) reduce packet_info members. - - svn path=/trunk/; revision=53473 - -commit 3894de2 -Author: Pascal Quantin -Date: Thu Nov 21 11:20:06 2013 +0000 - - Indicate fragments in info column - - svn path=/trunk/; revision=53472 - -commit 2f3d057 -Author: Pascal Quantin -Date: Thu Nov 21 09:33:01 2013 +0000 - - Do not add an unknown tag item for End-of-options - - svn path=/trunk/; revision=53471 - -commit 52ce5ac -Author: Stig Bjørlykke -Date: Thu Nov 21 08:42:21 2013 +0000 - - Detect out-of-bounds when handling zero terminated strings from a TvbRange. - This avoids a wireshark crash. - - svn path=/trunk/; revision=53470 - -commit 0604779 -Author: Guy Harris -Date: Thu Nov 21 05:55:30 2013 +0000 - - Add ui_stats_tree_dialog.h to the list of generated headers not to - install; that should fix the "make distclean" errors. - - svn path=/trunk/; revision=53469 - -commit 32b66a9 -Author: Michael Mann -Date: Thu Nov 21 03:26:42 2013 +0000 - - Fix memory leak from formatted string. - - svn path=/trunk/; revision=53468 - -commit daa8b5e -Author: Gerald Combs -Date: Thu Nov 21 02:12:56 2013 +0000 - - Fix buildbing ui/qt/wireshark-tap-register.c with autotools. - - svn path=/trunk/; revision=53467 - -commit 2632502 -Author: Gerald Combs -Date: Thu Nov 21 02:05:36 2013 +0000 - - Try to get qmake to create wireshark-tap-register.c. - - svn path=/trunk/; revision=53466 - -commit 31b216d -Author: Gerald Combs -Date: Thu Nov 21 01:31:36 2013 +0000 - - Add the new stats tree. - - svn path=/trunk/; revision=53465 - -commit ea28298 -Author: Gerald Combs -Date: Thu Nov 21 01:28:17 2013 +0000 - - Add a statistics tree dialog. - - Add menu items for each corresponding item in gtk/main_menubar.c that - calls gtk_stats_tree_cb(). Hopefully that's everything. Note that we use - quite a bit less code than the GTK+ flavor and why we might not want to - do that. Change a few things in ui/qt/CMakeLists.txt to more closely - match the GTK+ version. Add plumbing for tap registrations in - CMakeLists.txt and Makefile.am. Add the ability to copy text as CSV or - YAML. - - svn path=/trunk/; revision=53464 - -commit 3111b6c -Author: Michael Mann -Date: Thu Nov 21 01:18:23 2013 +0000 - - USB CCID and PN532_HCI can be now used in Decode As. Bug 9445 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445) - - From Michal Labedzki - - svn path=/trunk/; revision=53463 - -commit 091fd3d -Author: Michael Mann -Date: Thu Nov 21 01:12:25 2013 +0000 - - Fix DecodeBy priorities. Bug 9445 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445) - - From Michal Labedzki. - - svn path=/trunk/; revision=53462 - -commit 8b8cf56 -Author: Guy Harris -Date: Thu Nov 21 00:38:22 2013 +0000 - - strncpy() consideered unsafe (it doesn't, for example, guarantee that - the result is null-terminated); use g_strlcpy() (which *does* guarantee - null termination) instead. - - svn path=/trunk/; revision=53461 - -commit 1ee5043 -Author: Guy Harris -Date: Thu Nov 21 00:34:38 2013 +0000 - - We don't need "ws_symbol_export.h" if we're not using anything from it; - see whether that's what's currently causing Windows build problems. - - svn path=/trunk/; revision=53460 - -commit 254614f -Author: Jörg Mayer -Date: Thu Nov 21 00:28:33 2013 +0000 - - GTK3 >= 3.10 will fail building if deprecation warnings are on. - Fix this for the cmake build by disabling these warnings. - - svn path=/trunk/; revision=53459 - -commit 123caff -Author: Evan Huus -Date: Thu Nov 21 00:18:12 2013 +0000 - - Remove one accidentally remaining reference to emem in XMPP utils. - - Kill a bunch of now-unused emem tree code. - - svn path=/trunk/; revision=53458 - -commit 50aa247 -Author: Jakub Zawadzki -Date: Wed Nov 20 23:32:02 2013 +0000 - - Fix Bug #9457 Update BACnet vendor list - - Based on attachment #12139 (diff for adding the table) by rtsking117, - but keep original formatting and encoding (ASCII). - - svn path=/trunk/; revision=53457 - -commit a252026 -Author: Evan Huus -Date: Wed Nov 20 22:51:14 2013 +0000 - - Fix minor issue introduced with conversion to new expert API in r51688. - Specifically, proto_tree_add_expert() must take an actual tree node (for example - from proto_item_add_subtree()) and cannot take just any old item node. The - original intent (before the conversion) appeared to be just to put it on the - tree, so do that. - - Another assertion gone from - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9406 - - svn path=/trunk/; revision=53456 - -commit bd62511 -Author: Guy Harris -Date: Wed Nov 20 22:38:15 2013 +0000 - - status, in main, is now used only if we have libpcap. - - svn path=/trunk/; revision=53455 - -commit 44b4d2a -Author: Guy Harris -Date: Wed Nov 20 22:36:05 2013 +0000 - - libui is an static library, not a dynamic library, so the WS_DLL_PUBLIC - stuff isn't necessary and doesn't work on Windows. - - svn path=/trunk/; revision=53454 - -commit 3b6573c -Author: Evan Huus -Date: Wed Nov 20 22:34:36 2013 +0000 - - As per suggestion of Mike Morrin via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9406 - - The GSM CBCH assertion should be <= 48 not <48. Fixes one of the failing - assertions with the capture from that bug. - - svn path=/trunk/; revision=53453 - -commit f7f4efa -Author: Guy Harris -Date: Wed Nov 20 21:00:55 2013 +0000 - - Add support for a new type of frame data record seen in a k18 file, and - handle that file not ending with a 2-byte 0xffff end-of-file record. - - This fixes bug 9455, although it doesn't add support for reading an - "index" file for a capture that's in multiple .rf5 files, which is a - separate issue noted in that bug. - - It also doesn't attempt to figure out what the data in the new record - type following the data that appears to be the same as that in the other - data record format but preceding the actual packet data is. - - svn path=/trunk/; revision=53452 - -commit ff6a590 -Author: Pascal Quantin -Date: Wed Nov 20 20:36:22 2013 +0000 - - Mark another parameter as unused - - svn path=/trunk/; revision=53451 - -commit 7d2ae28 -Author: Guy Harris -Date: Wed Nov 20 20:17:33 2013 +0000 - - Add code to dump part of a record as ASCII, and use it to dump strings - in a source description record, including the stack. Dump some other - fields in those records as well. - - Attach separate sequential and random read buffers to the private data - structure, rather than allocating them in various routines (and not - always freeing them) and, in at least one case, allocating a single - *common* buffer for all wth's to use. - - Fix some comments (the DS0 mask is 32 bytes long, but gets turned into a - bitmask). - - Put in a description of what a "stack file"'s contents look like. Much - of it may be useless to us (for example, we have the notion that TCP has - protocol number 6 built-in...), but the RELATION entries that map from - "BASE" to a protocol could obviate the need to have the user specify a - map from stack file names to starting protocols, and we might be able to - use, for example, entries that map TCP/UDP/SCTP port numbers to - protocols to obviate the need for the user to explicitly use Decode As - or otherwise configure port-to-protocol mappings themselves. - - Add a bunch of record length checks before we fetch data from records. - - svn path=/trunk/; revision=53450 - -commit 564b444 -Author: Pascal Quantin -Date: Wed Nov 20 20:07:42 2013 +0000 - - Add explicit casts to please GCC - - svn path=/trunk/; revision=53449 - -commit 61a4e7d -Author: Pascal Quantin -Date: Wed Nov 20 20:05:17 2013 +0000 - - Add explicit casts to please GCC - - svn path=/trunk/; revision=53448 - -commit 304eba4 -Author: Anders Broman -Date: Wed Nov 20 19:52:21 2013 +0000 - - Mark parameter as unused - packet-ber.c:391: warning: unused parameter 'table_name' - - svn path=/trunk/; revision=53447 - -commit 01c8945 -Author: Michael Mann -Date: Wed Nov 20 19:23:02 2013 +0000 - - Provide "Decode As" functionality through dissectors themselves instead of the GUI. Bug 9450 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450) - - The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table. When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog. Any GUI (GTK+/Qt/tshark) can just hook into the "decode as list" to see what can be provided. - - This patch includes the GUI portion of the functionality (including packet-dcerpc.[ch] because it had some GUI dependencies that are now removed). - - Other notes: - 1. Some "GUI text" (UTF8_LEFTWARDS_ARROW and similar) made their way into the dissector code. Not sure how necessary it is and if reformatting the strings to avoid the macros is desired (TCP/UDP use it, SCTP doesn't). - - 2. I converted the SCTP functionality to have 2 tabs (instead of radio button), currently both are labeled "Transport" which could be confusing to users. Naming suggestions welcome (as well as for naming of tabs from other dissectors). - - 3. BER and DCERPC have more opportunity to use Decode As now that they are selected based on dissector presense, not packet_info values. - - 4. Catapult DCT2000 populates pinfo->ipproto, yet under new design will not show up to do Decode As. Should a "decode as item" be created for it? - - 5. BER dissector doesn't have Clear/Show Current functionality working (never did) - - 6. Bluetooth (in old design) could have been used "capture wide" instead of single packet (creating tabs of values not present in current packet), which goes against what I believe to be in the intent of Decode As, but I'm willing to hear counter-arguments. - - svn path=/trunk/; revision=53446 - -commit 76ab93e -Author: Michael Mann -Date: Wed Nov 20 19:17:08 2013 +0000 - - Provide "Decode As" functionality through dissectors themselves instead of the GUI. Bug 9450 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450) - - The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table. When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog. - - This patch includes just the dissector portion of the functionality (minus packet-dcerpc.[ch] because it has hooks to the current GUI) - - svn path=/trunk/; revision=53445 - -commit 91b972a -Author: Alexis La Goutte -Date: Wed Nov 20 18:38:48 2013 +0000 - - From Jakub via http://www.wireshark.org/lists/wireshark-dev/201311/msg00153.html - - Wrong offset incrementation in r53416 (Add status_request_v2 TLS extension dissection (RFC6961)) - - From me - Fix encoding args - - svn path=/trunk/; revision=53444 - -commit f34e11f -Author: Michael Mann -Date: Wed Nov 20 02:28:14 2013 +0000 - - Convert ethertype() function into a pure dissector. Bug 9454 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9454) - - The main driving force for this was my new Decode As functionality (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450) that wants a dissector/subdissector table relationship for all dissectors wanting to use Decode As functionality. The ethertype() function provides the value to the "ethertype" subdissector table, so I think it should be matched to a dissector. Only odd side effect is the display filter of "ethertype" returns no packets because there is no "item" associated with the dissector. - - - svn path=/trunk/; revision=53443 - -commit ea278d3 -Author: Michael Mann -Date: Wed Nov 20 01:44:06 2013 +0000 - - Remove a few (now unused) variables. - - svn path=/trunk/; revision=53442 - -commit a8a3b22 -Author: Guy Harris -Date: Tue Nov 19 22:22:16 2013 +0000 - - Update URL for the Tektronix manual, and fix a typo in the same comment. - - Dump the raw contents of records as hex and ASCII, not just hex. - - Sort the record types, and add a new one for a type we've seen in a k18 - file and about which we know nothing. - - For unknown record types, print the type in hex. - - svn path=/trunk/; revision=53441 - -commit 22389d7 -Author: Gerald Combs -Date: Tue Nov 19 20:30:31 2013 +0000 - - Set our IPv6 status when we set addresses. - - svn path=/trunk/; revision=53440 - -commit 80db2d0 -Author: Gerald Combs -Date: Tue Nov 19 20:29:58 2013 +0000 - - Print one YAML item per packet. - - svn path=/trunk/; revision=53439 - -commit ffd96e2 -Author: Guy Harris -Date: Tue Nov 19 20:12:51 2013 +0000 - - Fix some problems with the debugging code. - - svn path=/trunk/; revision=53438 - -commit 30620ff -Author: Guy Harris -Date: Tue Nov 19 20:06:47 2013 +0000 - - Fix missing semicolon. - - svn path=/trunk/; revision=53437 - -commit bfc1e51 -Author: Guy Harris -Date: Tue Nov 19 20:05:21 2013 +0000 - - Constants that don't fit in 32 bits must be wrapped in - G_GINT64_CONSTANT(). - - svn path=/trunk/; revision=53436 - -commit 06098fc -Author: Guy Harris -Date: Tue Nov 19 19:45:38 2013 +0000 - - Add routines to set the personal file directory paths (personal - configuration file directory and directory in which to save captures), - have the routine to parse -P options use them, and move that routine to - libui. - - Have that routine just return a gboolean. - - svn path=/trunk/; revision=53435 - -commit 935a4de -Author: Pascal Quantin -Date: Tue Nov 19 18:20:15 2013 +0000 - - Add dissection of UICC Application Identifier - - svn path=/trunk/; revision=53434 - -commit 5064834 -Author: Pascal Quantin -Date: Tue Nov 19 18:18:52 2013 +0000 - - Fix a typo - - svn path=/trunk/; revision=53433 - -commit d28d1a8 -Author: Alexis La Goutte -Date: Tue Nov 19 12:27:09 2013 +0000 - - Fix compilation with Clang (Remove limitation to -fPIE to only C) - - /usr/include/qt5/QtCore/qglobal.h:1079:4: error: - "You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC or -fPIE." - - svn path=/trunk/; revision=53432 - -commit 11b3ae8 -Author: Alexis La Goutte -Date: Tue Nov 19 12:27:01 2013 +0000 - - From Glen Parker via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9449 - - Add support for new PostgreSQL (9.3) error/notice message fields - - Improves the PostgreSQL protocol dissector by adding support for the new error and notice fields which are new in PG 9.3: - - http://www.postgresql.org/docs/9.3/interactive/protocol-error-fields.html - - In particular, it adds support for the 'p', 'q', 's', 't', 'c', 'd', and 'n' field codes. - - From me : - Fix wrong hf name... - - svn path=/trunk/; revision=53431 - -commit afe84fe -Author: Alexis La Goutte -Date: Tue Nov 19 12:26:49 2013 +0000 - - From Ralph Böhme via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9439 - - Add missing SMB_QUERY_CIFS_UNIX_INFO capability flags - - Listed in https://git.samba.org/?p=samba.git;a=blob_plain;f=libcli/smb/smb_unix_ext.h;hb=HEAD - - svn path=/trunk/; revision=53430 - -commit 566d080 -Author: Martin Kaiser -Date: Tue Nov 19 08:03:31 2013 +0000 - - add editor modelines - - svn path=/trunk/; revision=53429 - -commit ebc201d -Author: Martin Kaiser -Date: Tue Nov 19 07:56:30 2013 +0000 - - remove unnecessary if(tree) checks - - svn path=/trunk/; revision=53428 - -commit 6812969 -Author: Martin Kaiser -Date: Tue Nov 19 07:26:01 2013 +0000 - - From DSR Corporation - - fix segfault in ZigBee APS tunnel commands - pass the data parameter to subdissectors - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9438 - - svn path=/trunk/; revision=53427 - -commit 3d0c92e -Author: Martin Kaiser -Date: Tue Nov 19 07:05:34 2013 +0000 - - fix compiler warning about write-only variable - - svn path=/trunk/; revision=53426 - -commit 864431b -Author: Anders Broman -Date: Tue Nov 19 06:06:38 2013 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=53425 - -commit bfcc639 -Author: Michael Mann -Date: Tue Nov 19 01:07:28 2013 +0000 - - Remove ppid member from packet_info structure and just pass it to SCTP subdissectors. There are no subdissectors currently in Wireshark source that use the ppid member so any third party dissectors need to update accordingly. - - svn path=/trunk/; revision=53424 - -commit d766ab6 -Author: Guy Harris -Date: Tue Nov 19 00:32:02 2013 +0000 - - The GTK+ "follow stream" dialogs don't support "save as YAML"; put in a - stub case, complete with a "this can't happen" assert failure, to - squelch compiler warnings. - - svn path=/trunk/; revision=53423 - -commit f089b4c -Author: Guy Harris -Date: Tue Nov 19 00:29:37 2013 +0000 - - #if 0 out an error check that wasn't doing anything interesting for an - error, and put in a pseudo-code call to stand in for error reporting - code. - - Fix a signed-vs-unsigned comparison issue. - - svn path=/trunk/; revision=53422 - -commit 45fc7b6 -Author: Gerald Combs -Date: Mon Nov 18 23:39:47 2013 +0000 - - Follow dialog data display improvements. - - Change the "Raw" character type to UTF-8. I'm not sure it's possible - to show true raw data in a QTextEdit widget and calling it UTF-8 more - accurately repesents what happens when you pass a char * to a QString. - Add a YAML display. Hopefully Scapy users will find it useful. - - Sort the the character display items alphabetically. Make sure we go - back to the top of the buffer when we change the direction or character - set. Be less aggressive about setting focus on the "find text" entry. - - svn path=/trunk/; revision=53421 - -commit fe2cd1d -Author: Guy Harris -Date: Mon Nov 18 23:27:06 2013 +0000 - - Terminate a value_string array. - - svn path=/trunk/; revision=53420 - -commit 785ebdc -Author: Alexis La Goutte -Date: Mon Nov 18 22:02:50 2013 +0000 - - From Matt Texier Enhance BGP Dissector : AS_PATH - - Full rewrite of BGP AS_PATH attribut using items and a clearer (and documentated !) heuristic - - From me - Fix indent - - svn path=/trunk/; revision=53419 - -commit 418a98c -Author: Guy Harris -Date: Mon Nov 18 21:42:43 2013 +0000 - - It's incremented, so not a const. - - Clean up indentation while we're at it. - - svn path=/trunk/; revision=53418 - -commit e069d1c -Author: Alexis La Goutte -Date: Mon Nov 18 20:27:04 2013 +0000 - - From Peter Wu - - Add RFC6066 CertificateUrl TLS extension - - This is not supported by OpenSSL or NSS, the extension itself seems - unsafe, but some implementations seem to support it[1]. - - Untested, no capture available. - - [1]: http://www.ietf.org/mail-archive/web/tls/current/msg02535.html - - svn path=/trunk/; revision=53417 - -commit 123e3d9 -Author: Alexis La Goutte -Date: Mon Nov 18 20:26:55 2013 +0000 - - From Peter Wu - - Add status_request_v2 TLS extension dissection (RFC6961) - - Besides adding status_request_v2 support, this patch moves the - Certificate Status Type from the OCSP Status subtree to its parent - (the extension tree). This is needed because this type applies to all - OCSPResponse fields. - - The check for "tree != NULL" seems unnecessary here, it was not - clarified in the original patch so I removed it. - - From me - Fix typo - Remove unneeded tvb_ensure_bytes_exist - Use proto_tree_add_item - - svn path=/trunk/; revision=53416 - -commit 954584d -Author: Alexis La Goutte -Date: Mon Nov 18 20:26:46 2013 +0000 - - From Peter Wu - - Add TLS StatusRequest (RFC6066) ClientHello extension recognition - - Only empty Responder ID lists and empty Request Extensions are - implemented. I could not really find existing clients or servers that - populate these. - - This status_request extension has a different signature for a - ClientHello and ServerHello, in the latter the extension_data field - must be empty. Therefore an additional parameter is added to - dissect_ssl3_hnd_hello_ext. - - From me : - Fix typo - - svn path=/trunk/; revision=53415 - -commit 22f57a9 -Author: Alexis La Goutte -Date: Mon Nov 18 20:26:37 2013 +0000 - - From Peter Wu - - Support for EncryptedExtensions handshake type (a.k.a. NextProtocol) - - Based on https://tools.ietf.org/html/draft-agl-tls-nextprotoneg-04 - - From me - Fix warning found by fix-encoding-args - - svn path=/trunk/; revision=53414 - -commit 0bae995 -Author: Alexis La Goutte -Date: Mon Nov 18 20:26:27 2013 +0000 - - Remove duplicate (wireshark_application.h) and unused #include files - - svn path=/trunk/; revision=53413 - -commit 16e2704 -Author: Gerald Combs -Date: Mon Nov 18 17:41:00 2013 +0000 - - 1.11.2 → 1.11.3. - - svn path=/trunk/; revision=53412 - -commit 5033435 -Author: Gerald Combs -Date: Mon Nov 18 16:44:16 2013 +0000 - - Build 1.11.2. - - svn path=/trunk/; revision=53411 - -commit 6188141 -Author: Martin Kaiser -Date: Mon Nov 18 11:16:32 2013 +0000 - - fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9448 - - pass data parameter to afp dissector - - svn path=/trunk/; revision=53410 - -commit 87fb87b -Author: Guy Harris -Date: Mon Nov 18 07:58:16 2013 +0000 - - I guess "v4" is 1.3 and "v5" is 1.4. I'm sure there's a reason why that - makes sense of a sort.... - - svn path=/trunk/; revision=53409 - -commit 9965f29 -Author: Guy Harris -Date: Mon Nov 18 07:54:48 2013 +0000 - - You don't get to have three separate protocols all with the name - "OpenFlow 1.3". - - svn path=/trunk/; revision=53408 - -commit 2276ff0 -Author: Jörg Mayer -Date: Mon Nov 18 07:42:23 2013 +0000 - - Beginnings of CheckAPI support. More diligence needed - (need to seperate generated files into their own variables). - - svn path=/trunk/; revision=53407 - -commit 7b80faa -Author: Jörg Mayer -Date: Mon Nov 18 07:25:12 2013 +0000 - - Fix some warnings that were really errors. - - It would really help to fix the remaining warnings so that these - files can be compiled with -Werror, which gets me to the quesiton: - Is this code still maintained in some form or was it an interesting - experiment that has been terminated? - - svn path=/trunk/; revision=53406 - -commit adc82b1 -Author: Anders Broman -Date: Mon Nov 18 06:24:27 2013 +0000 - - From Zoltán Lajos Kis: - Start of OpenFlow 1.4 dissector. - - svn path=/trunk/; revision=53405 - -commit 202a03b -Author: Anders Broman -Date: Mon Nov 18 06:22:09 2013 +0000 - - Fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=53404 - -commit 67d4aaa -Author: Guy Harris -Date: Mon Nov 18 00:51:22 2013 +0000 - - Get rid of unused trivial wrapper routine. - - svn path=/trunk/; revision=53403 - -commit 061831b -Author: Jörg Mayer -Date: Sun Nov 17 21:25:00 2013 +0000 - - Don't include epan/filesystem.h any more - - svn path=/trunk/; revision=53402 - -commit 7d39211 -Author: Martin Kaiser -Date: Sun Nov 17 17:51:59 2013 +0000 - - add a cast to fix compiler warning - - svn path=/trunk/; revision=53401 - -commit b4b5d00 -Author: Pascal Quantin -Date: Sun Nov 17 17:00:11 2013 +0000 - - Fix the number of highlighted bytes in case of unaligned PER constrained integer - - svn path=/trunk/; revision=53400 - -commit 1c73d04 -Author: Pascal Quantin -Date: Sun Nov 17 16:40:25 2013 +0000 - - From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9442 : - DNP3 bug fix for analog data sign bit bandling - - svn path=/trunk/; revision=53399 - -commit d28beab -Author: Pascal Quantin -Date: Sun Nov 17 15:57:51 2013 +0000 - - From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9435 : - SEL Fast Message bug fix for signed 16-bit integer fast meter messages - - svn path=/trunk/; revision=53398 - -commit af081c7 -Author: Gerald Combs -Date: Sun Nov 17 15:03:41 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-11-17] - - svn path=/trunk/; revision=53395 - -commit 55a9182 -Author: Pascal Quantin -Date: Sun Nov 17 14:48:55 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9441 : - Fix Notify IPv6 address parsing in RTPproxy dissector - - svn path=/trunk/; revision=53394 - -commit 3ddf37e -Author: Pascal Quantin -Date: Sun Nov 17 14:32:40 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9440 : - RTPproxy: use proto_item_append_text instead of rewriting the entire item's text - - svn path=/trunk/; revision=53393 - -commit 374683f -Author: Alexis La Goutte -Date: Sun Nov 17 14:28:42 2013 +0000 - - Fix indent (2 spaces) and remove trailing whitespace - - svn path=/trunk/; revision=53392 - -commit c25fab0 -Author: Pascal Quantin -Date: Sun Nov 17 14:14:41 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9430 : - Fix empty ToTag in RTPproxy's Offer/Update command - - svn path=/trunk/; revision=53391 - -commit 35b7824 -Author: Alexis La Goutte -Date: Sun Nov 17 14:03:58 2013 +0000 - - Fix indent (use tabs) - - svn path=/trunk/; revision=53390 - -commit 4f2808b -Author: Alexis La Goutte -Date: Sun Nov 17 14:03:45 2013 +0000 - - Fix indent (use 4 spaces) and add modelines - - svn path=/trunk/; revision=53389 - -commit 02284a7 -Author: Alexis La Goutte -Date: Sun Nov 17 14:03:32 2013 +0000 - - Fix indent (use 4 spaces) and add modelines - - svn path=/trunk/; revision=53388 - -commit 983ea76 -Author: Alexis La Goutte -Date: Sun Nov 17 14:03:17 2013 +0000 - - Add extern C if cplusplus (when use with Qt) Add Modelines (and fix indent use 4 spaces for oids.h) - - svn path=/trunk/; revision=53387 - -commit 768d277 -Author: Martin Kaiser -Date: Sun Nov 17 14:02:54 2013 +0000 - - use explicit casts to fix compilation on OS X - - svn path=/trunk/; revision=53386 - -commit 101c3cd -Author: Pascal Quantin -Date: Sun Nov 17 13:59:06 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9429 : - Fix Notify info parsing in RTPproxy dissector - - svn path=/trunk/; revision=53385 - -commit 3f2eaf1 -Author: Martin Kaiser -Date: Sun Nov 17 13:41:16 2013 +0000 - - add Kyoto Tycoon to the list of new protocols - - svn path=/trunk/; revision=53384 - -commit 2510118 -Author: Martin Kaiser -Date: Sun Nov 17 13:36:21 2013 +0000 - - From Abhik Sarkar: - dissector for Kyoto Tycoon binary protocol - - from me: - make port range preference work - highlight the correct bytes for records - remove trailing commas - correct(?) 64->32 cast - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9418 - - svn path=/trunk/; revision=53383 - -commit ea45be3 -Author: Pascal Quantin -Date: Sun Nov 17 13:31:32 2013 +0000 - - Add a way to retrieve a PER variable bit string length - - svn path=/trunk/; revision=53382 - -commit ed80b06 -Author: Guy Harris -Date: Sun Nov 17 08:49:51 2013 +0000 - - strncat() bad, g_strlcat() good. - - svn path=/trunk/; revision=53381 - -commit d0cd962 -Author: Guy Harris -Date: Sun Nov 17 04:43:28 2013 +0000 - - Clean up indentation. - - svn path=/trunk/; revision=53380 - -commit eee9b9d -Author: Guy Harris -Date: Sun Nov 17 04:39:44 2013 +0000 - - Move get_tempfile_path() from filesystem.[ch] to tempfile.[ch]. - - svn path=/trunk/; revision=53379 - -commit 74647a3 -Author: Guy Harris -Date: Sun Nov 17 04:31:26 2013 +0000 - - We just use g_get_tmp_dir() to get the temporary file directory when - creating temporary files, so use it to get the directory we show to the - user. - - svn path=/trunk/; revision=53378 - -commit db25270 -Author: Guy Harris -Date: Sun Nov 17 02:55:14 2013 +0000 - - Move the epan/filesystem.c routines to wsutil; they're not specific to - packet dissection, they're specific to the entire Wireshark suite of - programs. - - svn path=/trunk/; revision=53377 - -commit dd1034e -Author: Guy Harris -Date: Sat Nov 16 22:57:54 2013 +0000 - - I guess the order *doesn't* matter. - - svn path=/trunk/; revision=53376 - -commit bc8d5a1 -Author: Jakub Zawadzki -Date: Sat Nov 16 22:44:29 2013 +0000 - - Fix previous commit + rename to bitswap. - - svn path=/trunk/; revision=53375 - -commit 004220f -Author: Jakub Zawadzki -Date: Sat Nov 16 22:31:07 2013 +0000 - - Exporting/importing variables cause problems, so create function to do bitswaping. - - svn path=/trunk/; revision=53374 - -commit 0e02916 -Author: Guy Harris -Date: Sat Nov 16 21:40:42 2013 +0000 - - OK, does it matter in which order "extern" and "declspec" appear? - - svn path=/trunk/; revision=53373 - -commit 623caee -Author: Guy Harris -Date: Sat Nov 16 19:47:25 2013 +0000 - - For *definitions* of external data items, we need to use - WS_DLL_PUBLIC_DEF. - - svn path=/trunk/; revision=53372 - -commit e542bd8 -Author: Martin Kaiser -Date: Sat Nov 16 17:23:46 2013 +0000 - - dissect operator tune status, reorder some defines - - svn path=/trunk/; revision=53371 - -commit f161482 -Author: Martin Kaiser -Date: Sat Nov 16 17:22:56 2013 +0000 - - dissect extended event usage - - svn path=/trunk/; revision=53370 - -commit 65a96c1 -Author: Martin Kaiser -Date: Sat Nov 16 14:17:06 2013 +0000 - - interpret the flags for EIT p/f, EIT sch usage - - svn path=/trunk/; revision=53369 - -commit 28886d1 -Author: Pascal Quantin -Date: Sat Nov 16 14:08:03 2013 +0000 - - Clear protocol column when the dissector is known - - svn path=/trunk/; revision=53368 - -commit 13672dc -Author: Pascal Quantin -Date: Sat Nov 16 13:15:44 2013 +0000 - - Put "GSM SIM" in protocol column - - svn path=/trunk/; revision=53367 - -commit f3ef33d -Author: Jakub Zawadzki -Date: Sat Nov 16 09:26:08 2013 +0000 - - Fix epan_memmem() copyrights. - - svn path=/trunk/; revision=53366 - -commit 3b9f6df -Author: Jakub Zawadzki -Date: Sat Nov 16 09:16:57 2013 +0000 - - Move bitswap.[ch] from epan to wsutil. - - svn path=/trunk/; revision=53365 - -commit 4f78d3c -Author: Jakub Zawadzki -Date: Sat Nov 16 09:11:26 2013 +0000 - - Don't include when not needed - - svn path=/trunk/; revision=53364 - -commit d84c4ef -Author: Jakub Zawadzki -Date: Sat Nov 16 08:56:44 2013 +0000 - - Remove svn:executable property from packet-finger.c packet-whois.c - - svn path=/trunk/; revision=53363 - -commit 0991626 -Author: Chris Maynard -Date: Sat Nov 16 03:21:06 2013 +0000 - - Add a basic finger dissector. - See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9432 - - svn path=/trunk/; revision=53362 - -commit 4fae219 -Author: Bill Meier -Date: Sat Nov 16 03:16:57 2013 +0000 - - Reformat some lines; - Tweak some whitespace. - - svn path=/trunk/; revision=53361 - -commit a848b34 -Author: Bill Meier -Date: Sat Nov 16 02:53:12 2013 +0000 - - Create/use extended-value-strings to reference certain value-strings; - Constify a character array; - Fix a typo in a coment; - Tweak some whitespace; - - svn path=/trunk/; revision=53360 - -commit 3e5b82d -Author: Bill Meier -Date: Sat Nov 16 02:48:43 2013 +0000 - - Constify a character array; - Add forward declarations for proto_register_...() & proto_reg_hand_off_...(); - Remove a boilerpalte comment; - Tweak some whitespace; - Add editor modelines. - - - svn path=/trunk/; revision=53359 - -commit d973799 -Author: Bill Meier -Date: Sat Nov 16 02:46:04 2013 +0000 - - Constify a character array; - 'localize' some variables; - Remove some unneeded initializers; - Move proto_reg_handoff_...() to the end of the file as per convention; - Add forward declarations for proto_register_...() & proto_reg_hand_off_...(); - Reformat some long lines; - Tweak some whitespace; - Add editor modelines. - - svn path=/trunk/; revision=53358 - -commit 5eac178 -Author: Bill Meier -Date: Sat Nov 16 02:36:53 2013 +0000 - - Constify two character arrays; - '#if 0' variable 'set but never used' & related code; - 'localize' some variables; - Remove some unneeded initializers; - Tweak some whitespace; - Add editor modelines. - - svn path=/trunk/; revision=53357 - -commit fd95b3d -Author: Gerald Combs -Date: Sat Nov 16 02:34:36 2013 +0000 - - Instead of installing a script named "utility-launcher" and renaming it, - install a script named "wireshark". - - svn path=/trunk/; revision=53356 - -commit 0892ff6 -Author: Bill Meier -Date: Sat Nov 16 02:30:02 2013 +0000 - - Change editor modelines to reflect actual indentation used in file (4 spaces); - Replace a few tabs with spaces; - Fix some spelling in comments; - Tweak some whitespace. - - - svn path=/trunk/; revision=53355 - -commit b073be7 -Author: Gerald Combs -Date: Sat Nov 16 01:16:14 2013 +0000 - - Try reverting 01wireshark.xml to r53280. - - svn path=/trunk/; revision=53354 - -commit ea73d4a -Author: Jakub Zawadzki -Date: Sat Nov 16 01:10:05 2013 +0000 - - Avoid calling find_dissector(), cache result of [new_]register_dissector() - - svn path=/trunk/; revision=53353 - -commit 09dc9a3 -Author: Gerald Combs -Date: Sat Nov 16 00:27:19 2013 +0000 - - Try removing XML headers. - - svn path=/trunk/; revision=53352 - -commit 72baf40 -Author: Jakub Zawadzki -Date: Fri Nov 15 23:33:48 2013 +0000 - - Make swaptab const. - - svn path=/trunk/; revision=53351 - -commit 8c11584 -Author: Jakub Zawadzki -Date: Fri Nov 15 23:33:02 2013 +0000 - - Make wslua byte_to_str[] array of char[3] instead of pointers to char. - - XXX, it should use byte_to_hex() from to_str.c - - svn path=/trunk/; revision=53350 - -commit 70b9ce2 -Author: Pascal Quantin -Date: Fri Nov 15 23:16:25 2013 +0000 - - Dissect USB Com Network Control Model requests - - svn path=/trunk/; revision=53349 - -commit 47c6288 -Author: Gerald Combs -Date: Fri Nov 15 23:15:08 2013 +0000 - - From Dirk Jagdmann: Make sure err_str is initialized. - - svn path=/trunk/; revision=53347 - -commit f772a26 -Author: Gerald Combs -Date: Fri Nov 15 22:34:31 2013 +0000 - - 1.11.1 → 1.11.2. - - svn path=/trunk/; revision=53346 - -commit bde2a94 -Author: Chris Maynard -Date: Fri Nov 15 22:31:11 2013 +0000 - - Fix chopping when offset is 0. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9422 - - svn path=/trunk/; revision=53345 - -commit d3033d3 -Author: Gerald Combs -Date: Fri Nov 15 20:45:13 2013 +0000 - - Build 1.11.1. - - svn path=/trunk/; revision=53344 - -commit de4c6a2 -Author: Gerald Combs -Date: Fri Nov 15 20:25:33 2013 +0000 - - Reset data_out_file when we close it. Add comments and fixup whitespace. - - svn path=/trunk/; revision=53343 - -commit 1868bd1 -Author: Gerald Combs -Date: Fri Nov 15 20:24:56 2013 +0000 - - When we freeze the packet list disconnect its model. - - This matches the GTK+ behavior and keeps us from dissecting TCP packets - out of order when we follow a TCP stream. - - svn path=/trunk/; revision=53342 - -commit 4eefe7c -Author: Jakub Zawadzki -Date: Fri Nov 15 18:12:24 2013 +0000 - - Remove comment & defines for frame_data_sequence from cfile.h - - It's already in epan/frame_data_sequence.c and no-one else should use it. - - svn path=/trunk/; revision=53341 - -commit 230ac54 -Author: Gerald Combs -Date: Fri Nov 15 17:02:20 2013 +0000 - - Apply the changes from r52506. Fixes bug 9044 for the Qt port. - - svn path=/trunk/; revision=53340 - -commit 31c1e20 -Author: Jörg Mayer -Date: Fri Nov 15 08:24:08 2013 +0000 - - Updating a generated file - - svn path=/trunk/; revision=53339 - -commit d212ae7 -Author: Jörg Mayer -Date: Fri Nov 15 08:21:11 2013 +0000 - - Remove some trailing whitespace - - svn path=/trunk/; revision=53338 - -commit 171f91d -Author: Anders Broman -Date: Fri Nov 15 06:32:11 2013 +0000 - - Try to fix [-Wmissing-prototypes] - - svn path=/trunk/; revision=53337 - -commit 23e55c6 -Author: Guy Harris -Date: Fri Nov 15 01:20:34 2013 +0000 - - To quote GCC, "uninitialized const 'zeroes' is invalid in C++". I guess - that must be true, and that there's a reason why it's invalid.... - - svn path=/trunk/; revision=53336 - -commit afd79c3 -Author: Gerald Combs -Date: Fri Nov 15 00:30:07 2013 +0000 - - Add a "to do" item. - - svn path=/trunk/; revision=53335 - -commit 2fb674f -Author: Bill Meier -Date: Fri Nov 15 00:15:20 2013 +0000 - - Create/use value_string_ext to reference a value-string-array. - Define an array as const. - - - svn path=/trunk/; revision=53334 - -commit 494d4bb -Author: Gerald Combs -Date: Thu Nov 14 23:54:41 2013 +0000 - - Add changes since 1.11.0. - - svn path=/trunk/; revision=53333 - -commit 530d88d -Author: Bill Meier -Date: Thu Nov 14 23:54:09 2013 +0000 - - Let's try putting the 'const' in the right place... - - svn path=/trunk/; revision=53332 - -commit d735fef -Author: Gerald Combs -Date: Thu Nov 14 23:40:26 2013 +0000 - - Update the guidelines a bit. - - svn path=/trunk/; revision=53331 - -commit bc17e76 -Author: Bill Meier -Date: Thu Nov 14 23:11:12 2013 +0000 - - Create/use value_string_ext to reference certain value-string-arrays. - Define an array as const. - Add editor modelines. - Do some minor whitespace & formatting style changes. - - svn path=/trunk/; revision=53330 - -commit f954245 -Author: Gerald Combs -Date: Thu Nov 14 22:52:05 2013 +0000 - - Revert some inadvertent changes from the last commit. - - svn path=/trunk/; revision=53329 - -commit c0c26f8 -Author: Jakub Zawadzki -Date: Thu Nov 14 22:50:55 2013 +0000 - - 64-bits: reorder fields in struct _protocol to remove padding. - - This patch decrease size of _protocol structure from 64B to 56B - - svn path=/trunk/; revision=53328 - -commit b5916f0 -Author: Jakub Zawadzki -Date: Thu Nov 14 22:40:40 2013 +0000 - - Expand CHECK_DISPLAY_AS_X ('this macro looks like a hack') macro in packet-ieee80211.c, remove it. - - svn path=/trunk/; revision=53327 - -commit 1745e13 -Author: Gerald Combs -Date: Thu Nov 14 22:35:10 2013 +0000 - - Create a plural-only English translation. Use it to pluralize the Follow - Stream and Flow Graph hint statistics. - - svn path=/trunk/; revision=53326 - -commit 64f4e13 -Author: Bill Meier -Date: Thu Nov 14 22:26:08 2013 +0000 - - Create/use value_string_ext to reference certain value-string-arrays. - Define an array as const. - Remove some unneeded initializers. - Add editor modelines. - Do some minor whitespace changes. - - svn path=/trunk/; revision=53325 - -commit ea849c7 -Author: Gerald Combs -Date: Thu Nov 14 22:18:58 2013 +0000 - - Fix preprocessing logic. - - svn path=/trunk/; revision=53324 - -commit 7226846 -Author: Martin Kaiser -Date: Thu Nov 14 21:49:23 2013 +0000 - - share Data Broadcast IDs between MPEG descriptor and DVB-CI - - svn path=/trunk/; revision=53323 - -commit ef7e1f1 -Author: Martin Kaiser -Date: Thu Nov 14 21:44:05 2013 +0000 - - fix application capability handling - - svn path=/trunk/; revision=53322 - -commit c333b6f -Author: Martin Kaiser -Date: Thu Nov 14 21:42:00 2013 +0000 - - add Data Broadcast ID for CI+ and HbbTV - - svn path=/trunk/; revision=53321 - -commit cc30b35 -Author: Martin Kaiser -Date: Thu Nov 14 21:40:59 2013 +0000 - - dissect Operator Profile's delivery capability bytes - - svn path=/trunk/; revision=53320 - -commit a3cb8fd -Author: Bill Meier -Date: Thu Nov 14 21:32:47 2013 +0000 - - Create/use value_string_ext to reference certain value-string-arrays. - Define a char array as const. - Remove an unneeded initializer. - Add editor modelines. - Do some minor whitespace changes. - - svn path=/trunk/; revision=53319 - -commit d369ee8 -Author: Chris Maynard -Date: Thu Nov 14 21:20:49 2013 +0000 - - Cast the return value of conversation_get_proto_data() to whois_transaction_t *. - - svn path=/trunk/; revision=53318 - -commit 2f523fd -Author: Chris Maynard -Date: Thu Nov 14 21:04:05 2013 +0000 - - Add a basic whois dissector. - See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9357 - - svn path=/trunk/; revision=53317 - -commit 87594e3 -Author: Bill Meier -Date: Thu Nov 14 20:32:58 2013 +0000 - - Create/use value_string_ext for some value-string-arrays. - Define several char arrays as const. - Add editor modelines. - Do some minor whitespace changes. - - svn path=/trunk/; revision=53316 - -commit ccb6da1 -Author: Gerald Combs -Date: Thu Nov 14 18:55:50 2013 +0000 - - Fix automake compilation. - - svn path=/trunk/; revision=53315 - -commit 190bdc3 -Author: Gerald Combs -Date: Thu Nov 14 17:37:40 2013 +0000 - - Add packet information and selection to the Follow Stream dialog. - - Collect packet numbers when following streams so that we can correlate - text positions with packets. Add a FollowStreamText class so that we can - track mouse events. Add a hint label that shows the packet under the - cursor along with packet counts and the number of "turns". - - Add the packet number to the C array dump. Note that dumping to YAML - might be useful for Scapy users. - - svn path=/trunk/; revision=53314 - -commit 2809240 -Author: Evan Huus -Date: Thu Nov 14 13:07:53 2013 +0000 - - Add a cast to try and fix the OSX buildbot. - - svn path=/trunk/; revision=53313 - -commit 488cf80 -Author: Pascal Quantin -Date: Thu Nov 14 09:43:32 2013 +0000 - - Fix dissection of MBIM Extended Functional Descriptor MTU - - svn path=/trunk/; revision=53312 - -commit a7e417b -Author: Anders Broman -Date: Thu Nov 14 06:21:02 2013 +0000 - - Get rid of Warinings [-Wmissing-prototypes] - - svn path=/trunk/; revision=53311 - -commit bfca717 -Author: Evan Huus -Date: Thu Nov 14 03:34:01 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9303 based on patch and - help from Matthieu Patou. - - If the DCE-RPC heuristic failed to identify a TVB, *but* we've already decoded - a DCE-RPC layer in this packet *and* the heuristic failed because we didn't have - enough data, make the reasonable assumption that it actually is another DCE-RPC - packet, and ask TCP to desegment more data for us and try again. - - svn path=/trunk/; revision=53310 - -commit b13c1b7 -Author: Evan Huus -Date: Wed Nov 13 23:47:57 2013 +0000 - - The kafka compression codec is only 2 bits, not 3. - - svn path=/trunk/; revision=53309 - -commit fc08bf1 -Author: Evan Huus -Date: Wed Nov 13 23:43:08 2013 +0000 - - Fix what appears to be a mistake during the conversion in r53036 from - dissector_try_uint to dissector_try_uint_new: protocols called due to TCP port - matching were not getting added to the list of protocols in the frame. The - "add_proto_name" parameter should be TRUE except in unusual circumstances. - - svn path=/trunk/; revision=53308 - -commit 329873c -Author: Martin Kaiser -Date: Wed Nov 13 23:10:01 2013 +0000 - - share service type descriptions between MPEG descriptor and DVB-CI - - svn path=/trunk/; revision=53307 - -commit b0063a0 -Author: Gerald Combs -Date: Wed Nov 13 22:18:01 2013 +0000 - - Highlight selected sequence diagram items. - - Create a new dialog each time the user follows a stream. A lot of the - follow code seems to assume one and only one dialog so there are likely - outstanding bugs. - - Don't use the global cfile (should we deprecate its usage?). We want to - move closer to multiple documents, not further away. - - Clean up after ourselves. Free our payload list and unlink our temp - file. Make a bunch of gchar*s QStrings. Make sure our destructor gets - called and use it. - - Make member variable and method names more consistent. - - svn path=/trunk/; revision=53306 - -commit 3e41e17 -Author: Martin Kaiser -Date: Wed Nov 13 21:52:33 2013 +0000 - - dissect Refresh Request Flag - - svn path=/trunk/; revision=53305 - -commit ff7f1c8 -Author: Martin Kaiser -Date: Wed Nov 13 20:41:00 2013 +0000 - - dissect Operator Profile's delivery system hint - - svn path=/trunk/; revision=53304 - -commit 014bbf1 -Author: Bill Meier -Date: Wed Nov 13 19:29:37 2013 +0000 - - (Minor cleanup): unneeded initializers, whitespace, long-lines, typos - - svn path=/trunk/; revision=53303 - -commit 53a29de -Author: Pascal Quantin -Date: Wed Nov 13 17:28:18 2013 +0000 - - Add more GSM SIM Toolkit info to info column - - svn path=/trunk/; revision=53302 - -commit 219fb7f -Author: Jeff Morriss -Date: Wed Nov 13 17:11:21 2013 +0000 - - Fix CID 1113411: close the file descriptor and free the file name even in - error cases. - - svn path=/trunk/; revision=53301 - -commit 6b7ab3b -Author: Jeff Morriss -Date: Wed Nov 13 16:16:06 2013 +0000 - - Make subpackage Requires: more generic. - - svn path=/trunk/; revision=53300 - -commit 38eac2f -Author: Jeff Morriss -Date: Wed Nov 13 14:00:45 2013 +0000 - - Wrap GCC pragma in an #ifdef to make it compile when we're not using GCC. - - Again, change manually applied to the .h file. - - svn path=/trunk/; revision=53299 - -commit 8893d3d -Author: Jeff Morriss -Date: Wed Nov 13 03:20:37 2013 +0000 - - Use a gcc pragma to stop the (pages of) warnings coming out of - x11-extensions-implementation.h . - - This change was manually applied to the .h file as I can't currently rebuild - the X11 dissector. - - svn path=/trunk/; revision=53298 - -commit 78f8757 -Author: Jeff Morriss -Date: Wed Nov 13 03:01:42 2013 +0000 - - Add a (wireshark-)qt package that contains the Qt-based GUI (and the necessary - desktop-integration files); build it by default. - - Use 'alternatives' to choose which GUI actually gets used; give the Gtk - GUI priority over the Qt one (for now). - - svn path=/trunk/; revision=53297 - -commit 3009823 -Author: Gerald Combs -Date: Wed Nov 13 02:50:25 2013 +0000 - - Simplify the CLI preinstall script a bit and hopefully get rid of an error. - - svn path=/trunk/; revision=53296 - -commit a1a63ba -Author: Jeff Morriss -Date: Wed Nov 13 01:52:06 2013 +0000 - - Set SVN properties. - - svn path=/trunk/; revision=53295 - -commit fd81ae5 -Author: Gerald Combs -Date: Tue Nov 12 22:50:26 2013 +0000 - - Highlight selected sequence diagram items. - - svn path=/trunk/; revision=53294 - -commit 6461057 -Author: Guy Harris -Date: Tue Nov 12 22:22:23 2013 +0000 - - Now that fvalue_to_string_repr() returns NULL if the fvalue's ftype has - no val_to_string_repr method, we don't need to check whether it has such - a method, and thus don't need to include epan/ftypes/ftypes-int.h. - - svn path=/trunk/; revision=53293 - -commit 3c22e05 -Author: Pascal Quantin -Date: Tue Nov 12 22:09:10 2013 +0000 - - tabs -> spaces - - svn path=/trunk/; revision=53292 - -commit 0e20c39 -Author: Pascal Quantin -Date: Tue Nov 12 22:07:11 2013 +0000 - - Fix a typo error - - svn path=/trunk/; revision=53291 - -commit 409dd07 -Author: Guy Harris -Date: Tue Nov 12 22:06:00 2013 +0000 - - Replace fvalue_ftype() with a fvalue_type_ftenum() routine that returns - the ftenum_t for the fvalue's ftype, rather than a pointer to the ftype - (which isn't all that useful except as a handle, unless you import the - internal header). - - Have fvalue_to_string_repr() return NULL, rather than failing, if the - fvalue's ftype has no val_to_string_repr method. - - This lets us not include the ftypes internal header in - ui/cli/tap-diameter-avp.c. - - svn path=/trunk/; revision=53290 - -commit 72f3c25 -Author: Martin Kaiser -Date: Tue Nov 12 22:04:47 2013 +0000 - - share the text description of service types between MPEG PMT and DVB-CI - - svn path=/trunk/; revision=53289 - -commit 7221215 -Author: Michael Mann -Date: Tue Nov 12 22:04:03 2013 +0000 - - Add "rtp handle protection" inside srtp_add_address/rtp_add_address/bluetooth_add_address so dissectors calling it don't need to find "rtp" just for the handle check. - - svn path=/trunk/; revision=53288 - -commit 99f0fc1 -Author: Martin Kaiser -Date: Tue Nov 12 21:48:13 2013 +0000 - - From Michal Labedzki - - add forward declarations - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 - - svn path=/trunk/; revision=53287 - -commit 7221138 -Author: Martin Kaiser -Date: Tue Nov 12 21:45:50 2013 +0000 - - From Michal Labedzki - - change two local variables to gint16 so we can store - -1 for invalid value - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 - - svn path=/trunk/; revision=53286 - -commit bcf10a8 -Author: Martin Kaiser -Date: Tue Nov 12 21:28:27 2013 +0000 - - From robionekenobi - add expert info for invalid item length in mq pcf - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9411 - - svn path=/trunk/; revision=53285 - -commit 29ff687 -Author: Michael Mann -Date: Tue Nov 12 21:22:37 2013 +0000 - - LMP dissector can't be called by anything but UDP, so no need to check that. - - svn path=/trunk/; revision=53284 - -commit a661864 -Author: Michael Mann -Date: Tue Nov 12 21:10:20 2013 +0000 - - Add "T.38 handle protection" inside t38_add_address() so dissectors calling it don't need to find "t38" just for the handle check. - - svn path=/trunk/; revision=53283 - -commit f56aa72 -Author: Jeff Morriss -Date: Tue Nov 12 20:47:03 2013 +0000 - - Don't do our own line wrapping of the display filter, let GTK do it for us. - (With this change all the right-hand columns in this dialog will wrap if - necessary whereas before only the display filter would wrap lines.) - - svn path=/trunk/; revision=53282 - -commit 30bdf66 -Author: Gerald Combs -Date: Tue Nov 12 20:38:58 2013 +0000 - - Fix permissions for installed OS X files and directories. - - Add a cli-preinstall script that creates missing parts of the - installation path and sets their permissions. Simply copy - "utility-launcher" to "wireshark" instead of renaming it at install - time. Explicitly set its ownership and permissions. Pretty-print some of - the PackageMaker XML files via `xmllint --format --recover`. - - svn path=/trunk/; revision=53281 - -commit 4525c64 -Author: Gerald Combs -Date: Tue Nov 12 19:31:02 2013 +0000 - - Fix compilation on Windows. - - svn path=/trunk/; revision=53280 - -commit 4299d4e -Author: Gerald Combs -Date: Tue Nov 12 19:12:40 2013 +0000 - - Try to fix compilation for GLib < 2.30. - - svn path=/trunk/; revision=53279 - -commit a97460a -Author: Jeff Morriss -Date: Tue Nov 12 18:57:14 2013 +0000 - - Add an item for any unknown tags we come across (just as FT_BYTES). - - svn path=/trunk/; revision=53278 - -commit 64f0caf -Author: Jeff Morriss -Date: Tue Nov 12 18:49:57 2013 +0000 - - De-duplicate some code by changing a while loop to a do-while loop. - - svn path=/trunk/; revision=53277 - -commit 1d8a895 -Author: Gerald Combs -Date: Tue Nov 12 17:34:50 2013 +0000 - - Try using UTF8_RIGHTWARDS_ARROW to indicate direction. - - If this doesn't cause any problems we should probably move - utf8_entities.h from ui to wsutil. - - svn path=/trunk/; revision=53276 - -commit 89db79a -Author: Gerald Combs -Date: Tue Nov 12 17:02:17 2013 +0000 - - When we dump a sequence diagram to text, make sure labels are truncated. - - svn path=/trunk/; revision=53275 - -commit 76bfa2c -Author: Michael Mann -Date: Tue Nov 12 13:46:51 2013 +0000 - - Remove usb_conv_info_t from packet_info and pass the data directly into the subdissectors. Bug 9413 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9413) - - svn path=/trunk/; revision=53274 - -commit 2b729ba -Author: Martin Kaiser -Date: Tue Nov 12 11:53:05 2013 +0000 - - From Michal Labedski - fix Logically Dead Code: allow cmd==0 - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9420 - - svn path=/trunk/; revision=53273 - -commit ecad809 -Author: Irene Rüngeler -Date: Tue Nov 12 10:22:27 2013 +0000 - - Fix segfault bug and show the combo-box. - - svn path=/trunk/; revision=53272 - -commit 4808694 -Author: Irene Rüngeler -Date: Tue Nov 12 10:21:17 2013 +0000 - - Use the right threshold. - - svn path=/trunk/; revision=53271 - -commit 4578241 -Author: Martin Kaiser -Date: Tue Nov 12 10:08:13 2013 +0000 - - remove pointless if (tree) checks - - svn path=/trunk/; revision=53270 - -commit ccb8b8f -Author: Alexis La Goutte -Date: Tue Nov 12 09:23:37 2013 +0000 - - Remove some #include (Found by iwyu) - - svn path=/trunk/; revision=53269 - -commit e13ef41 -Author: Alexis La Goutte -Date: Tue Nov 12 09:23:13 2013 +0000 - - Fix typo (for generated Documentation) - - svn path=/trunk/; revision=53268 - -commit 371683c -Author: Alexis La Goutte -Date: Tue Nov 12 09:22:51 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=53267 - -commit ca63f71 -Author: Alexis La Goutte -Date: Tue Nov 12 09:22:28 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=53266 - -commit e706af2 -Author: Alexis La Goutte -Date: Tue Nov 12 09:21:48 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=53265 - -commit dc93a4b -Author: Gerald Combs -Date: Tue Nov 12 01:39:44 2013 +0000 - - Redraw the diagram when needed. - - svn path=/trunk/; revision=53264 - -commit fc93c3a -Author: Gerald Combs -Date: Tue Nov 12 01:08:08 2013 +0000 - - Sequence / flow diagram updates. - - Add "Save As..." Add a context menu and keyboard shortcuts. Add a - tooltip. - - svn path=/trunk/; revision=53263 - -commit edbe198 -Author: Martin Mathieson -Date: Mon Nov 11 22:36:08 2013 +0000 - - Include rohc struct inside pdcp instead of repeating all of the fields - - svn path=/trunk/; revision=53262 - -commit 77e4c15 -Author: Martin Kaiser -Date: Mon Nov 11 22:15:30 2013 +0000 - - replace proto_tree_add_string_format_value() with proto_tree_add_item() - - svn path=/trunk/; revision=53261 - -commit 66bb75d -Author: Gerald Combs -Date: Mon Nov 11 22:00:48 2013 +0000 - - Sequence / flow diagram updates. - - Plumb some controls. Adjust dialog layout. Make sure sequence - information is allocated and freed correctly. Remove a debugging - statement. - - svn path=/trunk/; revision=53260 - -commit a33c6a8 -Author: Gerald Combs -Date: Mon Nov 11 21:55:27 2013 +0000 - - Mark some parameters unused. - - svn path=/trunk/; revision=53259 - -commit 628dda9 -Author: Pascal Quantin -Date: Mon Nov 11 21:13:55 2013 +0000 - - From Michael Bean via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9384 : - Add support for Alcatel-Lucent 8950 AAA - - svn path=/trunk/; revision=53258 - -commit 7652baa -Author: Pascal Quantin -Date: Mon Nov 11 20:04:27 2013 +0000 - - From doh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9112 : - Fix incorrect "bytes missing in capture file" in "check_fragments" - - svn path=/trunk/; revision=53257 - -commit 492ad0d -Author: Pascal Quantin -Date: Mon Nov 11 19:57:38 2013 +0000 - - Update the list of new protocols - - svn path=/trunk/; revision=53256 - -commit 98bc5ee -Author: Anders Broman -Date: Mon Nov 11 19:50:17 2013 +0000 - - Export the right function name. - - svn path=/trunk/; revision=53255 - -commit 5470356 -Author: Michael Mann -Date: Mon Nov 11 19:30:59 2013 +0000 - - Remove tcp_tree from packet_info structure. - - All dissectors that call tcp_dissect_pdus() have the same relative tree position, so it doesn't need to be specifically saved in the packet_info. - - svn path=/trunk/; revision=53253 - -commit f738c18 -Author: Michael Mann -Date: Mon Nov 11 19:28:42 2013 +0000 - - Create separate heuristic dissectors for TCP and UDP dissection. Some of the checking for "protocol" in the old heuristic dissector can be handled automatically by being registered with TCP/UDP specifically. - - Also replaced ADWIN_ADD_[LE|BE] macros so check*.pl scripts aren't shirked. Didn't think the macros saved that much. - - svn path=/trunk/; revision=53252 - -commit 8f88855 -Author: Bill Meier -Date: Mon Nov 11 18:44:50 2013 +0000 - - Add -P option to allow specifying the 'callgrind-out-file' name - - svn path=/trunk/; revision=53250 - -commit 44d8b7f -Author: Martin Kaiser -Date: Mon Nov 11 16:36:16 2013 +0000 - - From Peter Lemenkov - display a text description for the RTPProxy version request - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9416 - - svn path=/trunk/; revision=53249 - -commit f771b78 -Author: Martin Kaiser -Date: Mon Nov 11 12:20:12 2013 +0000 - - fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9411 - make sure we're not stuck in the while loop - - svn path=/trunk/; revision=53248 - -commit 2759cfb -Author: Martin Kaiser -Date: Mon Nov 11 10:57:30 2013 +0000 - - fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9409 - don't call proto_item_get_len() when the argument can be NULL - - svn path=/trunk/; revision=53247 - -commit 7791446 -Author: Michael Mann -Date: Mon Nov 11 04:01:50 2013 +0000 - - tcp_dissect_pdus can handle both desegmented and complete packets, so have the entire pdu be handled that way. - - svn path=/trunk/; revision=53246 - -commit 5bebc20 -Author: Michael Mann -Date: Mon Nov 11 02:06:17 2013 +0000 - - Decode more error replies in RTPproxy dissector. Bug 9408 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9408) - - From Peter Lemenkov - - svn path=/trunk/; revision=53245 - -commit 043f18b -Author: Bill Meier -Date: Mon Nov 11 01:54:42 2013 +0000 - - Do some whitespace & formatting style changes; - Remove some unneeded initializers; - Also: packet-mq.c: Add an XXX coment. - - svn path=/trunk/; revision=53244 - -commit d111d15 -Author: Gerald Combs -Date: Sun Nov 10 21:53:03 2013 +0000 - - "productsign" should work now. Remove "codesign". - - svn path=/trunk/; revision=53243 - -commit 1fc8fd9 -Author: Gerald Combs -Date: Sun Nov 10 21:44:50 2013 +0000 - - Be exceedingly diligent about checking OS X package signatures. - - svn path=/trunk/; revision=53242 - -commit 4945174 -Author: Michael Mann -Date: Sun Nov 10 21:33:45 2013 +0000 - - Pass "wild_card" directly to dissector instead of using private_data. "h248term" dissector is not in Wireshark source, so third-party will need to update accordingly. - - svn path=/trunk/; revision=53241 - -commit ce62a3c -Author: Michael Mann -Date: Sun Nov 10 19:58:03 2013 +0000 - - Use ASN.1 private data instead of pinfo->private_data to exchange kerberos callback functions. - - svn path=/trunk/; revision=53240 - -commit e78924d -Author: Gerald Combs -Date: Sun Nov 10 17:55:26 2013 +0000 - - Use the correct event filter. - - From Richard Moore via bug 9410. - - svn path=/trunk/; revision=53239 - -commit 640d152 -Author: Gerald Combs -Date: Sun Nov 10 17:51:00 2013 +0000 - - Mark a parameter unused. - - svn path=/trunk/; revision=53238 - -commit 02e5ce8 -Author: Michael Mann -Date: Sun Nov 10 17:45:59 2013 +0000 - - pinfo->private_data is no longer being used, so adjust the logic accordingly. - - svn path=/trunk/; revision=53237 - -commit d5d8c3c -Author: Michael Mann -Date: Sun Nov 10 17:17:18 2013 +0000 - - context is not being passed to dissector, not through pinfo->private_data so check data parameter, not pinfo->private_data. - - svn path=/trunk/; revision=53236 - -commit c2e0f82 -Author: Jakub Zawadzki -Date: Sun Nov 10 17:15:35 2013 +0000 - - No need to include whole - - svn path=/trunk/; revision=53235 - -commit 5a7cc48 -Author: Michael Mann -Date: Sun Nov 10 17:03:28 2013 +0000 - - Move #defines from packet-hclnfsd.h into the dissector since there is no external need for the values. - - svn path=/trunk/; revision=53234 - -commit 5518639 -Author: Jakub Zawadzki -Date: Sun Nov 10 16:57:29 2013 +0000 - - Fix buildbot: - wslua_proto.c(1700) : error C2065: 'TRY' : undeclared identifier - - svn path=/trunk/; revision=53233 - -commit fe52a15 -Author: Michael Mann -Date: Sun Nov 10 16:39:46 2013 +0000 - - Have rpc_call_info_value be passed through to (sub)dissectors instead of using pinfo->private_data. - - This was acheived by adding a void* data parameter to the dissect_function_t typedef in packet-rpc.h (r53213). After converting the pinfo->private_data, I'm not sure if it would be better to change the void* data pointer to be a rpc_call_info_value* explicitly. Not all "dissector functions" use it, but it would certainly save a lot of casting... - - svn path=/trunk/; revision=53232 - -commit 6f6d04e -Author: Jakub Zawadzki -Date: Sun Nov 10 16:04:15 2013 +0000 - - Move REPORT_DISSECTOR_BUG() body to proto_report_dissector_bug() function. Remove exceptions.h include from proto.h - - svn path=/trunk/; revision=53231 - -commit ae59b09 -Author: Jakub Zawadzki -Date: Sun Nov 10 15:59:37 2013 +0000 - - Add missing includes in order to remove exceptions.h from proto.h (next commit). - - svn path=/trunk/; revision=53230 - -commit 100e97c -Author: Gerald Combs -Date: Sun Nov 10 15:03:43 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-11-10] - - svn path=/trunk/; revision=53227 - -commit 086e73c -Author: Jörg Mayer -Date: Sun Nov 10 14:42:49 2013 +0000 - - On Windows find the standard html viewer by using bigger and bigger - hammers only to realize that this really needs to be done at runtime. - Commit it anyway. - - svn path=/trunk/; revision=53226 - -commit b651258 -Author: Jakub Zawadzki -Date: Sun Nov 10 14:00:29 2013 +0000 - - try to fix buildbot: - ./wslua_field.c:32:31: fatal error: ftypes/ftypes-int.h: No such file or directory - - svn path=/trunk/; revision=53225 - -commit 9a68104 -Author: Jakub Zawadzki -Date: Sun Nov 10 13:38:07 2013 +0000 - - Fix buildbot: - wslua_field.c(179) : error C2037: left of 'val_to_string_repr' specifies undefined struct/union '_ftype_t' - - svn path=/trunk/; revision=53224 - -commit 12d1509 -Author: Jakub Zawadzki -Date: Sun Nov 10 13:14:09 2013 +0000 - - Move struct _ftype_t + callback typedefs + free macro to ftypes-int.h - - svn path=/trunk/; revision=53223 - -commit ea478f2 -Author: Jakub Zawadzki -Date: Sun Nov 10 13:04:21 2013 +0000 - - missing include for tvbtest + add 'const' (silent most of warnings). - - svn path=/trunk/; revision=53222 - -commit 617f2ed -Author: Jakub Zawadzki -Date: Sun Nov 10 12:31:17 2013 +0000 - - Remove from tvbuff. - - svn path=/trunk/; revision=53221 - -commit e7e010b -Author: Jakub Zawadzki -Date: Sun Nov 10 11:53:41 2013 +0000 - - Don't test for guard-include-define (or how it's called) inside including header. - - svn path=/trunk/; revision=53220 - -commit 8b73d37 -Author: Jakub Zawadzki -Date: Sun Nov 10 11:48:03 2013 +0000 - - exceptions.h not needed by tvbuff.h (no much progress because it's needed by proto.h) - - svn path=/trunk/; revision=53219 - -commit da01960 -Author: Jörg Mayer -Date: Sun Nov 10 11:00:54 2013 +0000 - - Make FindGTK3 work on windows - - svn path=/trunk/; revision=53218 - -commit c9bafe2 -Author: Anders Broman -Date: Sun Nov 10 10:46:13 2013 +0000 - - From Zoltán Lajos Kis: - - Move OpenFlow v1.0 dissector out from main OpenFlow dissector. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9405 - - svn path=/trunk/; revision=53217 - -commit 90c2945 -Author: Alexis La Goutte -Date: Sun Nov 10 10:45:29 2013 +0000 - - Fix compilation under Linux (Ubuntu) - - airpdcap.c:470:18: error: declaration of 'address' shadows a global declaration [-Werror=shadow] - airpdcap.c:611:18: error: declaration of 'address' shadows a global declaration [-Werror=shadow] - - svn path=/trunk/; revision=53216 - -commit ee0d4f6 -Author: Jörg Mayer -Date: Sun Nov 10 10:38:49 2013 +0000 - - Try to get findhtmlviewer working on windows. Doesn't work but - at least remember the registry keys for the next time someone - works on this. - - svn path=/trunk/; revision=53215 - -commit 7b64bcf -Author: Jakub Zawadzki -Date: Sun Nov 10 09:44:02 2013 +0000 - - Move prototype of bytes_to_str, bytes_to_str_punct to correct header. - - svn path=/trunk/; revision=53214 - -commit af0819f -Author: Michael Mann -Date: Sun Nov 10 03:20:04 2013 +0000 - - Add data parameter to dissect_function_t in vsff structure. The intention here is to use it to replace some pinfo->private_data. - - I didn't realize how expansive this change would be, so committing it now before replacing the pinfo->private_data, so if something needs to be reverted, all of this is not lost. - - svn path=/trunk/; revision=53213 - -commit 2965a6b -Author: Gerald Combs -Date: Sun Nov 10 01:52:06 2013 +0000 - - Add missing backslash. - - svn path=/trunk/; revision=53212 - -commit 04a7231 -Author: Gerald Combs -Date: Sun Nov 10 01:31:25 2013 +0000 - - More packaging updates. - - Specify "Application" or "Installer" code signing identities as needed. - Switch back to productbuild for the package. That seems to be the - correct utility to use. Give the package an ID. Package signing is still - broken but this appears to be closer to being correct. - - svn path=/trunk/; revision=53211 - -commit 48c5a9a -Author: Gerald Combs -Date: Sun Nov 10 01:25:38 2013 +0000 - - Bump LSMinimumSystemVersion to 10.6. - - svn path=/trunk/; revision=53210 - -commit f505358 -Author: Gerald Combs -Date: Sun Nov 10 00:39:09 2013 +0000 - - Fix argument order. - - svn path=/trunk/; revision=53209 - -commit e8106d0 -Author: Gerald Combs -Date: Sun Nov 10 00:24:56 2013 +0000 - - Try switching back to codesign. - - svn path=/trunk/; revision=53208 - -commit a4c4ca8 -Author: Michael Mann -Date: Sat Nov 9 21:54:26 2013 +0000 - - Register openvpn over TCP and UDP under different dissector names. - - svn path=/trunk/; revision=53207 - -commit c51dcff -Author: Pascal Quantin -Date: Sat Nov 9 21:30:33 2013 +0000 - - Modify TCPENCAP heuristic to avoid triggering a 'packet size limited during capture' catch - - svn path=/trunk/; revision=53206 - -commit 7b0c75d -Author: Pascal Quantin -Date: Sat Nov 9 21:18:08 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8966 : - Initialize last entry of background_color array to avoid having a RGBA(0,0,0,0) transparent black - - svn path=/trunk/; revision=53205 - -commit 87b7c35 -Author: Pascal Quantin -Date: Sat Nov 9 19:56:43 2013 +0000 - - Fix crash when displaying VoIP call flow (introduced in r52824) - - svn path=/trunk/; revision=53204 - -commit 9f163b7 -Author: Gerald Combs -Date: Sat Nov 9 19:22:42 2013 +0000 - - Sign the right file. - - svn path=/trunk/; revision=53203 - -commit 970b0a0 -Author: Gerald Combs -Date: Sat Nov 9 19:00:19 2013 +0000 - - Older versions of productsign don't support "--force" or "--verbose". - - svn path=/trunk/; revision=53202 - -commit c7f9803 -Author: Gerald Combs -Date: Sat Nov 9 18:39:58 2013 +0000 - - Try to simplify package signing. - - According to the packagemaker man page, '--target 10.5' will produce a - flat package. Use it instead of pkgutil. - - svn path=/trunk/; revision=53201 - -commit 7f3dd7b -Author: Gerald Combs -Date: Sat Nov 9 18:17:00 2013 +0000 - - Fix unused and shadow variable errors. - - svn path=/trunk/; revision=53200 - -commit 3a21ccd -Author: Gerald Combs -Date: Sat Nov 9 17:52:54 2013 +0000 - - Try to perform package signing as described at - http://stackoverflow.com/questions/11487596/making-os-x-installer-packages-like-a-pro-xcode4-developer-id-mountain-lion-re - - We *might* have to switch away from packagemaker in order to be able to - sign packages properly. - - svn path=/trunk/; revision=53199 - -commit 8081cf1 -Author: Michael Mann -Date: Sat Nov 9 17:46:28 2013 +0000 - - Add data parameter to tcp_dissect_pdus() as well as convert it to using "new" style dissectors. - - Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that? - - Should tcp_dissect_pdus return length (bytes consumed)? There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb). Seems like that could all be rolled into one. - - svn path=/trunk/; revision=53198 - -commit c9b2ee3 -Author: Jakub Zawadzki -Date: Sat Nov 9 15:44:29 2013 +0000 - - include only when needed. - - svn path=/trunk/; revision=53196 - -commit 7b89063 -Author: Jakub Zawadzki -Date: Sat Nov 9 14:58:28 2013 +0000 - - Don't include when not needed. - - svn path=/trunk/; revision=53194 - -commit 0b0bbf0 -Author: Jakub Zawadzki -Date: Sat Nov 9 14:37:13 2013 +0000 - - Replace STRINGIFY with glib version. - - svn path=/trunk/; revision=53193 - -commit 3b2e519 -Author: Jakub Zawadzki -Date: Sat Nov 9 14:19:19 2013 +0000 - - Remove comment (leftovers from r49444) + add missing WS_DLL_PUBLIC for adler32 - - (modifing files to be commited when svn commit is already running is no good). - - svn path=/trunk/; revision=53192 - -commit 3931cfd -Author: Jakub Zawadzki -Date: Sat Nov 9 14:04:52 2013 +0000 - - Correct include path. - - svn path=/trunk/; revision=53191 - -commit ca42cb3 -Author: Jakub Zawadzki -Date: Sat Nov 9 14:03:53 2013 +0000 - - Move adler32 from epan/ to wsutil/ - - The same like done for crc* - - svn path=/trunk/; revision=53190 - -commit 1899903 -Author: Jakub Zawadzki -Date: Sat Nov 9 13:41:10 2013 +0000 - - Include only when needed. - - svn path=/trunk/; revision=53189 - -commit 0d23305 -Author: Jörg Mayer -Date: Sat Nov 9 12:20:21 2013 +0000 - - cmake builds against gtk3 don't work. Those against gtk2 do. - - svn path=/trunk/; revision=53188 - -commit 9aac554 -Author: Jakub Zawadzki -Date: Sat Nov 9 11:26:41 2013 +0000 - - Put "private" to_str.c functions to to_str-int.h - - svn path=/trunk/; revision=53187 - -commit 5aa4b84 -Author: Jakub Zawadzki -Date: Sat Nov 9 11:23:02 2013 +0000 - - g_snprintf() don't return -1 from glib-1.2.3 [1] - - [1] https://developer.gnome.org/glib/2.28/glib-String-Utility-Functions.html#g-snprintf - - svn path=/trunk/; revision=53186 - -commit ef30aee -Author: Jakub Zawadzki -Date: Sat Nov 9 11:03:02 2013 +0000 - - nstime_to_sec() and capinfos secs_nsecs() seems to be same. - - svn path=/trunk/; revision=53185 - -commit 38edae1 -Author: Jakub Zawadzki -Date: Sat Nov 9 10:38:02 2013 +0000 - - Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec. - - After r50154 nstime_t is inside wsutil/ so wiretap don't need it's own copy. - - svn path=/trunk/; revision=53184 - -commit f207c70 -Author: Jakub Zawadzki -Date: Sat Nov 9 10:08:58 2013 +0000 - - I have added tvb_get_bits_buf() in r37217, nobody is using it, remove. - - svn path=/trunk/; revision=53183 - -commit c86d38a -Author: Jakub Zawadzki -Date: Sat Nov 9 10:02:39 2013 +0000 - - Remove old (5 yrs) #if 0 code (from r25028). - - svn path=/trunk/; revision=53182 - -commit 8be10b5 -Author: Jakub Zawadzki -Date: Sat Nov 9 10:00:54 2013 +0000 - - Remove #if 0 code (introduced in r29489). - - svn path=/trunk/; revision=53181 - -commit f9b68b0 -Author: Jörg Mayer -Date: Sat Nov 9 09:36:09 2013 +0000 - - No need to check whether cmake_policy command exists as we require - cmake 2.6. - Add two more policy statements to avoid warnings on current cmake systems. - CMP0020 doesn't work - no idea why. - - svn path=/trunk/; revision=53180 - -commit 0e61383 -Author: Jörg Mayer -Date: Sat Nov 9 08:19:13 2013 +0000 - - Fix a tpyo (packet-quic.) - - svn path=/trunk/; revision=53179 - -commit 9297c9e -Author: Jakub Zawadzki -Date: Sat Nov 9 04:47:08 2013 +0000 - - Rename swar_count_bits() to ws_count_ones() - Try to make ws_count_ones() inline function. - - svn path=/trunk/; revision=53178 - -commit 3aaf560 -Author: Alexis La Goutte -Date: Sat Nov 9 00:19:52 2013 +0000 - - Add QUIC (Quick UDP Internet Connections) dissector - - See http://blog.chromium.org/2013/06/experimenting-with-quic.html - - Don't yet support protocol decryption... - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9402 - - svn path=/trunk/; revision=53177 - -commit e6944e6 -Author: Jakub Zawadzki -Date: Fri Nov 8 22:01:12 2013 +0000 - - Try to split ws_ctz() from hfinfo_bitshift(). - - svn path=/trunk/; revision=53176 - -commit 7e312c9 -Author: Jakub Zawadzki -Date: Fri Nov 8 21:38:32 2013 +0000 - - Convert: vlan, sll, rip to NEW_PROTO_TREE_API - - svn path=/trunk/; revision=53175 - -commit b3a4b56 -Author: Jakub Zawadzki -Date: Fri Nov 8 20:09:54 2013 +0000 - - Use escape_string*() functions in ftype-string. - - Found in attachment #11961, by Didier Gautheron - - svn path=/trunk/; revision=53174 - -commit ad0a9f4 -Author: Guy Harris -Date: Fri Nov 8 19:38:28 2013 +0000 - - Indentation tweaks. - - svn path=/trunk/; revision=53173 - -commit 5a0809c -Author: Bill Meier -Date: Fri Nov 8 17:17:57 2013 +0000 - - (Trivial) whitespace cleanup (mostly trailing whitespace). - - svn path=/trunk/; revision=53172 - -commit 6159e98 -Author: Martin Mathieson -Date: Fri Nov 8 17:15:43 2013 +0000 - - Didn't need to include wtap.h again - - svn path=/trunk/; revision=53171 - -commit 0c590a9 -Author: Martin Mathieson -Date: Fri Nov 8 17:12:31 2013 +0000 - - Fix up function names: type -> type_subtype - - svn path=/trunk/; revision=53170 - -commit 8f1ba43 -Author: Alexis La Goutte -Date: Fri Nov 8 16:35:42 2013 +0000 - - Add reference to qttools5-dev in README.qt documentation - - There is following error message with cmake : - - CMake Warning at CMakeLists.txt:490 (find_package): - By not providing "FindQt5LinguistTools.cmake" in CMAKE_MODULE_PATH this - project has asked CMake to find a package configuration file provided by - "Qt5LinguistTools", but CMake did not find one. - - Could not find a package configuration file provided by "Qt5LinguistTools" - with any of the following names: - - Qt5LinguistToolsConfig.cmake - qt5linguisttools-config.cmake - - Add the installation prefix of "Qt5LinguistTools" to CMAKE_PREFIX_PATH or - set "Qt5LinguistTools_DIR" to a directory containing one of the above - files. If "Qt5LinguistTools" provides a separate development package or - SDK, be sure it has been installed. - - CMake Error at ui/qt/CMakeLists.txt:205 (QT5_ADD_TRANSLATION): - Unknown CMake command "QT5_ADD_TRANSLATION". - - svn path=/trunk/; revision=53169 - -commit a3d422f -Author: Jörg Mayer -Date: Fri Nov 8 11:50:57 2013 +0000 - - The experimental code in echld/ also got broken by the wtap - file types commit. Make this compile again as well. - Trivial whitespace cleanup while in those files. - - svn path=/trunk/; revision=53168 - -commit 609cd8c -Author: Jörg Mayer -Date: Fri Nov 8 11:42:57 2013 +0000 - - Looks like r53166 was not compile tested. Now k12text.l compiles again. - - svn path=/trunk/; revision=53167 - -commit 853da2e -Author: Guy Harris -Date: Fri Nov 8 09:53:01 2013 +0000 - - The "file types" we have are actually combinations of types and - subtypes, e.g. Network Monitor version 1 and Network Monitor version 2 - are separate "file types", even though they both come from Network - Monitor. - - Rename various functions, #defines, and variables appropriately. - - svn path=/trunk/; revision=53166 - -commit 5cec175 -Author: Guy Harris -Date: Fri Nov 8 09:11:54 2013 +0000 - - Another one. - - svn path=/trunk/; revision=53165 - -commit 011ee99 -Author: Guy Harris -Date: Fri Nov 8 09:10:36 2013 +0000 - - What matters is the encapsulation type, not the file type, so just test - for WTAP_ENCAP_BER, not for WTAP_FILE_BER. - - svn path=/trunk/; revision=53164 - -commit 88d0e90 -Author: Anders Broman -Date: Fri Nov 8 05:58:13 2013 +0000 - - From Katrina Zhang: - Add/fix RFSP dissection. - - svn path=/trunk/; revision=53163 - -commit fd429a6 -Author: Anders Broman -Date: Fri Nov 8 05:57:00 2013 +0000 - - From Katrina Zhang: - 3GPP AVP updates. - - svn path=/trunk/; revision=53162 - -commit 35a7ade -Author: Bill Meier -Date: Fri Nov 8 03:33:01 2013 +0000 - - Remove some trailing whitespace.... - - svn path=/trunk/; revision=53161 - -commit d62f92b -Author: Michael Mann -Date: Fri Nov 8 02:02:43 2013 +0000 - - Make LDAP dissector use ASN.1 private_data instead of pinfo->private_data. - - Cleanup a forgotten pinfo->private_data use in the H245 dissector. - - svn path=/trunk/; revision=53160 - -commit c4e9865 -Author: Guy Harris -Date: Fri Nov 8 01:25:48 2013 +0000 - - Fix more errors. - - svn path=/trunk/; revision=53159 - -commit 7a2a486 -Author: Guy Harris -Date: Fri Nov 8 01:24:55 2013 +0000 - - Wrong function. - - svn path=/trunk/; revision=53158 - -commit 9dd06cd -Author: Guy Harris -Date: Fri Nov 8 01:23:18 2013 +0000 - - Fix errors. - - svn path=/trunk/; revision=53157 - -commit bf4e84a -Author: Guy Harris -Date: Fri Nov 8 01:08:42 2013 +0000 - - For open dialogs, offer a list of sets of extensions, not of file types; - .cap, for example, doesn't refer to a particular file type - a whole - bunch of file types use .cap. - - Also offer, in addition to "All Files", "All Capture Files", which - matches all the extensions we know about. - - svn path=/trunk/; revision=53156 - -commit 2812942 -Author: Jörg Mayer -Date: Fri Nov 8 00:23:32 2013 +0000 - - As the code seems to be working now for two people - (both using Linux) it's time to be able to play with - the new HFI code. - Run cmake with -DHAVE_HFI_SECTION_INIT and you are good to go. - - svn path=/trunk/; revision=53155 - -commit 9aa9d60 -Author: Jörg Mayer -Date: Fri Nov 8 00:13:02 2013 +0000 - - With the new HFI code the compiler complains about unused element - great! - - /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-mint.c:205:26: error: ‘hfi_mint_control_0x0c_unknown4’ defined but not used [-Werror=unused-variable] - static header_field_info hfi_mint_control_0x0c_unknown4 MINT_HF_INIT = - ^ - - svn path=/trunk/; revision=53154 - -commit 5ba977e -Author: Jörg Mayer -Date: Fri Nov 8 00:03:51 2013 +0000 - - The release notes update caused a new NEWS file to be built. Commit it. - - Question: Should we remove the generated NEWS file from the repo? - - svn path=/trunk/; revision=53153 - -commit 7c2c2d8 -Author: Jörg Mayer -Date: Fri Nov 8 00:01:19 2013 +0000 - - Fix: - - cd /home/jmayer/work/wireshark/svn/build/qt-gtk3/epan && /usr/bin/cc -DG_DISABLE_DEPRc - In file included from /home/jmayer/work/wireshark/svn/trunk/epan/packet.h:29:0, - from /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-2dp: - /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-2dparityfec.c: In functio: - /home/jmayer/work/wireshark/svn/trunk/epan/proto.h:2128:2: error: ISO C90 forbids mixe] - extern header_field_info __start__data_ ##proto[]; \ - ^ - /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-2dparityfec.c:331:4: note’ - proto_register_fields(proto_2dparityfec, hfi, array_length(hfi)); - ^ - cc1: all warnings being treated as errors - - - svn path=/trunk/; revision=53152 - -commit 06fdf81 -Author: Gerald Combs -Date: Thu Nov 7 23:43:35 2013 +0000 - - Fix the AsciiDoc description. - - svn path=/trunk/; revision=53151 - -commit 1dffd1a -Author: Jakub Zawadzki -Date: Thu Nov 7 23:20:06 2013 +0000 - - GCC on amd64 align header_field_info variables to 16-bytes, this cause problems with proto_register_fields_section(). - sizeof(void *) alignment should be enough, use it in HFI_INIT. - - This fixes http://www.wireshark.org/lists/wireshark-dev/201311/msg00069.html - - svn path=/trunk/; revision=53150 - -commit fa3332e -Author: Jörg Mayer -Date: Thu Nov 7 21:40:31 2013 +0000 - - Remove extraction of cmake parameters from autotools files. - While it was an interesting exercise it just doesn't - work good enough to stay, i.e. it doesn't automatically - pick up changes but requires rerunning cmake instead. - - svn path=/trunk/; revision=53149 - -commit 6961949 -Author: Pascal Quantin -Date: Thu Nov 7 21:08:15 2013 +0000 - - From Vasil Velichkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9382 : - Fix dissection of GSM MAPv3 ReportSM_DeliveryStatusRes - - svn path=/trunk/; revision=53148 - -commit a00f13b -Author: Jörg Mayer -Date: Thu Nov 7 20:32:41 2013 +0000 - - Turn WANT_PACKET_EDITOR into an option until such a time that - it isn't a compile time option any more. - - svn path=/trunk/; revision=53147 - -commit ce6ca9a -Author: Jakub Zawadzki -Date: Thu Nov 7 20:14:18 2013 +0000 - - Add infrastructure for section-initializing protocol hfis (without array). - - configure implementation later. - - svn path=/trunk/; revision=53146 - -commit 3f385b3 -Author: Gerald Combs -Date: Thu Nov 7 17:55:46 2013 +0000 - - Print LC_VERSION_MIN_MACOSX for each executable and library. - - svn path=/trunk/; revision=53145 - -commit 5c31986 -Author: Evan Huus -Date: Thu Nov 7 17:06:04 2013 +0000 - - Add a p_add_proto_data call to dissect_ndmp to match the one in - dissect_ndmp_heur. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9393 - - Potentially we should add a void *data to tcp_dissect_pdus instead...? - - svn path=/trunk/; revision=53144 - -commit 6441f10 -Author: Evan Huus -Date: Thu Nov 7 17:03:04 2013 +0000 - - Add modelines. Minor indentation fixes. - - svn path=/trunk/; revision=53143 - -commit 8f112c0 -Author: Pascal Quantin -Date: Thu Nov 7 16:53:59 2013 +0000 - - Fix dissection of MBIM data packets when using 32-bits NDPs - - svn path=/trunk/; revision=53142 - -commit eac2762 -Author: Michael Mann -Date: Thu Nov 7 15:54:11 2013 +0000 - - 8-bit counter variable not big enough and causes infinite loop. Bug 9392 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9392). - - svn path=/trunk/; revision=53141 - -commit 50ddf47 -Author: Alexis La Goutte -Date: Thu Nov 7 10:41:53 2013 +0000 - - Try 2 to fix Mac OS X 10.5 buildbot - - Include old-gtk-compat.h - - svn path=/trunk/; revision=53140 - -commit 9201e8c -Author: Pascal Quantin -Date: Thu Nov 7 10:27:11 2013 +0000 - - 3GPP2 SMS: add support for KSC5601 (Korean) character set - - svn path=/trunk/; revision=53139 - -commit 9fd106a -Author: Alexis La Goutte -Date: Thu Nov 7 09:53:56 2013 +0000 - - (re)Fix warning found by fix-encodings-arg tool - - svn path=/trunk/; revision=53138 - -commit 1f8282d -Author: Alexis La Goutte -Date: Thu Nov 7 09:33:39 2013 +0000 - - Try to fix Mac OS 10.5 Buildbot (with old Glib...) - - gtk_dialog_get_action_area is available only Glib 2.14 - - svn path=/trunk/; revision=53137 - -commit c8dc57a -Author: Alexis La Goutte -Date: Thu Nov 7 09:03:46 2013 +0000 - - Remove C++ comments - - svn path=/trunk/; revision=53136 - -commit 5af14ea -Author: Alexis La Goutte -Date: Thu Nov 7 07:43:19 2013 +0000 - - Add Edit Packet in Right Click - - svn path=/trunk/; revision=53135 - -commit 4948552 -Author: Alexis La Goutte -Date: Thu Nov 7 07:43:11 2013 +0000 - - Add Packet Editor Preference - - svn path=/trunk/; revision=53134 - -commit 6261789 -Author: Alexis La Goutte -Date: Thu Nov 7 07:43:01 2013 +0000 - - Add WANT_PACKET_EDITOR to CMake - - svn path=/trunk/; revision=53133 - -commit 4bff9d3 -Author: Alexis La Goutte -Date: Thu Nov 7 07:42:35 2013 +0000 - - Enable Packet Editor by default - - svn path=/trunk/; revision=53132 - -commit 21ddc7a -Author: Michael Mann -Date: Thu Nov 7 04:50:53 2013 +0000 - - Revert r53118 as it breaks reassemble_test. - - svn path=/trunk/; revision=53130 - -commit b9e3614 -Author: Michael Mann -Date: Thu Nov 7 03:13:53 2013 +0000 - - Got burned by forgetting to compile first... - - svn path=/trunk/; revision=53129 - -commit 4fb9091 -Author: Michael Mann -Date: Thu Nov 7 02:47:22 2013 +0000 - - Have the gsm_rlcmac_ul and gsm_rlcmac_dl use the data parameter of the dissector function instead of pinfo->private_data to receive a RlcMacPrivateData_t structure. - - This work was done in bug 7615 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615), but the tie in to use the RlcMacPrivateData_t structure (passed by the GSMTAP dissector) was never completed. Whenever that picks up again, the data parameter of the dissector should be used instead of pinfo->private_data. - - svn path=/trunk/; revision=53128 - -commit f380299 -Author: Guy Harris -Date: Thu Nov 7 02:11:51 2013 +0000 - - Note that bug 8808 and bug 9390 are fixed. - - svn path=/trunk/; revision=53125 - -commit 29fef43 -Author: Jörg Mayer -Date: Wed Nov 6 22:55:17 2013 +0000 - - With the updated pidl it is now possible to generate several - of the dcerpc dissectors again. Commit those of the generated - onces that actually compile. - - svn path=/trunk/; revision=53122 - -commit f7f47af -Author: Jörg Mayer -Date: Wed Nov 6 22:50:28 2013 +0000 - - Reapply the removal or the use of private_data that got removed by - syncing from samba.org. - If any other patches were applied, then I missed them and they are - lost unless reapplied. - - svn path=/trunk/; revision=53121 - -commit 02fe7ff -Author: Jörg Mayer -Date: Wed Nov 6 22:48:50 2013 +0000 - - Copy over the current WIP from samba.org::ftp/unpacked/samba_4_0_test/pidl - - As the pidl in Wireshark doesn't work anyway we can just mirror the WIP - so that patches to our code base are against the current code. - - svn path=/trunk/; revision=53120 - -commit f9e5c14 -Author: Michael Mann -Date: Wed Nov 6 22:07:04 2013 +0000 - - Add Zoltan Lajos Kis as author - - svn path=/trunk/; revision=53119 - -commit c59fab0 -Author: Michael Mann -Date: Wed Nov 6 21:59:03 2013 +0000 - - Correctly report segments marked with REASSEMBLE_FLAGS_NO_FRAG_NUMBER. Bug 9304 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9304) - - Instead of incrementing the offset for each new segment by one we add the length of the segment so that each segment is correctly shown in the segment list. - - It proves to be very useful to find which packet (segment) is causing an application dissector to go wrong. - - From Matthieu Patou - - svn path=/trunk/; revision=53118 - -commit c011e54 -Author: Jakub Zawadzki -Date: Wed Nov 6 21:15:46 2013 +0000 - - Fix buildbot, typo: - tvbuff.c:1258: warning: passing argument 2 of '__builtin___memcpy_chk' makes pointer from integer without a cast - tvbuff.c:1258: warning: passing argument 2 of '__inline_memcpy_chk' makes pointer from integer without a cast - - svn path=/trunk/; revision=53117 - -commit 912b591 -Author: Michael Mann -Date: Wed Nov 6 20:57:23 2013 +0000 - - NFC: PN532: Dissect InListPassiveTarget Response and Diagnose request and response. Bug 9333 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333) - - From Michal Labedzki - - From me: adjust datatype to guint8 on a few local variables to quiet the Microsoft compiler. - - svn path=/trunk/; revision=53116 - -commit 99e20da -Author: Michael Mann -Date: Wed Nov 6 20:39:10 2013 +0000 - - Add response time to the rtpproxy dissector. Bug 9380 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9380) - - From Peter Lemenkov. - - svn path=/trunk/; revision=53115 - -commit 2a088c1 -Author: Guy Harris -Date: Wed Nov 6 20:39:09 2013 +0000 - - Add support for displaying dates as year and day-of-year (1-origin). - - In the process, fix various man page descriptions of the -t flag, - and add support for UTC absolute times in the iousers and iostat TShark - taps. - - svn path=/trunk/; revision=53114 - -commit 67f69e9 -Author: Jakub Zawadzki -Date: Wed Nov 6 20:34:27 2013 +0000 - - tvb: optimize tvb_get_*guid() - - we already have valid ptr from ensure_contiguous() so use it to fill structure. - - svn path=/trunk/; revision=53113 - -commit b4be2fa -Author: Jakub Zawadzki -Date: Wed Nov 6 20:22:28 2013 +0000 - - tvbuff: use always ops->tvb_size - - svn path=/trunk/; revision=53112 - -commit d54b3a7 -Author: Jakub Zawadzki -Date: Wed Nov 6 19:03:14 2013 +0000 - - tvbuff: cleanup, remove dead code. - - ensure_contiguous() will throw exception but won't return NULL. - - svn path=/trunk/; revision=53111 - -commit dc53bb7 -Author: Michael Mann -Date: Wed Nov 6 18:40:29 2013 +0000 - - Bluetooth: OBEX: Storing info about previous protocol is not needed anymore. Bug 9303 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9303) - - From Michal Labedzki. - - svn path=/trunk/; revision=53110 - -commit 5efc340 -Author: Evan Huus -Date: Wed Nov 6 17:52:11 2013 +0000 - - Mark more unused parameters. - - svn path=/trunk/; revision=53109 - -commit 99d8439 -Author: Evan Huus -Date: Wed Nov 6 17:43:49 2013 +0000 - - Add a license-ignore for tools/html2text.py - Update the preamble to COPYING to clarify that pidl isn't the only tool we carry - which isn't GPLv2-compatible. - - svn path=/trunk/; revision=53108 - -commit 55922b6 -Author: Michael Mann -Date: Wed Nov 6 16:51:19 2013 +0000 - - Fix for checking RTPS sub message length. Bug 9378 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9378) - - From Steve Osselton - - #BACKPORT(1.10) - - svn path=/trunk/; revision=53107 - -commit c278a0a -Author: Michael Mann -Date: Wed Nov 6 16:30:14 2013 +0000 - - SID28 is special kind of SID where no matter what it uses 28 bytes it's used in the DRS protocol. Bug 9337 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9337) - - From Matthieu Patou - - svn path=/trunk/; revision=53106 - -commit a4b4c92 -Author: Bill Meier -Date: Wed Nov 6 16:00:11 2013 +0000 - - Add _U_ to a function parameter to fix a compiler warning - - - svn path=/trunk/; revision=53105 - -commit 53fabc2 -Author: Bill Meier -Date: Wed Nov 6 15:54:24 2013 +0000 - - Add _U_ to a few function parameters to fix compiler warnings - - Note: I hope the following is not indicative of something wrong with the code. - (I've just marked di as _U_). - - packet-dcerpc-netlogon.c: In function 'dissect_secchan_nl_auth_message': - packet-dcerpc-netlogon.c:7582:75: error: unused parameter 'di' [-Werror=unused-parameter] - proto_tree *tree, dcerpc_info *di, guint8 *drep) - - - svn path=/trunk/; revision=53104 - -commit 0f61417 -Author: Bill Meier -Date: Wed Nov 6 15:46:36 2013 +0000 - - Add _U_ to a function parameter to fix a compiler warning. - - - svn path=/trunk/; revision=53103 - -commit 7e9091e -Author: Bill Meier -Date: Wed Nov 6 15:43:41 2013 +0000 - - Add _U_ to a few function parameters to fix compiler warnings - - svn path=/trunk/; revision=53102 - -commit c4efddd -Author: Bill Meier -Date: Wed Nov 6 15:28:23 2013 +0000 - - From robionekenobi: "packet-mq adapted" - - See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367 - especially comments 8,9,12,13 - - Patch: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=12014 - - From me: Remove several uses of DEF_VALSEXT macro - since the above patch removed the definition. - - (It seems that Microsoft C expands undefined macros as null; - GCC complains). - - - svn path=/trunk/; revision=53101 - -commit 22760b2 -Author: Michael Mann -Date: Wed Nov 6 14:31:29 2013 +0000 - - Remove pinfo->private_data from DCERPC dissectors and instead have dcerpc_info* infomation be passed in as a function parameter. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387) - - All "generated" source was manually modified (with the power of search/replace), but I believe the "source input" files have been adjusted (checked into revs 53098 and 53099) to reflect the necessary changes (with possible whitespace formatting differences). - - The Microsoft compiler doesn't flag "unused function parameters", so I apologize in advance if I may have missed a few. The "dcerpc_info* di" parameter is used in almost every function. - - svn path=/trunk/; revision=53100 - -commit 440ac83 -Author: Michael Mann -Date: Wed Nov 6 13:01:23 2013 +0000 - - Remove pinfo->private_data from DCERPC dissectors. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387) - - This is the "Wireshark DCERPC" input file changes necessary to support removing pinfo->private_data from the DCERPC dissectors in favor of passing it through function parameters. I didn't regenerate the dissector source, so this is just a "good faith" effort to mimic the manual changes. - - svn path=/trunk/; revision=53099 - -commit 79cd356 -Author: Michael Mann -Date: Wed Nov 6 12:36:09 2013 +0000 - - Remove pinfo->private_data from DCERPC dissectors. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387) - - This is the PIDL input file changes necessary to support removing pinfo->private_data from the DCERPC dissectors in favor of passing it through function parameters. I didn't regenerate the dissector source, so this is just a "good faith" effort to mimic the manual changes. - - svn path=/trunk/; revision=53098 - -commit 5d50358 -Author: Tomas Kukosa -Date: Wed Nov 6 08:19:08 2013 +0000 - - Email updated - - svn path=/trunk/; revision=53097 - -commit 5f2c75e -Author: Evan Huus -Date: Tue Nov 5 22:58:50 2013 +0000 - - Add missing cast. - - svn path=/trunk/; revision=53096 - -commit 1631f12 -Author: Pascal Quantin -Date: Tue Nov 5 21:49:57 2013 +0000 - - From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9375 : - Avoid a 'GetVersionEx deprecated' warning when compiling with MSVC2013 - - svn path=/trunk/; revision=53095 - -commit 7c33631 -Author: Michael Mann -Date: Tue Nov 5 20:00:57 2013 +0000 - - Remove setting of pinfo->private_data to ETHERCAT_MBOX_HEADER structure as it's not used anywhere in the Wireshark source. - If it's used by a third-party plugin, please submit a patch that passes the ETHERCAT_MBOX_HEADER structure through the data parameter of the "new" style dissector function. - - svn path=/trunk/; revision=53094 - -commit 5465c18 -Author: Michael Mann -Date: Tue Nov 5 19:51:27 2013 +0000 - - Remove DISSECTOR_ASSERT since private_data isn't being used anymore to transport tcp_info data. - - svn path=/trunk/; revision=53093 - -commit f435f8c -Author: Anders Broman -Date: Tue Nov 5 19:38:41 2013 +0000 - - From Zoltán Lajos Kis: - - display present bit for vlan oxm field - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=53092 - -commit 99b598b -Author: Anders Broman -Date: Tue Nov 5 19:36:09 2013 +0000 - - From Zoltán Lajos Kis: - - use tcp_dissect_pdus to properly dissect messages. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=53091 - -commit b6b78d6 -Author: Michael Mann -Date: Tue Nov 5 18:47:26 2013 +0000 - - In an effort to reduce the use of pinfo->private_data (and some true global variables), I converted the ASN.1 dissectors that use pinfo->private_data to exchange a SESSION_DATA_STRUCTURE to instead only exchange it in the context of ASN.1. This meant converting dissectors to the "new" style to pass the SESSION_DATA_STRUCTURE as well as providing a pointer to it in asn1_ctx_t.private_data. Yes, it's still "private data", but it's not used by all dissectors like pinfo->private data is. - - svn path=/trunk/; revision=53090 - -commit 389423a -Author: Evan Huus -Date: Tue Nov 5 17:48:48 2013 +0000 - - Replace pinfo->layer_names as a string with pinfo->layers as a wmem_list of - protocol IDs. This is substantially more efficient, which means we can build it - all the time rather than only if tree (in my benchmarks the extra time taken is - not large enough to be statistically significant even over tens of thousands of - packets). - - This fixes what was probably a bug in btobex that relied on layer_names for - non-tree dissection. It also enables a much simpler fix for - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9303 - - svn path=/trunk/; revision=53089 - -commit d04079e -Author: Evan Huus -Date: Tue Nov 5 17:28:19 2013 +0000 - - Expose wmem_list_remove_frame to make it efficient to do pop operations as - wmem_list_remove_frame(wmem_list_tail()) - - svn path=/trunk/; revision=53088 - -commit 1051504 -Author: Evan Huus -Date: Tue Nov 5 13:17:55 2013 +0000 - - From Michael Labedzki, call data dissector instead if handle is NULL. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9379 - - svn path=/trunk/; revision=53087 - -commit bb362a8 -Author: Alexis La Goutte -Date: Tue Nov 5 08:40:55 2013 +0000 - - From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9383 - Incorrect FATTR4_SECURITY_LABEL value - - We got this constant wrong. - See http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion2-dot-x-19 and http://marc.info/?l=linux-nfs&m=138359828516861&w=2 - - svn path=/trunk/; revision=53086 - -commit 005f86c -Author: Bill Meier -Date: Tue Nov 5 02:03:18 2013 +0000 - - Change "4 space tabs" indentation to use "4 spaces"; - Clean up alignment of various structs & etc. - - svn path=/trunk/; revision=53085 - -commit e656eea -Author: Bill Meier -Date: Mon Nov 4 20:57:01 2013 +0000 - - Declare many value_string_arrays not used elsewhere as static; - IOW: Explicitly declare as global only those value_string_arrays - used elsewhere. - - svn path=/trunk/; revision=53084 - -commit de05747 -Author: Jörg Mayer -Date: Mon Nov 4 20:29:29 2013 +0000 - - - Reenable /LARGEADDRESSAWARE on Windows platform - - Add a CMAKE_BUILD_TYPE default of RelWithDebInfo (Release with debug info), - print the choice. - This will pick up the previously used flags LINK_FLAGS and - CMAKE_C_FLAGS and CMAKE_CXX_FLAGS but also pick up the variables postfixed - by _ - - Remove Optimization (-O2) and debug (-g) flags from list of default flags - as they are now automagically set by CMAKE_C_FLAGS_RELWITHDEBINFO etc. - NOTE: This also needs to be done for the Windows flags, I just don't have - a Win system to test on right now. - - - svn path=/trunk/; revision=53083 - -commit 629aa84 -Author: Bill Meier -Date: Mon Nov 4 20:22:54 2013 +0000 - - '#if 0' numerous unused value string arrays. - - svn path=/trunk/; revision=53082 - -commit 85d4d46 -Author: Bill Meier -Date: Mon Nov 4 20:09:13 2013 +0000 - - Promote/update the entry for robionekenobi. - - svn path=/trunk/; revision=53081 - -commit 996b07a -Author: Anders Broman -Date: Mon Nov 4 19:38:20 2013 +0000 - - Print if_dropped - - svn path=/trunk/; revision=53080 - -commit 7bd7c70 -Author: Anders Broman -Date: Mon Nov 4 19:35:00 2013 +0000 - - From Zoltán Lajos Kis: - - tidying some stuff. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=53079 - -commit 0243d69 -Author: Bill Meier -Date: Mon Nov 4 18:55:06 2013 +0000 - - From robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5) - - Add more detail for SPI Open LPOO Structure - Add more int_to_vals for INQ_Q_MGR reply - Add more display detail for encoding value - Some fix and display correction - - Note: The patch used was the *original* patch submitted (plus some fixes by me). - - That is: (https://bugs.wireshark.org/bugzilla/attachment.cgi?id=11962) - plus my fixes - - See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367 and comments for - details. - - From me: - - Fix bug which resulted in a macro expansion fail on GCC - - Fix a -Wshadow error in packet-mq-pcf.c - - - svn path=/trunk/; revision=53078 - -commit 7c1ab97 -Author: Martin Mathieson -Date: Mon Nov 4 15:10:58 2013 +0000 - - Don't show the channel information twice in the protocol root proto_item - - svn path=/trunk/; revision=53077 - -commit 8a0ef07 -Author: Evan Huus -Date: Mon Nov 4 14:12:59 2013 +0000 - - Effectively remove the tree memory pool and port some of its behaviour to the - pinfo memory pool, they have exactly the same scope. Simplification and minor - performance win (one GHashTable we longer have to create/destroy on every - packet). - - svn path=/trunk/; revision=53076 - -commit ca7923f -Author: Jörg Mayer -Date: Mon Nov 4 10:07:33 2013 +0000 - - Revert r53073, by now the vast majority of dissector do declare the - registration functions and if we want to standardize it makes more - sense to fix the remaining ones. - - svn path=/trunk/; revision=53075 - -commit 55e3b53 -Author: Alexis La Goutte -Date: Mon Nov 4 08:59:48 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9373 - - ieee80211: Decode Radio Measurements (Action Frames) - - The length of the fixed fields are dependent on the radio measurement - action. Before this patch, fields following the action code were - ignored, leading to wrong decoding results. This patch adds recognition - for the Radio Measurement action management frames as specified in - IEEE Std 802.11-2012. - - From me: - * Rename some hf (Add ff_ in name) - * Link Margin and Transmit Power are signed - * Use always proto_tree_add_item (replace proto_tree_add_text) - - svn path=/trunk/; revision=53074 - -commit f8e232e -Author: Jörg Mayer -Date: Sun Nov 3 22:12:48 2013 +0000 - - Remove forward declarations of registration functions. - - svn path=/trunk/; revision=53073 - -commit b1b8482 -Author: Pascal Quantin -Date: Sun Nov 3 19:36:36 2013 +0000 - - Please checkAPIs.pl script - - svn path=/trunk/; revision=53072 - -commit ea0a85c -Author: Pascal Quantin -Date: Sun Nov 3 18:07:46 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9031 : - SIP contact-param parsing fails in case the last parameter includes a quoted string - - svn path=/trunk/; revision=53071 - -commit f1a3e86 -Author: Chris Maynard -Date: Sun Nov 3 18:02:17 2013 +0000 - - Try to clarify the documentation for tvb_length_remaining() and tvb_reported_length_remaining() based on Jörg's recommendation from bug 9263. - - svn path=/trunk/; revision=53070 - -commit 6de5931 -Author: Anders Broman -Date: Sun Nov 3 17:04:13 2013 +0000 - - NULL terminate a value_str - - svn path=/trunk/; revision=53069 - -commit 3f9ff99 -Author: Anders Broman -Date: Sun Nov 3 16:59:11 2013 +0000 - - From Zoltán Lajos Kis: - - dissect the rest of the messages. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=53068 - -commit a0062fd -Author: Michael Mann -Date: Sun Nov 3 16:17:35 2013 +0000 - - Sync remaining patches with latest SAMBA PIDL source per http://www.wireshark.org/lists/wireshark-dev/201310/msg00217.html - - 0010-frsrpc-Regenerate-frsrpc-due-to-changes-in-the-pidl-.patch - 0016-Regenerate-the-dnserver.patch - - are now integrated, but modified to compile on Windows. I suspect the PIDL generators may need to be updated to support this, otherwise regeneration will break the build on Windows again. - - svn path=/trunk/; revision=53067 - -commit 65b6a98 -Author: Michael Mann -Date: Sun Nov 3 15:25:52 2013 +0000 - - Bluetooth: AVDTP: Add support for Content Protection type SCMS-T (and some minor cleanup). Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893) - - From Michal Labedzki - - svn path=/trunk/; revision=53065 - -commit 5c93974 -Author: Gerald Combs -Date: Sun Nov 3 15:03:48 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-11-03] - - svn path=/trunk/; revision=53063 - -commit e960c88 -Author: Evan Huus -Date: Sun Nov 3 14:22:53 2013 +0000 - - Fix what appears to be an off-by-one error in the IMAP dissector, causing - valgrind errors with the capture from - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263 - - svn path=/trunk/; revision=53062 - -commit 149de99 -Author: Michael Mann -Date: Sun Nov 3 12:57:58 2013 +0000 - - Have rose_ctx_t passed into subdissectors instead of using pinfo->private_data. - - svn path=/trunk/; revision=53061 - -commit 0dc8063 -Author: Jörg Mayer -Date: Sun Nov 3 12:39:50 2013 +0000 - - Fix autoconf broken by last commit. - - svn path=/trunk/; revision=53060 - -commit 117a59d -Author: Jörg Mayer -Date: Sun Nov 3 12:22:39 2013 +0000 - - Pass the name of the sed executable as an explicit argurment to - runlex.sh (like it is done with LEX already). May fix a problem - on Windows with cmake. - - svn path=/trunk/; revision=53059 - -commit 7054372 -Author: Alexis La Goutte -Date: Sun Nov 3 11:19:10 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=53058 - -commit 95d4c4a -Author: Alexis La Goutte -Date: Sun Nov 3 11:18:54 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=53057 - -commit 6166208 -Author: Alexis La Goutte -Date: Sun Nov 3 10:56:55 2013 +0000 - - Make Mac OS X buildbot happy (Missing _U_) - - svn path=/trunk/; revision=53056 - -commit 60e3e52 -Author: Michael Mann -Date: Sun Nov 3 02:45:22 2013 +0000 - - Have asn1_ctx_t passed into the "h245.gef.name" and "h245.gef.content" subdissectors instead of using pinfo->private_data. - - svn path=/trunk/; revision=53055 - -commit 3b7f6f0 -Author: Michael Mann -Date: Sat Nov 2 21:06:07 2013 +0000 - - Partially revert r53052 because hf_ fields aren't defined (or used) - - svn path=/trunk/; revision=53054 - -commit cc19763 -Author: Evan Huus -Date: Sat Nov 2 20:16:54 2013 +0000 - - Replace glib with wmem when constructing dynamic RADIUS fields. Fixes the memory - leaks reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9370 - - svn path=/trunk/; revision=53053 - -commit f1e8e58 -Author: Michael Mann -Date: Sat Nov 2 20:10:51 2013 +0000 - - Bluetooth: minor improvements. Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893) - - 1. AVDTP: Fix double decoded stream - 2. AVDTP: Use items for logical block objects - 3. HCI_USB use handoffed dissector handles instead of find_dissector() - - From Michal Labedzki - - svn path=/trunk/; revision=53052 - -commit a267501 -Author: Michael Mann -Date: Sat Nov 2 19:20:04 2013 +0000 - - Bluetooth: Use dissector data instead of pinfo->private_data. Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893) - - From Michal Labedzki - - svn path=/trunk/; revision=53051 - -commit 2c85824 -Author: Gerald Combs -Date: Sat Nov 2 16:17:23 2013 +0000 - - From bkpsu via bug 9374: - - Minor grammar error in the NSIS installer script messageBox for - "isRunning" section. "one is associated" should be changed to "one of - its associated" - - svn path=/trunk/; revision=53050 - -commit 02a8391 -Author: Michael Mann -Date: Sat Nov 2 15:52:25 2013 +0000 - - Require dissector_try_string to pass a data parameter to its subdissectors. There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new. - - svn path=/trunk/; revision=53049 - -commit 925cba4 -Author: Alexis La Goutte -Date: Sat Nov 2 13:31:24 2013 +0000 - - Fix build (missing some _U_) - - svn path=/trunk/; revision=53048 - -commit c09657c -Author: Alexis La Goutte -Date: Sat Nov 2 13:16:19 2013 +0000 - - Fix warning found by fix-encodings-arg tool - - svn path=/trunk/; revision=53047 - -commit ea54dd1 -Author: Alexis La Goutte -Date: Sat Nov 2 13:12:56 2013 +0000 - - Make checkAPIs Happy (Missing const for value_string) - - svn path=/trunk/; revision=53046 - -commit 872f3ef -Author: Michael Mann -Date: Sat Nov 2 13:05:58 2013 +0000 - - Prep a few more dissectors to receive their string data through dissector data. - - svn path=/trunk/; revision=53045 - -commit 26105b7 -Author: Michael Mann -Date: Sat Nov 2 13:02:55 2013 +0000 - - get tcpinfo from dissector data, not pinfo->private_data - - svn path=/trunk/; revision=53044 - -commit 870346a -Author: Anders Broman -Date: Sat Nov 2 10:21:52 2013 +0000 - - From Zoltán Lajos Kis: - - dissect multipart request and reply messages - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=53043 - -commit 8dc0db8 -Author: Michael Mann -Date: Sat Nov 2 02:12:36 2013 +0000 - - Allow json dissector to receive a string through dissector data and give dissector data priority over pinfo->private_data (to discourage it's use) - - svn path=/trunk/; revision=53042 - -commit ac09e77 -Author: Michael Mann -Date: Sat Nov 2 01:36:53 2013 +0000 - - Allow text-data dissector to receive a string through dissector data and give dissector data priority over pinfo->private_data (to discourage it's use) - - svn path=/trunk/; revision=53041 - -commit f6934a4 -Author: Michael Mann -Date: Sat Nov 2 01:15:13 2013 +0000 - - Remove rpc_defrag.h - - Move the #defines to packet-rpc.h and pull the functions into packet-rpc.c since they aren't used by any dissectors. - - svn path=/trunk/; revision=53040 - -commit 2f78757 -Author: Guy Harris -Date: Sat Nov 2 01:12:30 2013 +0000 - - libcap is UN*X-only; libnl is Linux-only. - - svn path=/trunk/; revision=53039 - -commit 0a0af31 -Author: Guy Harris -Date: Sat Nov 2 01:07:07 2013 +0000 - - Mark unused arguments. - - svn path=/trunk/; revision=53038 - -commit 4302292 -Author: Guy Harris -Date: Sat Nov 2 00:50:24 2013 +0000 - - You have to cast void pointers to another type in C++; implicit - conversions aren't valid. - - svn path=/trunk/; revision=53037 - -commit f8f1f48 -Author: Michael Mann -Date: Sat Nov 2 00:36:30 2013 +0000 - - Pass struct tcpinfo into all TCP subdissectors instead of through pinfo->private_data. - - svn path=/trunk/; revision=53036 - -commit b648443 -Author: Michael Mann -Date: Fri Nov 1 23:45:10 2013 +0000 - - Allow try_conversation_dissector() to pass data to subdissectors. - - svn path=/trunk/; revision=53035 - -commit 7c20a93 -Author: Jörg Mayer -Date: Fri Nov 1 23:40:11 2013 +0000 - - Release notes are done. - - svn path=/trunk/; revision=53034 - -commit 953815d -Author: Bill Meier -Date: Fri Nov 1 21:39:23 2013 +0000 - - Revert SVN #53027: It gives compile warning on GCC (at least). - (No time right now to figure the problem out). - - CC libdissectors_la-packet-mq-base.lo - In file included from packet-mq-base.c:32:0: - packet-mq.h:42:54: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_ext' - #define DEF_VALSEXT(A) value_string_ext GET_VALSV(A)_ext = VALUE_STRING_EXT_INIT(GET_VALSV(A)) - ^ - packet-mq-base.c:1301:1: note: in expansion of macro 'DEF_VALSEXT' - DEF_VALSEXT(selector); - ^ - packet-mq.h:42:54: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_ext' - #define DEF_VALSEXT(A) value_string_ext GET_VALSV(A)_ext = VALUE_STRING_EXT_INIT(GET_VALSV(A)) - ^ - packet-mq-base.c:1495:1: note: in expansion of macro 'DEF_VALSEXT' - DEF_VALSEXT(mqcmd); - ^ - - - svn path=/trunk/; revision=53033 - -commit 2a69c2d -Author: Bill Meier -Date: Fri Nov 1 20:39:11 2013 +0000 - - Remove a phrase which implies that tab widths other than 8 are OK. - - svn path=/trunk/; revision=53030 - -commit 02f2b76 -Author: Bill Meier -Date: Fri Nov 1 20:13:15 2013 +0000 - - From robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5) - - Add more detail for SPI Open LPOO Structure - Add more int_to_vals for INQ_Q_MGR reply - Add more display detail for encoding value - Some fix and display correction - - See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367 - - - svn path=/trunk/; revision=53027 - -commit 250641f -Author: Jeff Morriss -Date: Fri Nov 1 20:06:22 2013 +0000 - - From Thomas Dreibholz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9368 : - - Call AC_PROG_MKDIR_P so MKDIR_P is sure to be set. - - svn path=/trunk/; revision=53026 - -commit 9707e46 -Author: Michael Mann -Date: Fri Nov 1 18:29:29 2013 +0000 - - General dissector cleanup. - - The original intent was to just deal with struct tcpinfo data, but after finding it was unnecessary (and somewhat limited dissection in COL_INFO), I took the cleanup a little farther. Sample traces from wiki and bug 5956 were very helpful in proving I didn't break anything. - - svn path=/trunk/; revision=53025 - -commit 16b27ad -Author: Pascal Quantin -Date: Fri Nov 1 17:02:39 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9298 : - Update manifest file so as to identify Windows 8.1 properly (see http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx for details) - Use manifest file to build tshark, rawshark and dumpcap - - svn path=/trunk/; revision=53024 - -commit 5217ec4 -Author: Pascal Quantin -Date: Fri Nov 1 16:00:58 2013 +0000 - - Clarify which filter types can share the same name - - svn path=/trunk/; revision=53017 - -commit 9589727 -Author: Pascal Quantin -Date: Fri Nov 1 15:48:57 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9360 : - Fix IRC response command filter - - svn path=/trunk/; revision=53016 - -commit ec34959 -Author: Jörg Mayer -Date: Fri Nov 1 09:55:26 2013 +0000 - - Add generation of release notes. - Regenerate NEWS file - - svn path=/trunk/; revision=53014 - -commit 9bdeb99 -Author: Jörg Mayer -Date: Fri Nov 1 09:54:05 2013 +0000 - - Remove a comment about adding use of the sh version of the script. - - svn path=/trunk/; revision=53013 - -commit 8a7198a -Author: Jörg Mayer -Date: Fri Nov 1 09:53:17 2013 +0000 - - Fix a typo that was never noticed - - svn path=/trunk/; revision=53012 - -commit 39515de -Author: Anders Broman -Date: Thu Oct 31 21:26:27 2013 +0000 - - Increase PROTO_PRE_ALLOC_HF_FIELDS_MEM - - svn path=/trunk/; revision=53009 - -commit a95614a -Author: Chris Maynard -Date: Thu Oct 31 17:30:22 2013 +0000 - - Make declarations consistent, fix typos, remove tabs, use consistent indentation, wrap text at column 80, add modelines. - - svn path=/trunk/; revision=53004 - -commit 35dd143 -Author: Michael Mann -Date: Thu Oct 31 15:02:50 2013 +0000 - - USB/PN532: Fix dissector to use new dissector *data instead of private_data. Bug 9333 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333) - - From Michal Labedzki - - svn path=/trunk/; revision=53003 - -commit 8baa713 -Author: Michael Mann -Date: Thu Oct 31 14:35:22 2013 +0000 - - Bluetooth: SDP: Recognize attributes by record handle or by UUIDs in request. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) - - From Michal Labedzki - - svn path=/trunk/; revision=53002 - -commit 6aaf3aa -Author: Michael Mann -Date: Thu Oct 31 14:12:53 2013 +0000 - - sb3_task_id_t is not used in any existing dissector and can't be passed to any other (third-party) dissectors, so don't have it pollute pinfo->private_data. - - Also, call_dissector shouldn't be under a tree. - - svn path=/trunk/; revision=53001 - -commit 8f6b827 -Author: Martin Mathieson -Date: Thu Oct 31 13:58:57 2013 +0000 - - Test was the wrong way around - - svn path=/trunk/; revision=53000 - -commit 15a7add -Author: Irene Rüngeler -Date: Thu Oct 31 07:54:06 2013 +0000 - - Add licence information. - - svn path=/trunk/; revision=52999 - -commit 68b5888 -Author: Evan Huus -Date: Thu Oct 31 01:49:10 2013 +0000 - - From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9345 - - openSAFETY: Changes for better dissection of additional SADR and SN Fail - messages - - svn path=/trunk/; revision=52998 - -commit 1ac9cf6 -Author: Gerald Combs -Date: Thu Oct 31 01:08:36 2013 +0000 - - Fix up some macros. - - svn path=/trunk/; revision=52996 - -commit c0fcebb -Author: Michael Mann -Date: Thu Oct 31 00:57:03 2013 +0000 - - Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new. - - The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector. For now, all calls to call_ber_oid_callback have the data parameter set to NULL. - - svn path=/trunk/; revision=52994 - -commit 0de6807 -Author: Gerald Combs -Date: Thu Oct 31 00:05:59 2013 +0000 - - Set the progress bar animation behavior to match other parts of the - program. - - svn path=/trunk/; revision=52993 - -commit 46a0d36 -Author: Gerald Combs -Date: Thu Oct 31 00:01:51 2013 +0000 - - Try to make the animation a little more natural. - - svn path=/trunk/; revision=52992 - -commit 60d6458 -Author: Gerald Combs -Date: Wed Oct 30 23:54:46 2013 +0000 - - Move the geometry shenanigans a bit further ahead in the startup - sequence. Fix some prefs logic. - - svn path=/trunk/; revision=52991 - -commit b17d987 -Author: Gerald Combs -Date: Wed Oct 30 23:23:24 2013 +0000 - - Fix maximized geometry behavior on non-OS X systems. - - svn path=/trunk/; revision=52990 - -commit 8f21bfe -Author: Gerald Combs -Date: Wed Oct 30 23:14:11 2013 +0000 - - Fix a comparison. - - svn path=/trunk/; revision=52989 - -commit 9075922 -Author: Gerald Combs -Date: Wed Oct 30 22:39:52 2013 +0000 - - Add initial support for geometry settings in the main window. - - In the current Qt startup sequence the main window + splash screen is - displayed before the main preferences are loaded which means we can't - immediately apply the correct geometry. For now, use an animation to - morph from the default to the saved geometry after the prefs are loaded. - - Get rid of main_do_quit() (Qt) and main_window_exit() (Qt+GTK). It looks - like they were unused. - - Add wsApp->isInitialized() and use it to see if we should exit() when - the main window is closed. Otherwise we won't shut the application down - and clean up properly. - - svn path=/trunk/; revision=52988 - -commit b84fee4 -Author: Martin Kaiser -Date: Wed Oct 30 22:34:16 2013 +0000 - - BAT has a Bouquet ID, no Service ID - - svn path=/trunk/; revision=52987 - -commit 63325bd -Author: Martin Kaiser -Date: Wed Oct 30 22:18:55 2013 +0000 - - add one more private data specifier - - svn path=/trunk/; revision=52986 - -commit 3e2863e -Author: Chris Maynard -Date: Wed Oct 30 18:16:22 2013 +0000 - - Remove an extraneous semicolon. - - svn path=/trunk/; revision=52985 - -commit 875dee2 -Author: Jeff Morriss -Date: Wed Oct 30 15:56:01 2013 +0000 - - Add some documentation to hopefully help dissector writers avoid the problem - in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 : - - The string added to proto_tree_add_string*() must be NULL terminated. - - svn path=/trunk/; revision=52984 - -commit 9049713 -Author: Martin Mathieson -Date: Wed Oct 30 13:45:28 2013 +0000 - - Initialise current_security to NULL, to avoid possibly using uninitialised - - svn path=/trunk/; revision=52983 - -commit 7847580 -Author: Martin Mathieson -Date: Wed Oct 30 13:18:15 2013 +0000 - - Get rid of value_strings that appear to be a throwback to when ROHC appeared in this dissector - - svn path=/trunk/; revision=52982 - -commit 97070ac -Author: Martin Mathieson -Date: Wed Oct 30 12:58:03 2013 +0000 - - Don't call RRC dissector if should be ciphered. Take care to allow SecurityModeComplete to be shown though (i.e. the next UL frame after security is configured) - - svn path=/trunk/; revision=52981 - -commit 694bc6b -Author: Michael Mann -Date: Wed Oct 30 04:06:54 2013 +0000 - - Allow string-based dissector tables to pass data between dissectors. - - svn path=/trunk/; revision=52980 - -commit a364873 -Author: Evan Huus -Date: Wed Oct 30 02:09:34 2013 +0000 - - Replace some proto_tree_add_string_format with proto_tree_add_item + - proto_tree_set_text - the string was not the important part, the formatting was. - We were passing the string directly from tvb_get_ptr, but this meant that if the - packet didn't contain a null-terminator we would run off the end. Since the - string comes straight from the packet, just let _add_item handle the length - calculations etc efficiently, and set the display later. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 - - I'm a bit confused honestly why most of these are being set hidden after being - added and formatted, but at least there are no memory errors anymore. - - svn path=/trunk/; revision=52979 - -commit 1c96e97 -Author: Michael Mann -Date: Wed Oct 30 02:02:08 2013 +0000 - - Update the ASN.1 generated dissectors that were missed as part of the patches in bug 9344 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344) - - svn path=/trunk/; revision=52978 - -commit 8f5bdaa -Author: Evan Huus -Date: Wed Oct 30 01:42:11 2013 +0000 - - When adding an entry to a dissector string table, take a copy of the pattern - string (and pass g_free to g_hash_table_new_full to free it). - - This means callers don't have to worry about the scope of the memory they pass - in, and fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9296 - - svn path=/trunk/; revision=52977 - -commit aa452c3 -Author: Jeff Morriss -Date: Wed Oct 30 00:43:46 2013 +0000 - - Set SVN properties. - - svn path=/trunk/; revision=52976 - -commit 1e6927d -Author: Anders Broman -Date: Tue Oct 29 23:18:26 2013 +0000 - - Fix proto.c:4498: warning: 'compare_filter_name' defined but not used - - svn path=/trunk/; revision=52975 - -commit c864a20 -Author: Anders Broman -Date: Tue Oct 29 22:17:18 2013 +0000 - - Optimize proto_get_id_by_filter_name() by using the existing hastable for proto_filter_names. - - svn path=/trunk/; revision=52972 - -commit a7505b3 -Author: Martin Mathieson -Date: Tue Oct 29 22:16:32 2013 +0000 - - Mark an unused parameter as such - - svn path=/trunk/; revision=52971 - -commit 733713b -Author: Martin Kaiser -Date: Tue Oct 29 21:50:21 2013 +0000 - - if pointer==0, the section starts immediately - don't add an empty fragment to the list - - this should fix the asserts reported in - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9325 - and - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8352 - - svn path=/trunk/; revision=52969 - -commit 4118256 -Author: Martin Kaiser -Date: Tue Oct 29 21:40:09 2013 +0000 - - separate function for dissecting the adaptation field - - svn path=/trunk/; revision=52967 - -commit de0fda9 -Author: Jeff Morriss -Date: Tue Oct 29 21:18:22 2013 +0000 - - Revert r52905 and r52908: they're causing plenty of fuzz failures. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 is tracking the fix. - - svn path=/trunk/; revision=52966 - -commit f37469d -Author: Jeff Morriss -Date: Tue Oct 29 21:16:50 2013 +0000 - - Remove no-longer-used parameter. - - svn path=/trunk/; revision=52965 - -commit bd683d5 -Author: Michael Mann -Date: Tue Oct 29 21:12:50 2013 +0000 - - Pass T.38 data to subdissectors directly instead of using pinfo->private_data. - - svn path=/trunk/; revision=52964 - -commit 773359c -Author: Michael Mann -Date: Tue Oct 29 20:04:50 2013 +0000 - - Remove use of pinfo->private_data - - svn path=/trunk/; revision=52963 - -commit b93a567 -Author: Martin Mathieson -Date: Tue Oct 29 17:57:56 2013 +0000 - - Add casts to results of g_hash_table_lookup() calls - - svn path=/trunk/; revision=52955 - -commit 304b96c -Author: Martin Mathieson -Date: Tue Oct 29 17:46:50 2013 +0000 - - Show security config settings in each PDCP PDU. Don't call IP dissector for ciphered userplane frames. SRB messages are more complicated - need to keep track of SecurityModeRequest and SecurityModeResponse as they are not ciphered - - svn path=/trunk/; revision=52953 - -commit 119b431 -Author: Jeff Morriss -Date: Tue Oct 29 15:28:49 2013 +0000 - - Add some items to the list of things still to be done. - - svn path=/trunk/; revision=52952 - -commit 8695129 -Author: Michael Mann -Date: Tue Oct 29 15:18:05 2013 +0000 - - Adjust when dissect_diameter_avp loop is called to avoid access violations. - - from Lukasz Markowski - - svn path=/trunk/; revision=52951 - -commit 1b55ee1 -Author: Bill Meier -Date: Tue Oct 29 15:00:32 2013 +0000 - - Whitespace fixes: Replace some tabs by spaces & etc - - svn path=/trunk/; revision=52950 - -commit 37a66d9 -Author: Jeff Morriss -Date: Tue Oct 29 14:48:08 2013 +0000 - - From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9347 : - - Asterix dissector had two #if 0 ... #endif blocks because it obviously did not - compile on some systems. - - Blocks were created because of mistyped variable names and variable not used - warning/error. - - The errors were corrected. - - svn path=/trunk/; revision=52949 - -commit 0ad9856 -Author: Bill Meier -Date: Tue Oct 29 14:09:20 2013 +0000 - - From didier gautheron: remove redundant or use faster col_xxx functions - - - when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster. - - same for replace col_append_fstr and col_append_str - - remove col_clear() when it's redundant: - + before a col_set/col_add if the dissector can't throw an exception. - - replace col_append() after a col_clear() with faster col_add... or col_set - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 - - - svn path=/trunk/; revision=52948 - -commit 86c145e -Author: Martin Mathieson -Date: Tue Oct 29 14:08:19 2013 +0000 - - Add a cast to try to fix OSX buildbot - - svn path=/trunk/; revision=52947 - -commit 66d64c6 -Author: Martin Mathieson -Date: Tue Oct 29 13:49:14 2013 +0000 - - Pass security command details (integrity and ciphering algorithms) to PDCP (which doesn't yet do much with them) - - svn path=/trunk/; revision=52946 - -commit 6d3988f -Author: Irene Rüngeler -Date: Tue Oct 29 12:11:23 2013 +0000 - - Make the packet analysis for SCTP independent from GTK and QT. - - svn path=/trunk/; revision=52945 - -commit 9f3740b -Author: Martin Kaiser -Date: Tue Oct 29 11:04:03 2013 +0000 - - simplify file_error() - - svn path=/trunk/; revision=52944 - -commit 5ec452c -Author: Martin Kaiser -Date: Tue Oct 29 09:15:02 2013 +0000 - - allow err_info==NULL in file_error() - - this fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9309 - reported by Peter Wu - - svn path=/trunk/; revision=52943 - -commit a876a43 -Author: Martin Kaiser -Date: Tue Oct 29 08:34:35 2013 +0000 - - From Peter Wu - - write editcap debug infos to stderr - print some of those messages only in verbose mode - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9342 - - svn path=/trunk/; revision=52942 - -commit ba49d9b -Author: Gerald Combs -Date: Tue Oct 29 04:05:27 2013 +0000 - - Revert part of 52896 and (for now) all of 52935. As Jeff pointed out, - the PortableApps version relies on U3_-prefixed environment variables. - - svn path=/trunk/; revision=52941 - -commit 58d0151 -Author: Jeff Morriss -Date: Tue Oct 29 02:28:16 2013 +0000 - - Make it so out-of-tree builds (autofoo and cmake) have access to the various - data files (diameter/*, COPYING, manuf) when running *shark from the - build directory. - - Do this by passing in the top-level source directory as a compile-time - definition (unfortunately this has to be in the top-level Makefile too because - some programs link directly with epan/filesystem.c). - - The plugins dir is no longer below the datafile directory but rather the - progfile directory (if we have one). Handle the special case of AUTHORS-SHORT - (a data file but a generated one) by checking the file name before building - the path. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5664 - - svn path=/trunk/; revision=52940 - -commit 766a327 -Author: Guy Harris -Date: Tue Oct 29 01:49:59 2013 +0000 - - Support building and installing both Qt and GTK+. - - When forcing CFLAGS and CXXFLAGS, add -g and -O2; newer versions of - autoconf do so for GCC-compatible compilers (clang is GCC-compatible in - that sense), but only do so when those variables aren't forced. - - svn path=/trunk/; revision=52939 - -commit e15afad -Author: Michael Mann -Date: Tue Oct 29 00:25:57 2013 +0000 - - Have GTPv2 pass its "instance ID" to "private extension" subdissectors rather than use pinfo->private_data. There are no "private extension" subdissectors in the Wireshark source, so I assume it's all done by third-party plugins. They must now update their dissectors to get the "instance ID" from the dissector data parameter. - - svn path=/trunk/; revision=52938 - -commit 4e94bdc -Author: Gerald Combs -Date: Mon Oct 28 23:57:57 2013 +0000 - - Fix scroll bar ranges. - - svn path=/trunk/; revision=52937 - -commit 360c4fb -Author: Gerald Combs -Date: Mon Oct 28 22:38:23 2013 +0000 - - Add c-ares. Untested, but it *should* work. - - svn path=/trunk/; revision=52936 - -commit 66558ef -Author: Gerald Combs -Date: Mon Oct 28 22:11:51 2013 +0000 - - Remove some (but not all) U3 remnants. - - svn path=/trunk/; revision=52935 - -commit 6ef5eb6 -Author: Martin Kaiser -Date: Mon Oct 28 21:49:56 2013 +0000 - - TABs -> spaces - add editor modelines - - svn path=/trunk/; revision=52934 - -commit 447d393 -Author: Pascal Quantin -Date: Mon Oct 28 21:19:21 2013 +0000 - - Add Tinkerforge to the list of new protocols - - svn path=/trunk/; revision=52933 - -commit fbba441 -Author: Bill Meier -Date: Mon Oct 28 20:37:58 2013 +0000 - - FIX compiler warning: - packet-gtp.c: In function 'dissect_gtp_common': - packet-gtp.c:7838: warning: unused variable 'pd_save' - - svn path=/trunk/; revision=52932 - -commit 11934cf -Author: Bill Meier -Date: Mon Oct 28 20:07:58 2013 +0000 - - From Ishraq Ibne Ashraf: Tinkerforge protocol dissector - - See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9324 - - From me: - - 1. Move certain global vars to local storage in dissect_tfp_common() - - 2. Declare all remaining global vars as static; - - 3. Fix some bugs: - - base58_encode() needed to be called before call to col_add_fstr() - - display of UID string in tree was being truncated to 4 characters - - 4. Cleanup whitespace: use consistent indentation (tabs); remove trailing whitespace; - - 5. Add editor modelines - - - - - svn path=/trunk/; revision=52931 - -commit e68d155 -Author: Michael Mann -Date: Mon Oct 28 20:00:04 2013 +0000 - - Add an extra parameter to gtp_match_response() so pinfo->private_data doesn't need to be used. - - svn path=/trunk/; revision=52930 - -commit 31db013 -Author: Gerald Combs -Date: Mon Oct 28 19:09:58 2013 +0000 - - Add some verbosity. - - svn path=/trunk/; revision=52929 - -commit 9a2f5a2 -Author: Michael Tüxen -Date: Mon Oct 28 18:59:33 2013 +0000 - - Fix the compilation. - I guess this is what is meant. Only compile tested... - - svn path=/trunk/; revision=52928 - -commit 3f0e0d5 -Author: Anders Broman -Date: Mon Oct 28 18:10:16 2013 +0000 - - Add an if(tree) and tweek col_add_fstr(). - - svn path=/trunk/; revision=52927 - -commit d07f872 -Author: Jeff Morriss -Date: Mon Oct 28 18:01:09 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9341 : - - SVN rev 50525 tried to fix out-of-source-tree builds, but did so by - writing the .rcc.cpp files to the source tree. This was noticed when - running `make distcheck`. This patch reverts that behavior, and creates - the image/ directory to fix out-of-tree builds. - - In other words, fix things so "make distcheck" with Qt works in out-of-tree - builds too. - - svn path=/trunk/; revision=52926 - -commit 5587250 -Author: Martin Kaiser -Date: Mon Oct 28 17:16:43 2013 +0000 - - make Pointer filterable - - svn path=/trunk/; revision=52925 - -commit 8367a1a -Author: Martin Kaiser -Date: Mon Oct 28 17:13:13 2013 +0000 - - packed_analysis_data_t -> packet_analysis_data_t - - svn path=/trunk/; revision=52924 - -commit 1a7a05a -Author: Martin Kaiser -Date: Mon Oct 28 17:10:09 2013 +0000 - - correct typos - - svn path=/trunk/; revision=52923 - -commit 8a2b9d8 -Author: Martin Kaiser -Date: Mon Oct 28 17:08:55 2013 +0000 - - remove unnecessary return; lines - - svn path=/trunk/; revision=52922 - -commit 8883b7a -Author: Martin Kaiser -Date: Mon Oct 28 17:07:14 2013 +0000 - - add tags file to .gitignore - - svn path=/trunk/; revision=52921 - -commit c89b9a2 -Author: Martin Kaiser -Date: Mon Oct 28 16:59:57 2013 +0000 - - initialize tree variables - - svn path=/trunk/; revision=52920 - -commit 5de5fe6 -Author: Michael Mann -Date: Mon Oct 28 15:59:26 2013 +0000 - - Pass diam_sub_dis_t directly to the subdissectors instead of using pinfo->private_data. - - svn path=/trunk/; revision=52919 - -commit 6340776 -Author: Martin Mathieson -Date: Mon Oct 28 14:26:13 2013 +0000 - - Remove accidentally-added private dissectors from Makefile - - svn path=/trunk/; revision=52918 - -commit bf004cc -Author: Martin Mathieson -Date: Mon Oct 28 14:09:39 2013 +0000 - - Comment changes only - - svn path=/trunk/; revision=52917 - -commit 3b91b95 -Author: Michael Mann -Date: Mon Oct 28 13:36:49 2013 +0000 - - Pass tcap_private into the dissectors that need it rather than use private_data. Not sure if value_ptr is the "proper" place to pass tcap_private "internally" within the TCAP dissector, but it gets away from (potential) private_data (ab)use. - - svn path=/trunk/; revision=52916 - -commit 6697d30 -Author: Bill Meier -Date: Mon Oct 28 04:07:52 2013 +0000 - - Revert SVN #52914; - OSX-10.6-x64 buildbot still givs an error - (At least we now know which line of code gives the error). - - svn path=/trunk/; revision=52915 - -commit 2c3ec28 -Author: Bill Meier -Date: Mon Oct 28 03:16:31 2013 +0000 - - From Shekhar Chandra: support for version 3.0 of netscaler packet wire format. - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280 - - (Revised patch: let's see if this version compiles w/o error - on all the buildbots) - - - svn path=/trunk/; revision=52914 - -commit 3b7c0ff -Author: Gerald Combs -Date: Mon Oct 28 01:39:20 2013 +0000 - - More size and position tweaks. - - svn path=/trunk/; revision=52913 - -commit 20bbd49 -Author: Evan Huus -Date: Mon Oct 28 00:43:18 2013 +0000 - - Use _add_item not _add_uint as pointed out by checkAPI - - svn path=/trunk/; revision=52912 - -commit c5bc8e9 -Author: Jeff Morriss -Date: Mon Oct 28 00:25:20 2013 +0000 - - Fix up some formatting. - - svn path=/trunk/; revision=52911 - -commit 3ead3a9 -Author: Michael Mann -Date: Sun Oct 27 23:18:19 2013 +0000 - - Remove "Cisco MDS-specific" fields from packet_info. 2 of the 3 fields were used strictly for columns that are considered "deprecated" and I think the third could be put in that category as well. - - I assume the column enumerations haven't already been removed because of legacy "indexing issues", but if I'm wrong, we should definitely remove the columns altogether. Could also see renaming columns to DEPRECATED_[X]. - - svn path=/trunk/; revision=52910 - -commit 233c409 -Author: Evan Huus -Date: Sun Oct 27 23:08:01 2013 +0000 - - Dissect Kafka "fetch" requests and responses. - - svn path=/trunk/; revision=52909 - -commit 9259176 -Author: Jeff Morriss -Date: Sun Oct 27 22:40:55 2013 +0000 - - As pointed by Evan: don't leak memory when the string pointer is NULL. - - svn path=/trunk/; revision=52908 - -commit 18b9db2 -Author: Pascal Quantin -Date: Sun Oct 27 22:40:45 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 : - NFC: Add PN532 HCI dissector - - svn path=/trunk/; revision=52907 - -commit 5c65e00 -Author: Gerald Combs -Date: Sun Oct 27 22:23:27 2013 +0000 - - Try to improve the appearance of the sequence diagram. - - Use integer coordinates for the arrows and text. Add smooth_font_size() - to qt_ui_utils which will hopefully adjust the size on Windows to - something more readable. - - svn path=/trunk/; revision=52906 - -commit 8e2f00b -Author: Jeff Morriss -Date: Sun Oct 27 21:56:58 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9323 : - - Actually handle non-NULL-terminated FT_STRINGs properly. - - svn path=/trunk/; revision=52905 - -commit b0aa70b -Author: Martin Mathieson -Date: Sun Oct 27 21:52:35 2013 +0000 - - Initialise a couple of variables to avoid bogus may-be-used-uninitialised warnings with my version of gcc - - svn path=/trunk/; revision=52904 - -commit 289c279 -Author: Pascal Quantin -Date: Sun Oct 27 21:32:32 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 : - USB: Decode HID interface subclasses and protocols - - svn path=/trunk/; revision=52903 - -commit 13b39aa -Author: Pascal Quantin -Date: Sun Oct 27 21:14:22 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 : - USB: CDC: Decode ACM, CM and Union Functional Descriptors - - svn path=/trunk/; revision=52902 - -commit 3f26a0f -Author: Pascal Quantin -Date: Sun Oct 27 20:59:43 2013 +0000 - - From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333 : - USB: Decode CDC subclasses and protocols - - svn path=/trunk/; revision=52901 - -commit 8ab858e -Author: Evan Huus -Date: Sun Oct 27 20:58:00 2013 +0000 - - Mark unused parameters. - - svn path=/trunk/; revision=52900 - -commit 8c64c5d -Author: Michael Mann -Date: Sun Oct 27 20:38:42 2013 +0000 - - Remove iplen and iphdrlen from struct _packet_info. - Dissectors should just use (reported) tvb length and taps have other ways to get the data. - - svn path=/trunk/; revision=52899 - -commit 63ff652 -Author: Pascal Quantin -Date: Sun Oct 27 19:45:30 2013 +0000 - - Fix relative path now that u3 folder has been removed - - svn path=/trunk/; revision=52898 - -commit d8bbe9b -Author: Pascal Quantin -Date: Sun Oct 27 19:33:55 2013 +0000 - - Do not reset pinfo->curr_layer_num in packet-frame.c - Before this change, curr_layer_num could be off by 1 depending on whether we - generated items for Frame protocol or not, leading to a failure to get the - UDP heuristic dissector identified during first pass - - svn path=/trunk/; revision=52897 - -commit 69741d0 -Author: Gerald Combs -Date: Sun Oct 27 17:15:39 2013 +0000 - - Remove U3 code and packaging. - - svn path=/trunk/; revision=52896 - -commit 8585240 -Author: Gerald Combs -Date: Sun Oct 27 17:14:12 2013 +0000 - - Add Gettext to PACKAGELIST. Homebrew puts it in a nonstandard location. - - svn path=/trunk/; revision=52895 - -commit 471f211 -Author: Michael Mann -Date: Sun Oct 27 16:03:11 2013 +0000 - - Have X.25 dissector pass boolean q_bit_set value through dissector data rather than pinfo->private_data. - - Other "related" dissectors weren't manipulating pinfo->private_data, so it doesn't make sense for them to bother saving/restore it (now that q_bit_set isn't being used) - - svn path=/trunk/; revision=52894 - -commit 394f67c -Author: Michael Mann -Date: Sun Oct 27 15:00:11 2013 +0000 - - Allow "circuit dissectors" to pass data between dissectors. Not sure if this is immediately useful (ie remove need for packet_info (private_)data), but opens the possibility. - - svn path=/trunk/; revision=52893 - -commit 469fc86 -Author: Gerald Combs -Date: Sun Oct 27 14:03:42 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-10-27] - - svn path=/trunk/; revision=52890 - -commit 21aa62a -Author: Anders Broman -Date: Sun Oct 27 13:02:05 2013 +0000 - - From Zoltán Lajos Kis: - - dissect flow_removed and port_status messages - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=52889 - -commit b57038a -Author: Anders Broman -Date: Sun Oct 27 12:55:56 2013 +0000 - - From Zoltán Lajos Kis: - - dissect experimenter, get/set config, packet in and packet out messages - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=52888 - -commit eb560aa -Author: Jörg Mayer -Date: Sun Oct 27 02:18:57 2013 +0000 - - Various updates - go into a little depth now. - - svn path=/trunk/; revision=52887 - -commit 3392cb4 -Author: Jörg Mayer -Date: Sun Oct 27 02:18:00 2013 +0000 - - Treat IE 173 (symbol proprietary) like we treat the vendor IE - - svn path=/trunk/; revision=52886 - -commit 09bd9ad -Author: Michael Mann -Date: Sun Oct 27 02:00:18 2013 +0000 - - Have ANSI TCAP dissector pass data through subdissector parameter instead of using struct _packet_info. - - svn path=/trunk/; revision=52885 - -commit 0690c4f -Author: Jeff Morriss -Date: Sun Oct 27 01:11:15 2013 +0000 - - More SVN properties cleanup. - - svn path=/trunk/; revision=52884 - -commit bb36a25 -Author: Michael Mann -Date: Sun Oct 27 01:06:44 2013 +0000 - - Remove use of pinfo->private_data and just pass the data around through function parameters - - Remove g_pinfo from packet-ansi_637.c and add packet_info* as a function parameter while we're at it. - - svn path=/trunk/; revision=52883 - -commit 2d20a6c -Author: Jeff Morriss -Date: Sun Oct 27 00:51:54 2013 +0000 - - Fix up some more svn properties. - - svn path=/trunk/; revision=52882 - -commit 04c9e08 -Author: Jeff Morriss -Date: Sun Oct 27 00:50:26 2013 +0000 - - Don't set svn:keywords on .pod files. Remove it from those that have it. - Reorganize svnadd a little bit. - - svn path=/trunk/; revision=52881 - -commit ef24e09 -Author: Pascal Quantin -Date: Sat Oct 26 21:04:53 2013 +0000 - - From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9328 : - Suppress some VS2013 warnings when compiling gtk ui - - svn path=/trunk/; revision=52880 - -commit 01c2eec -Author: Evan Huus -Date: Sat Oct 26 20:57:38 2013 +0000 - - Updates to radiotap-iter licensing terms. The upstream version has a COPYING - file containing what is actually the ISC license (BSD-like), so add that to the - header for licensecheck's sake (and remove the confusing reference to the BSD - license). This makes the code actually your choice of ISC - and GPL2 (since it is used in the Linux kernel which is GPL2-only). ISC is - already acceptable for us, so ISC \union * must be also, so add ISC+GPL2 to - checlicenses' list. - - Upstream COPYING file, for reference: - http://git.sipsolutions.net/?p=radiotap.git;a=blob;f=COPYING;hb=97478c8467ce7ab56b7c9e8fd7cdc0f4e2cb22ed - - svn path=/trunk/; revision=52879 - -commit 99c75b2 -Author: Pascal Quantin -Date: Sat Oct 26 20:50:51 2013 +0000 - - From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9330: - Add OID tests for adding named arcs - - svn path=/trunk/; revision=52878 - -commit 9804a7b -Author: Michael Mann -Date: Sat Oct 26 19:18:12 2013 +0000 - - Don't use private_data for pwatm_private_data_t and instead pass it into the dissectors. - - svn path=/trunk/; revision=52877 - -commit 5b28dba -Author: Alexis La Goutte -Date: Sat Oct 26 17:20:18 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=52876 - -commit 3a1041c -Author: Alexis La Goutte -Date: Sat Oct 26 17:18:24 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=52875 - -commit 39f4eb2 -Author: Alexis La Goutte -Date: Sat Oct 26 17:18:12 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=52874 - -commit 70b52fc -Author: Alexis La Goutte -Date: Sat Oct 26 17:17:53 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=52873 - -commit 6895d1f -Author: Alexis La Goutte -Date: Sat Oct 26 17:17:38 2013 +0000 - - Remove unused variable - - svn path=/trunk/; revision=52872 - -commit 8bcefa0 -Author: Alexis La Goutte -Date: Sat Oct 26 17:17:17 2013 +0000 - - Fix indent and add modelines info - - svn path=/trunk/; revision=52871 - -commit 3342e3b -Author: Evan Huus -Date: Sat Oct 26 16:04:21 2013 +0000 - - Convert some emem to wmem. It took some manual flow analysis, but they are only - used during actual packet dissection. - - svn path=/trunk/; revision=52870 - -commit df5a9be -Author: Michael Mann -Date: Sat Oct 26 13:28:47 2013 +0000 - - Bluetooth: SDP: Decode custom 128bit UUIDs and minor fixes. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) - - From Michal Labedzki - - svn path=/trunk/; revision=52869 - -commit e154ac3 -Author: Michael Mann -Date: Sat Oct 26 13:18:21 2013 +0000 - - Bluetooth: OBEX: PBAP: Fix Filter parameter. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) - - From Michal Labedzki - - svn path=/trunk/; revision=52868 - -commit 2416408 -Author: Anders Broman -Date: Sat Oct 26 09:37:47 2013 +0000 - - Convert to value_str_ext in a couple of places. - - svn path=/trunk/; revision=52867 - -commit 21bed981 -Author: Bill Meier -Date: Sat Oct 26 03:16:57 2013 +0000 - - Fix several [-Wunused-const-variable] warnings (using '#if 0'). - - svn path=/trunk/; revision=52866 - -commit 70cf133 -Author: Evan Huus -Date: Sat Oct 26 02:54:58 2013 +0000 - - Cleanups to the TPNCP database parser/loader: - - use and free glib memory instead of ep_ memory - another dissector down - - propogate errors correctly - - produce a warning if an error occurs loading the DB - - add XXX comments about realloc handling that may or may not be a memory leak - in failure cases - - svn path=/trunk/; revision=52865 - -commit 2ebf40a -Author: Michael Mann -Date: Sat Oct 26 02:36:56 2013 +0000 - - Bluetooth: SDP: Decode all types of UUIDs. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327). - - From Michal Labedzki - - svn path=/trunk/; revision=52864 - -commit 3cc6957 -Author: Michael Mann -Date: Sat Oct 26 02:24:04 2013 +0000 - - Bluetooth: Use items for logical block objects. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) - - Bluetooth protocols use items, so dissect it to improve filtering and better user experience - text object cannot be filterable or comparable. - - From Michal Labedzki - - svn path=/trunk/; revision=52863 - -commit 6dd42b5 -Author: Bill Meier -Date: Sat Oct 26 02:09:14 2013 +0000 - - Fix some [-Wunused-const-variable] warnings (using '#if 0') - - svn path=/trunk/; revision=52862 - -commit 63869c4 -Author: Michael Mann -Date: Sat Oct 26 00:53:23 2013 +0000 - - Bluetooth: SDP: Add MultiProfile UUIDs. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) - - From Michal Labedzki - - svn path=/trunk/; revision=52861 - -commit d8f1af5 -Author: Jeff Morriss -Date: Sat Oct 26 00:41:54 2013 +0000 - - Mark a bunch of no-longer-used parameters as unused. Remove a couple of - unused parameters. - - svn path=/trunk/; revision=52860 - -commit 250568c -Author: Michael Mann -Date: Sat Oct 26 00:36:16 2013 +0000 - - Bluetooth: SDP: Fix PBAP features presentation. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) - - From Michal Labedzki - - svn path=/trunk/; revision=52859 - -commit 68a5e46 -Author: Michael Mann -Date: Sat Oct 26 00:31:42 2013 +0000 - - OBEX: Fix Presentation of Reserved Fields. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) - - From Michal Labedzki - - svn path=/trunk/; revision=52858 - -commit 5030e21 -Author: Michael Mann -Date: Sat Oct 26 00:26:41 2013 +0000 - - Replace tabs by spaces. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) - - From Michal Labedzki - - svn path=/trunk/; revision=52857 - -commit 1e0405a -Author: Michael Mann -Date: Fri Oct 25 23:59:30 2013 +0000 - - Remove SMB's use of private_data and just pass the data through all of the dissection functions - - svn path=/trunk/; revision=52856 - -commit 7a2de9f -Author: Gerald Combs -Date: Fri Oct 25 23:16:56 2013 +0000 - - More sequence dialog updates. - - Draw item labels and port numbers. Update the hint text. Make items - selectable. Resize fonts similar to the GTK+ version. Add scrollbars. - Update the cursor. Use pango_layout_set_ellipsize() in the GTK+ code. - Fixup comments. - - svn path=/trunk/; revision=52855 - -commit 95f484a -Author: Evan Huus -Date: Fri Oct 25 22:14:25 2013 +0000 - - Add a very small hack to make the UAT update callback error string freeable, and - convert all existing UAT update callbacks to use glib memory instead of - ephemeral memory for that string. - - UAT code paths are entirely distinct from packet dissection, so using ephemeral - memory was the wrong choice, because there was no guarantees about when it would - be freed. - - The move away from emem still needs to be propogated deeper into the UAT code - itself at some point. - - Net effect: remove another bunch of emem calls from dissectors, where replacing - with wmem would have caused assertions. - - svn path=/trunk/; revision=52854 - -commit 7a3feba -Author: Gerald Combs -Date: Fri Oct 25 21:37:30 2013 +0000 - - Exit if we're building with Qt and we can't find macdeployqt. - - svn path=/trunk/; revision=52853 - -commit a049a20 -Author: Chris Maynard -Date: Fri Oct 25 21:16:39 2013 +0000 - - Sync up with packet-pana.c. - - svn path=/trunk/; revision=52852 - -commit 9fd46d8 -Author: Chris Maynard -Date: Fri Oct 25 21:04:22 2013 +0000 - - wmemify. - - svn path=/trunk/; revision=52851 - -commit b190de3 -Author: Jeff Morriss -Date: Fri Oct 25 20:38:50 2013 +0000 - - Fix CID 281375 (dead code) while hopefully fixing detection of Class-2 ERR - messages. - - Also fix a couple of incorrect MTP3 standard detections that I found. - - svn path=/trunk/; revision=52850 - -commit ce22ab5 -Author: Evan Huus -Date: Fri Oct 25 18:14:36 2013 +0000 - - Add an exception to the license-checker for Samba's special IDL license which - appears to be compatible as far as I can tell (not a lawyer). See: - https://www.wireshark.org/lists/wireshark-dev/201310/msg00234.html - - svn path=/trunk/; revision=52849 - -commit 274596e -Author: Jeff Morriss -Date: Fri Oct 25 15:25:46 2013 +0000 - - Fix up some formatting and white space. - - svn path=/trunk/; revision=52848 - -commit ce23d500 -Author: Jeff Morriss -Date: Fri Oct 25 15:00:00 2013 +0000 - - Fix CID 715143: assert that the preference we were looking for was found. It - should be which is why this is an assertion not a NULL check. - - svn path=/trunk/; revision=52847 - -commit 81b0681 -Author: Jeff Morriss -Date: Fri Oct 25 14:57:55 2013 +0000 - - Fix CID 715144: assert that the preference we were looking for was found. It - should be which is why this is an assertion not a NULL check. - - svn path=/trunk/; revision=52846 - -commit 4cfc0f2 -Author: Jeff Morriss -Date: Fri Oct 25 14:41:12 2013 +0000 - - Kafka's CRC is 4 bytes long and is added with ENC_BIG_ENDIAN. Make the hf - FT_UINT32 instead of FT_BYTES to match. - - svn path=/trunk/; revision=52845 - -commit 3440dd7 -Author: Jeff Morriss -Date: Fri Oct 25 14:38:39 2013 +0000 - - Fix CID 1080758: be prepared for tvb_child_uncompress() failing (and returning - NULL). - - svn path=/trunk/; revision=52844 - -commit 2aae7bc -Author: Jeff Morriss -Date: Fri Oct 25 14:15:28 2013 +0000 - - Fix CID 280081: ENC_NULL can't be used as an array index into ciphers[], rather - ENC_NULL-0x30 needs to be used. - - (This could probably use some cleanup...) - - svn path=/trunk/; revision=52843 - -commit ab97b9d -Author: Jeff Morriss -Date: Fri Oct 25 14:04:22 2013 +0000 - - Fix CID 1111806: it's not safe to check if "tag < sizeof(tag_to_type)" before - accessing tag_to_type[tag]: while the array is made of enums and the values of - the enum will fit in a guint8 (making the conditional safe) compilers don't - *have* to "right size" the storage for the enum. They very well could be lazy - and store the enum in int's. - - Replace it with a macro that tells us the size of the array. - - svn path=/trunk/; revision=52842 - -commit 0278474 -Author: Michael Mann -Date: Fri Oct 25 13:37:10 2013 +0000 - - Make sure "mp2t-dsmcc" dissector is registered by name so it can be picked up by etv dissector. - - svn path=/trunk/; revision=52841 - -commit 3e4c954 -Author: Jeff Morriss -Date: Fri Oct 25 13:24:29 2013 +0000 - - Fix checkAPIs: don't add hf_zbee_beacon_protocol with - proto_tree_add_uint(..., ENC_NA); use proto_tree_add_item() as it appears - was intended. - - svn path=/trunk/; revision=52840 - -commit 86b6659 -Author: Jeff Morriss -Date: Fri Oct 25 13:23:17 2013 +0000 - - Fix CID 1111814: segment_item is set but not used (in one conditional). - - Move a URL from in the middle of the copyright notice to up where it (appears - to) belong. - - svn path=/trunk/; revision=52839 - -commit 62b66ac -Author: Chris Maynard -Date: Fri Oct 25 12:51:16 2013 +0000 - - Display the frame number on the packet summary line if it's one of the configured columns. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9317 - - #BACKPORT(1.10,1.8) - - svn path=/trunk/; revision=52838 - -commit cf1f098 -Author: Michael Mann -Date: Fri Oct 25 02:41:47 2013 +0000 - - Improvements for the KDSP dissector. Bug 8891 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8891) - - From Yuri Schaeffer - - svn path=/trunk/; revision=52837 - -commit c09b328 -Author: Michael Mann -Date: Fri Oct 25 02:02:02 2013 +0000 - - Pass ieee802154_packet data into the heuristic check instead of using private_data. - - svn path=/trunk/; revision=52836 - -commit ab0ad4a -Author: Michael Mann -Date: Fri Oct 25 01:54:53 2013 +0000 - - Make TAPA dissector heuristic instead of "ugly hack" now that IP dissector supports heuristics. - IP heuristics pass in IP header to help subdissectors decide what to do. - - svn path=/trunk/; revision=52835 - -commit 0cc2c88 -Author: Jeff Morriss -Date: Fri Oct 25 01:25:23 2013 +0000 - - Fix more SVN properties. - - svn path=/trunk/; revision=52834 - -commit ed7af16 -Author: Jeff Morriss -Date: Fri Oct 25 01:25:00 2013 +0000 - - Handle *.rtf and *.qm files. - - svn path=/trunk/; revision=52833 - -commit 787bca8 -Author: Jeff Morriss -Date: Fri Oct 25 00:56:17 2013 +0000 - - Add SVN properties. - - svn path=/trunk/; revision=52832 - -commit 29a4ebc -Author: Evan Huus -Date: Fri Oct 25 00:08:07 2013 +0000 - - Mark unused parameter, remove moved .h file from Makefile.common - - svn path=/trunk/; revision=52831 - -commit 9563de9 -Author: Michael Mann -Date: Thu Oct 24 23:59:47 2013 +0000 - - AIM doesn't ever use it's private_data structure, so remove it. If it ever does, just pass the data into the subdissectors. - - svn path=/trunk/; revision=52830 - -commit 8a707b0 -Author: Jörg Mayer -Date: Thu Oct 24 23:52:58 2013 +0000 - - Fix properties - - svn path=/trunk/; revision=52829 - -commit 61c7a1b -Author: Jörg Mayer -Date: Thu Oct 24 23:47:30 2013 +0000 - - Make things compile again. - - svn path=/trunk/; revision=52828 - -commit e83fe18 -Author: Michael Mann -Date: Thu Oct 24 23:40:58 2013 +0000 - - Have ZigBee dissectors pass data through subdissector parameter instead of using struct _packet_info. - - svn path=/trunk/; revision=52827 - -commit 6131c00 -Author: Gerald Combs -Date: Thu Oct 24 23:11:09 2013 +0000 - - Add sequence_dialog.ui. - - svn path=/trunk/; revision=52826 - -commit cb3cfd1 -Author: Gerald Combs -Date: Thu Oct 24 23:01:30 2013 +0000 - - Add a missing dependency. - - svn path=/trunk/; revision=52825 - -commit 1a4033b -Author: Gerald Combs -Date: Thu Oct 24 22:52:30 2013 +0000 - - Initial and woefully incomplete flow graph support. - - Copy common code from ui/gtk/flow_graph.c and ui/gtk/graph_analysis.[ch] - to ui/tap-sequence-analysis.[ch]. Start using the name "sequence" in - places. - - svn path=/trunk/; revision=52824 - -commit 39fd5f2 -Author: Pascal Quantin -Date: Thu Oct 24 21:11:00 2013 +0000 - - Fix copy paste errors - - svn path=/trunk/; revision=52823 - -commit bc8006b -Author: Martin Kaiser -Date: Thu Oct 24 20:59:32 2013 +0000 - - fix offset calculation - highlight the correct payload bytes for unknown sub-descriptors - - svn path=/trunk/; revision=52822 - -commit 8601a75 -Author: Jeff Morriss -Date: Thu Oct 24 20:52:00 2013 +0000 - - Finish implementing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7263 : - - Change cflow.sysuptime from an FT_UINT32 (milliseconds since the router booted) - to an FT_RELATIVE_TIME (seconds since the router booted). I don't imagine - anyone will care if we show them seconds or milliseconds and it satisfy the - user's request (in that bug) to compare cflow.sysuptime to cflow.timeend (which - is already an FT_RELATIVE_TIME). - - (If someone does care, we could always display the field twice, once in - milliseconds and once in seconds.) - - svn path=/trunk/; revision=52821 - -commit 1b69a6a -Author: Jörg Mayer -Date: Thu Oct 24 20:35:53 2013 +0000 - - CID 700176: Dereference null return value (NULL_RETURNS) - - Not sure whether this is really possible, but add a dissector_assert - just to be safe. - - svn path=/trunk/; revision=52820 - -commit 5303e14 -Author: Gerald Combs -Date: Thu Oct 24 17:24:07 2013 +0000 - - Confirm the license as well. - - svn path=/trunk/; revision=52819 - -commit f5492ad -Author: Gerald Combs -Date: Thu Oct 24 17:23:13 2013 +0000 - - Enable QtMultimedia. We'll need it for VoIP playback at some point. - - (The current Qt packages in wireshark-win{32,64}-libs still have - QtMultimedia disabled. This will hopefully make sure it's enabled next - time around.) - - svn path=/trunk/; revision=52818 - -commit 86790a6 -Author: Anders Broman -Date: Thu Oct 24 16:50:14 2013 +0000 - - Add a command code. - - svn path=/trunk/; revision=52817 - -commit f1f72f2 -Author: Anders Broman -Date: Thu Oct 24 16:41:04 2013 +0000 - - From Zoltán Lajos Kis: - - dissect echo messages. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=52816 - -commit e4e536b -Author: Michael Mann -Date: Thu Oct 24 15:04:38 2013 +0000 - - Remove need for match_port #define in packet_info.h and just replace existing calls. - - svn path=/trunk/; revision=52815 - -commit eec2feb -Author: Michael Tüxen -Date: Thu Oct 24 14:32:22 2013 +0000 - - Revert previous commit of Irene, which doesn't work (yet). - - svn path=/trunk/; revision=52814 - -commit 207cedd -Author: Evan Huus -Date: Thu Oct 24 12:41:27 2013 +0000 - - From Michal Labedzki via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8818 - - Add correct license headers, $Id$ fields and modelines to the common dwarf - files. - - svn path=/trunk/; revision=52813 - -commit 9188e54 -Author: Irene Rüngeler -Date: Thu Oct 24 09:36:33 2013 +0000 - - Move sctp_stat to ui to make it independent from gtk. - - svn path=/trunk/; revision=52812 - -commit d803c5b -Author: Anders Broman -Date: Thu Oct 24 04:04:14 2013 +0000 - - Pascal:s patch from 52759 is needed here too. - curr-num_layer is not always incremented by 1 when calling the subdissector. - - svn path=/trunk/; revision=52811 - -commit 71cbca0 -Author: Michael Mann -Date: Thu Oct 24 01:26:30 2013 +0000 - - Remove ipxptype from struct _packet_info and pass it into subdissectors through ipxhdr_t structure. - - svn path=/trunk/; revision=52810 - -commit 503e211 -Author: Michael Mann -Date: Thu Oct 24 00:32:52 2013 +0000 - - Minor cleanup. - - svn path=/trunk/; revision=52809 - -commit ffd7d71 -Author: Michael Mann -Date: Thu Oct 24 00:30:14 2013 +0000 - - Make WiMax CDMA Code Attribute its own protocol with it's own filter. - - svn path=/trunk/; revision=52808 - -commit 5ca56e5 -Author: Michael Mann -Date: Thu Oct 24 00:26:57 2013 +0000 - - Create a single array of ett_ variables, instead of individual etts + array of pointers. - - Other minor cleanup. - - svn path=/trunk/; revision=52807 - -commit 4cfd2f9 -Author: Michael Mann -Date: Thu Oct 24 00:17:58 2013 +0000 - - Remove profinet_conv member of struct _packet_info and turn it into proto_data. - - svn path=/trunk/; revision=52806 - -commit a3ba5dc -Author: Martin Kaiser -Date: Wed Oct 23 21:22:14 2013 +0000 - - initialize DSM-CC over TCP and over MPEG2-TS in the same way - - svn path=/trunk/; revision=52805 - -commit 00e8cd9 -Author: Martin Kaiser -Date: Wed Oct 23 21:20:41 2013 +0000 - - support DSM-CC over TCP - - dissect some DSM-CC user-to-network messages related to session - management - - svn path=/trunk/; revision=52804 - -commit 3f0bbe7 -Author: Anders Broman -Date: Wed Oct 23 20:54:17 2013 +0000 - - Fix warnings. - - svn path=/trunk/; revision=52803 - -commit e41d5b9 -Author: Chris Maynard -Date: Wed Oct 23 17:47:47 2013 +0000 - - Provide a usage example of the column formats. - - svn path=/trunk/; revision=52802 - -commit 918df38 -Author: Evan Huus -Date: Wed Oct 23 17:22:54 2013 +0000 - - Add an X11/MIT license to asn2wrs.py as it's compatible with our license, that's - what the original base code was, and Tomas (who made most of the - wireshark-specific changes) has no particular preference. - - svn path=/trunk/; revision=52801 - -commit 4e66e2e -Author: Evan Huus -Date: Wed Oct 23 17:10:25 2013 +0000 - - Fix the last of the 32/64 conversion errors and re-enable ELF dissection. - Actually tested on 32-bit XP vm, so should really work this time. - - svn path=/trunk/; revision=52800 - -commit 8c220a6 -Author: Bill Meier -Date: Wed Oct 23 16:59:34 2013 +0000 - - Fix (using '#if 0') a few more [-Wunused-const-variable] warnings - - svn path=/trunk/; revision=52799 - -commit 79d58dc -Author: Michael Mann -Date: Wed Oct 23 16:47:02 2013 +0000 - - Add Lua cleanup on shutdown, to help with memory leak detection. Bug 5575 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5575) - - From Robert G. Jakabosky - - From me: cleanup so that it applies to trunk. - - svn path=/trunk/; revision=52798 - -commit 25c43f9 -Author: Michael Mann -Date: Wed Oct 23 16:25:26 2013 +0000 - - Make option tag and length filterable and part of a subtree, which simplifies the switch statement handling. - - Add modelines. - - svn path=/trunk/; revision=52797 - -commit 0bf2190 -Author: Jeff Morriss -Date: Wed Oct 23 16:23:54 2013 +0000 - - Remove trailing spaces from hf name values (to satisfy checkAPIs). - - svn path=/trunk/; revision=52796 - -commit 976d1fc -Author: Anders Broman -Date: Wed Oct 23 15:55:06 2013 +0000 - - Add a few command codes. - - svn path=/trunk/; revision=52795 - -commit aa67dd1 -Author: Bill Meier -Date: Wed Oct 23 15:53:31 2013 +0000 - - Fix (using '#if 0') various [-Wunused-const-variable] warnings - - svn path=/trunk/; revision=52794 - -commit 36e13a4 -Author: Michael Mann -Date: Wed Oct 23 15:31:48 2013 +0000 - - Bugfix "Restart the running live capture" when using multiple files makes a long filename. Bug 2274 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2274) - - Yes this solution leaks memory, but I think the handful of bytes leaked is worth fixing this nuisance. Won't backport until leak is fixed though. - - svn path=/trunk/; revision=52793 - -commit be86384 -Author: Jeff Morriss -Date: Wed Oct 23 14:41:30 2013 +0000 - - As suggested by Michael in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4605 : - - Add a tooltip to tell users they can click to see the other IP addresses for - the selected interface. - - svn path=/trunk/; revision=52792 - -commit 5abe9d8 -Author: Michael Mann -Date: Wed Oct 23 14:41:07 2013 +0000 - - The interpretation of Max Power Constraint in VHT TPE is incorrect. Bug 8939 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8939). - - From chaitanya - - svn path=/trunk/; revision=52791 - -commit bb25fad -Author: Michael Mann -Date: Wed Oct 23 14:24:17 2013 +0000 - - Add the ability to collapse subtrees with Shift+Left + additional menu items. Bug 9008 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9008). - - Currently this is only for GTK, but allows users to test it to see if its worth adding to Qt (my personal opinion is yes). - - From Jiří Engelthaler - - svn path=/trunk/; revision=52790 - -commit f4306bb -Author: Anders Broman -Date: Wed Oct 23 14:19:28 2013 +0000 - - From Michal Labedzki: - - Fix offset values - - Still some warnings remaining. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8818 - - svn path=/trunk/; revision=52789 - -commit c76f307 -Author: Anders Broman -Date: Wed Oct 23 14:08:56 2013 +0000 - - From Zoltán Lajos Kis: - - dissect hello messages - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=52788 - -commit b8003ea -Author: Anders Broman -Date: Wed Oct 23 14:04:19 2013 +0000 - - g_slist_free_full() is glib 2.28 - Fix spelling. - - svn path=/trunk/; revision=52787 - -commit e717ca0 -Author: Anders Broman -Date: Wed Oct 23 12:02:15 2013 +0000 - - Make manual address resolution work again by putting the addresses - in a separate list and add that list when address resolution is rebuilt - during rescan of packets. - - svn path=/trunk/; revision=52785 - -commit 760f83f -Author: Balint Reczey -Date: Wed Oct 23 09:53:21 2013 +0000 - - Remove unused wsicon32.xpm - - svn path=/trunk/; revision=52784 - -commit 8713b82 -Author: Anders Broman -Date: Wed Oct 23 08:54:30 2013 +0000 - - epan/dissectors/Makefile.common:218: error: comment following trailing backslash - - svn path=/trunk/; revision=52783 - -commit cf1d4bb -Author: Guy Harris -Date: Wed Oct 23 08:07:28 2013 +0000 - - Pass -sdk, not that it actually *works*. - - svn path=/trunk/; revision=52782 - -commit 8533218 -Author: Anders Broman -Date: Wed Oct 23 08:02:16 2013 +0000 - - Exclude file-elf.c untill the following warningd´s are fixed. - I'm not sure of the correct way of fixing them. - file-elf.c(642) : error C2220: warning treated as error - no 'object' file generated - file-elf.c(642) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(644) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(715) : warning C4244: 'function' : conversion from 'guint64' to 'const guint32', possible loss of data - file-elf.c(729) : warning C4244: 'function' : conversion from 'guint64' to 'const guint32', possible loss of data - file-elf.c(752) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(917) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(967) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1013) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1015) : warning C4244: '+=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1018) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1019) : warning C4244: '+=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1021) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1036) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1069) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1071) : warning C4244: '+=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1074) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1075) : warning C4244: '+=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1253) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1257) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1285) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1381) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1381) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1394) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1411) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(1411) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(1414) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(1414) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(1417) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(1453) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1486) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(1486) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(1489) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(1489) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(1492) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data - file-elf.c(1581) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1581) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1586) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1586) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1592) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1592) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1598) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1601) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1612) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1615) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1626) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1637) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1640) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1641) : warning C4244: '+=' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1680) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1686) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - file-elf.c(1698) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data - - svn path=/trunk/; revision=52781 - -commit 9874da2 -Author: Bill Meier -Date: Wed Oct 23 06:29:11 2013 +0000 - - #if 0 numerous "unused const variables" (mostly value-string-arrays); - Also; fix a few "set but not used" warnings. - - svn path=/trunk/; revision=52780 - -commit dd314cd -Author: Evan Huus -Date: Wed Oct 23 01:56:52 2013 +0000 - - Add explicit 64/32 casts missing from r52775. - - svn path=/trunk/; revision=52779 - -commit 53e771f -Author: Evan Huus -Date: Wed Oct 23 01:47:55 2013 +0000 - - From Jonathon Jongsma via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9143 - - Add correct license header to packet-spice.h - - svn path=/trunk/; revision=52778 - -commit 86b6093 -Author: Guy Harris -Date: Wed Oct 23 01:40:33 2013 +0000 - - Default to GTK+ 3, not Qt, for now. - - svn path=/trunk/; revision=52777 - -commit 9ca4360 -Author: Guy Harris -Date: Wed Oct 23 01:39:54 2013 +0000 - - First cut at having this handle Qt. Adds a TOOLKIT variable that you - set to "qt", "gtk2", or "gtk3". - - Work done on a machine with the command-line build tools, but not Full - Frontal Xcode, installed, so it couldn't build Qt, so it hasn't been - tested. It *has* been fixed to complain in that case, rather than - letting the Qt build fail with a somewhat less useful message talking - about Xcode licensing. - - svn path=/trunk/; revision=52776 - -commit 328a056 -Author: Evan Huus -Date: Wed Oct 23 01:36:49 2013 +0000 - - From Michal Labedzki via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8818 - - Add support for dissection ELF files. It opens as a "capture" file via wiretap - at the moment for simplicity's sake, but the intention is eventually to have - this (and other file types we dissect) open through some other program sharing - much of the libwireshark infrastructure. - - svn path=/trunk/; revision=52775 - -commit cbd3194 -Author: Michael Mann -Date: Tue Oct 22 23:30:26 2013 +0000 - - Add STANAG 5066 DTS CRC routines. Bug 9217 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9217) - - STANAG 5066 DTS will follow when it passes review, just trying to make the patch more manageable. - - svn path=/trunk/; revision=52774 - -commit 02a8e72 -Author: Balint Reczey -Date: Tue Oct 22 22:33:05 2013 +0000 - - Generate wsicon32.xpm during building Debian package - - svn path=/trunk/; revision=52773 - -commit bd0a70c -Author: Balint Reczey -Date: Tue Oct 22 22:32:55 2013 +0000 - - Revert "Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9209 :" - - This reverts commit r52441. - - svn path=/trunk/; revision=52772 - -commit 17679ee -Author: Michael Mann -Date: Tue Oct 22 17:41:06 2013 +0000 - - Cannot define Field refering ProtoField defined in LUA. Bug 3513 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3513) - - When a new Field is created, does as following: - - * Check whether that field is registered, by using `proto_registrar_get_byname`. This is current behavior. - * (patched) If not registered, check whether that field is defined in LUA and will be registered. This is performed in `wslua_is_field_available` accessing LUA context. - * If not, an error "a field with this name must exist" occurs. - - - svn path=/trunk/; revision=52771 - -commit 1363444 -Author: Martin Mathieson -Date: Tue Oct 22 16:52:45 2013 +0000 - - Handle long gaps between PDUs by resetting timers, and show short-cycle-timer as part of state - - svn path=/trunk/; revision=52770 - -commit 4baec51 -Author: Gerald Combs -Date: Tue Oct 22 16:48:04 2013 +0000 - - Add information about building Qt. - - svn path=/trunk/; revision=52769 - -commit 7aee8b2 -Author: Evan Huus -Date: Tue Oct 22 16:29:10 2013 +0000 - - Optimize tvb_ensure_bytes_exist through manual inlining and removal of redundant - checks and computations. Should contain no behavioural changes at *all*, I hope. - - svn path=/trunk/; revision=52768 - -commit a3a15ff -Author: Bill Meier -Date: Tue Oct 22 16:13:32 2013 +0000 - - Remove instances of unused 'data_handle' (and of one other handle). - - svn path=/trunk/; revision=52767 - -commit 5b9ec08 -Author: Evan Huus -Date: Tue Oct 22 16:02:13 2013 +0000 - - Optimization: in test_length there's no need to validate that the count value - for FT_UINT_STRINGs and FT_UINT_BYTEs is still in the TVB. Any infinite loop - that adds a counted field ought to be extracting the length for its own offset - anyways, in which case it will overflow on the next iteration and won't actually - loop forever. - - svn path=/trunk/; revision=52766 - -commit 27d1539 -Author: Martin Mathieson -Date: Tue Oct 22 15:56:14 2013 +0000 - - Show state of other DRX timers, and update some comments. - - svn path=/trunk/; revision=52765 - -commit bcadba5 -Author: Evan Huus -Date: Tue Oct 22 15:49:32 2013 +0000 - - Revert r52730, it is unnecessary with r52695 reverted. - - svn path=/trunk/; revision=52764 - -commit 1684ac9 -Author: Anders Broman -Date: Tue Oct 22 14:54:54 2013 +0000 - - Revert 52695. - - svn path=/trunk/; revision=52763 - -commit ab78bb5 -Author: Michael Mann -Date: Tue Oct 22 14:52:28 2013 +0000 - - Print informations even on short reads. Bug 9310 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9310) - - Before this patch, an error message would be printed when the file - appears to be truncated. After this patch, a warning will be printed, - but the information is still displayed. In both cases, capinfos exits - with status code 1. - - From Peter Wu - - svn path=/trunk/; revision=52762 - -commit a7fbfd7 -Author: Bill Meier -Date: Tue Oct 22 14:27:48 2013 +0000 - - Cleanup: - - remove duplicate/unneeded #includes - - remove some boilerplate comments - - fix up whitespace: indentation, trailing & etc - - remove 'if (tree)' - (Note: 'if (tree)' needs to be around all the code (as in the previous - version of packet-wsmp) or none so that the same value of offset is used - in various function calls whether or not 'tree == NULL'. - For the moment I've chosen to remove the 'if (tree)' since (in theory) - the (external) data dissector shouldn't be called under 'if (tree)'. - - revert SVN #52757 since no it's longer needed with the removal of 'if (tree)'; - - remove another unneeded line of code. - - svn path=/trunk/; revision=52761 - -commit 29b7092 -Author: Michael Mann -Date: Tue Oct 22 14:12:20 2013 +0000 - - dissect error messages. Bug 9283 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283) - - From Zoltán Lajos Kis - - svn path=/trunk/; revision=52760 - -commit d9b9ff6 -Author: Pascal Quantin -Date: Tue Oct 22 13:51:21 2013 +0000 - - curr-num_layer is not always incremented by 1 when calling the subdissector - - svn path=/trunk/; revision=52759 - -commit a93eb10 -Author: Jeff Morriss -Date: Tue Oct 22 13:27:31 2013 +0000 - - set SVN properties. - - svn path=/trunk/; revision=52758 - -commit 3867c85 -Author: Pascal Quantin -Date: Tue Oct 22 11:12:41 2013 +0000 - - From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9244 : - Fix error: 'wsmlength' may be used uninitialized in this function - - svn path=/trunk/; revision=52757 - -commit 6e67565 -Author: Irene Rüngeler -Date: Tue Oct 22 10:36:12 2013 +0000 - - Use the preferred or default linktype as active. - - svn path=/trunk/; revision=52756 - -commit 7592634 -Author: Michael Mann -Date: Tue Oct 22 02:37:49 2013 +0000 - - Latest WSMP protocol support. Bug 9244 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9244) - - Per bug, version 1 is no longer in use as its no longer specified in the standard. - - svn path=/trunk/; revision=52755 - -commit c87641f -Author: Michael Mann -Date: Tue Oct 22 02:29:12 2013 +0000 - - dissection of group_mod messages. Bug 9283 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283) - - From Zoltán Lajos Kis - - svn path=/trunk/; revision=52754 - -commit 7a36032 -Author: Michael Mann -Date: Tue Oct 22 02:08:42 2013 +0000 - - openSAFETY: Fixing rare crash as well as dissector errors. Bug 9314 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9314) - - From Roland Knall - - svn path=/trunk/; revision=52752 - -commit b6df061 -Author: Michael Mann -Date: Tue Oct 22 01:02:00 2013 +0000 - - Pass struct rxinfo "private data" into AFS dissector instead of using pinfo->private_data. - - svn path=/trunk/; revision=52751 - -commit 28b5926 -Author: Michael Mann -Date: Tue Oct 22 00:49:16 2013 +0000 - - Pass usb_data_t "private data" into subdissectors instead of using pinfo->private_data. - - svn path=/trunk/; revision=52750 - -commit 88b157d -Author: Bill Meier -Date: Mon Oct 21 23:57:42 2013 +0000 - - Fix "unused variable 'dct3trace_magic_l2_end' [-Werror,-Wunused-const-variable" found by clang v3.4 - - svn path=/trunk/; revision=52749 - -commit 6eba759 -Author: Jörg Mayer -Date: Mon Oct 21 21:44:31 2013 +0000 - - Properly implement subtree expansion (including automagically - expanding the mint subtrees during development). - - svn path=/trunk/; revision=52748 - -commit 0aac675 -Author: Martin Mathieson -Date: Mon Oct 21 21:20:39 2013 +0000 - - Improve the way DRX before and after state is shown. - - svn path=/trunk/; revision=52747 - -commit 2dd3a65 -Author: Gerald Combs -Date: Mon Oct 21 20:06:14 2013 +0000 - - Code signing updates. - - Sign executables, libraries, frameworks, plugins, and bundles as per the - Code Signing Guide. Check our work with spctl. Use "bundle" to - differentiate what we're doing with the package script. - - svn path=/trunk/; revision=52746 - -commit c8573b9 -Author: Jeff Morriss -Date: Mon Oct 21 19:57:47 2013 +0000 - - Reindent. - - svn path=/trunk/; revision=52745 - -commit 87e55cb -Author: Michael Mann -Date: Mon Oct 21 19:41:54 2013 +0000 - - Sync with latest SAMBA PIDL source per http://www.wireshark.org/lists/wireshark-dev/201310/msg00217.html - - Didn't integrate - 0010-frsrpc-Regenerate-frsrpc-due-to-changes-in-the-pidl-.patch - 0016-Regenerate-the-dnserver.patch - - due to compilation errors on Windows. - - svn path=/trunk/; revision=52744 - -commit 15294a1 -Author: Michael Mann -Date: Mon Oct 21 18:46:52 2013 +0000 - - Add a new api to allow dissection of the array payload as a whole. Bug 9307 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9307) - - From Matthieu Patou - - svn path=/trunk/; revision=52743 - -commit 772fb97 -Author: Michael Mann -Date: Mon Oct 21 18:33:14 2013 +0000 - - We can't really have conformant strings they are always conformant and - varying but pidl insists on having a different function. Bug 9306 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9306) - - From Matthieu Patou. - - svn path=/trunk/; revision=52742 - -commit ac7caf7 -Author: Michael Mann -Date: Mon Oct 21 18:25:41 2013 +0000 - - Add APIs for PIDL generated code to return the value of the integer that was dissected. Bug 9305 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9305). - - From Matthieu Patou - - svn path=/trunk/; revision=52741 - -commit cc0bba9 -Author: Pascal Quantin -Date: Mon Oct 21 18:03:37 2013 +0000 - - Tentative fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9287 : - Initialize ofn->lCustData variable - - svn path=/trunk/; revision=52740 - -commit 33dd47e -Author: Jeff Morriss -Date: Mon Oct 21 17:59:51 2013 +0000 - - Add packet-spice.h - - svn path=/trunk/; revision=52739 - -commit 3616fa1 -Author: Chris Maynard -Date: Mon Oct 21 17:31:22 2013 +0000 - - Remove if (fh_tree) checks as add_ethernet_trailer() calls such functions as dissector_try_heuristic(), expert_add_info(), and col_append_str(), which all need to be called whether fh_tree is NULL or not. - - #BACKPORT(1.10,1.8) - - svn path=/trunk/; revision=52738 - -commit 2dafe09 -Author: Michael Mann -Date: Mon Oct 21 16:48:07 2013 +0000 - - Update spice protocol dissector. Bug 9143 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9143) - - From Jonathon Jongsma - - Note that the new packet-spice.h is auto-generated outside of Wireshark. - - svn path=/trunk/; revision=52737 - -commit a8d1874 -Author: Michael Mann -Date: Mon Oct 21 16:00:37 2013 +0000 - - dce-rpc: properly dissect multiple PDU in the same packet. Bug 9302 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9302). - - From Matthieu Patou - - svn path=/trunk/; revision=52736 - -commit 651b858 -Author: Michael Mann -Date: Mon Oct 21 15:58:52 2013 +0000 - - Fix compile errors introduced in r52734. - - svn path=/trunk/; revision=52735 - -commit 598726b -Author: Michael Mann -Date: Mon Oct 21 15:50:23 2013 +0000 - - Datablob size is NDR64/32 dependant. Bug 9301 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9301). - - From Matthieu Patou - - svn path=/trunk/; revision=52734 - -commit 8ee3d11 -Author: Michael Mann -Date: Mon Oct 21 15:46:13 2013 +0000 - - Fix padding bytes overlapping due to NDR alignment. Bug 9300 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9300) - - From Matthieu Patou - - svn path=/trunk/; revision=52733 - -commit f69a489 -Author: Michael Mann -Date: Mon Oct 21 15:39:07 2013 +0000 - - NULL check ref_nt_challenge_response and ref_lm_challenge_response. Bug 9299 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9299) - - From Matthieu Patou - - svn path=/trunk/; revision=52732 - -commit 14fd3d0 -Author: Pascal Quantin -Date: Mon Oct 21 15:16:41 2013 +0000 - - ZeroMemory -> SecureZeroMemory - - svn path=/trunk/; revision=52731 - -commit 23191ea -Author: Evan Huus -Date: Mon Oct 21 13:07:19 2013 +0000 - - Don't go into a loop if we find a zero-length line. Fixes - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9312 - - Anders, this may be related to your recent TVB optimizations, since I don't - think it happened before that? Did you change the behaviour of tvb_find_line_end - or its callees at all? - - svn path=/trunk/; revision=52730 - -commit be62b39 -Author: Michael Mann -Date: Mon Oct 21 03:13:47 2013 +0000 - - Pass fc_hdr "private data" into subdissectors instead of using pinfo->private_data. - - svn path=/trunk/; revision=52729 - -commit 77837d2 -Author: Michael Mann -Date: Mon Oct 21 00:27:36 2013 +0000 - - Pass struct aspinfo "private data" into subdissectors instead of using pinfo->private_data. - - svn path=/trunk/; revision=52728 - -commit 87c65ff -Author: Evan Huus -Date: Sun Oct 20 23:38:37 2013 +0000 - - Use SecureZeroMemory instead of plain ZeroMemory because checkAPI says to. - - svn path=/trunk/; revision=52727 - -commit 63eac3f -Author: Evan Huus -Date: Sun Oct 20 23:35:48 2013 +0000 - - Fix -Wshadow error - - svn path=/trunk/; revision=52726 - -commit 98dec2f -Author: Anders Broman -Date: Sun Oct 20 21:12:32 2013 +0000 - - Adds dissecting for actions, and proper display for OXM values. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=52725 - -commit b552143 -Author: Pascal Quantin -Date: Sun Oct 20 21:05:37 2013 +0000 - - Put PDU dissection in protocol tree - - svn path=/trunk/; revision=52724 - -commit 24ba431 -Author: Michael Mann -Date: Sun Oct 20 20:35:24 2013 +0000 - - Pass ROHC "private data" from PDCP-LTE using dissector data parameter instead of using pinfo->private_data. - - Passing data through the dissector parameter eliminates the need for ROHC dissector to save/restore private_data. - - svn path=/trunk/; revision=52723 - -commit 1f110ac -Author: Jakub Zawadzki -Date: Sun Oct 20 19:05:00 2013 +0000 - - 2nd try to fix recent test failures. - - After recent changes it's possible that epan_dissect_cleanup() can be called if there were - no dissection run on it (epan_dissect_run()) In such case ->tvb will have random value, - just initialize it to NULL in _init() and see if it's working. - - Thanks goes to Evan for backtrace. - - svn path=/trunk/; revision=52722 - -commit 7f3d07b -Author: Pascal Quantin -Date: Sun Oct 20 18:43:00 2013 +0000 - - From e.yimjia via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9289 : - Add dissection of OMA-ILP - - svn path=/trunk/; revision=52721 - -commit f06d7ca -Author: Pascal Quantin -Date: Sun Oct 20 18:26:08 2013 +0000 - - Regenerate H.225 dissector - - svn path=/trunk/; revision=52720 - -commit d269d19 -Author: Pascal Quantin -Date: Sun Oct 20 18:06:23 2013 +0000 - - Fix a typo - - svn path=/trunk/; revision=52719 - -commit df6594b -Author: Michael Mann -Date: Sun Oct 20 18:00:05 2013 +0000 - - Pass MPLS "private data" into subdissectors instead of using pinfo->private_data. - - svn path=/trunk/; revision=52718 - -commit a9d79eb -Author: Jakub Zawadzki -Date: Sun Oct 20 17:53:55 2013 +0000 - - Try to fix recent test failures (wild guess, can't reproduce). - - svn path=/trunk/; revision=52717 - -commit cf9bbde -Author: Pascal Quantin -Date: Sun Oct 20 17:35:30 2013 +0000 - - From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9297 : - Add support for MSVC2013 - - svn path=/trunk/; revision=52716 - -commit 33e376d -Author: Pascal Quantin -Date: Sun Oct 20 16:57:38 2013 +0000 - - From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9267 : - Fix compilation of packet-mq.c - - svn path=/trunk/; revision=52715 - -commit e78f917 -Author: Gerald Combs -Date: Sun Oct 20 14:03:43 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-10-20] - - svn path=/trunk/; revision=52712 - -commit 52e1697 -Author: Jakub Zawadzki -Date: Sun Oct 20 13:22:48 2013 +0000 - - wireshark: use epan_dissect_reset(), rawshark: fix missing epan_dissect_cleanup() - - svn path=/trunk/; revision=52711 - -commit 65a538f -Author: Pascal Quantin -Date: Sun Oct 20 12:53:04 2013 +0000 - - Add more new protocols to release notes - - svn path=/trunk/; revision=52710 - -commit fe937ac -Author: Jakub Zawadzki -Date: Sun Oct 20 12:35:55 2013 +0000 - - tshark: use epan_dissect_reset() - - svn path=/trunk/; revision=52709 - -commit 215902b -Author: Jakub Zawadzki -Date: Sun Oct 20 12:34:42 2013 +0000 - - rawshark: use epan_dissect_reset() - - svn path=/trunk/; revision=52708 - -commit 94c3d21 -Author: Michael Mann -Date: Sun Oct 20 12:11:55 2013 +0000 - - Enhancement of the packet-mq dissector (WMQ 7.1-7.5). Bug 9267 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9267) - - From robionekenobi - - From me: Pass data through dissectors instead of using pinfo->private_data - - svn path=/trunk/; revision=52707 - -commit bad81b5 -Author: Jakub Zawadzki -Date: Sun Oct 20 10:21:25 2013 +0000 - - Reintroduce back epan_dissect_reset(), proto_tree_reset() - - This time it makes more sense, cause for each dissection we need two wmem allocators. - Reseting wmem allocator is much faster than destroy & create. - - svn path=/trunk/; revision=52706 - -commit 107e4a6 -Author: Jakub Zawadzki -Date: Sun Oct 20 10:11:16 2013 +0000 - - Move resetting packet_info structure from dissect_packet() to epan_dissect_init() - - It'd be actually good idea to seperate packet_info data (packet.c) from epan_dissect_t (epan.c), - but this rule is already violated. - - Strict seperation could allow for example allow multiple dissection on the same epan_dissect_t - (I think it was idea behind it), but it's not working. - - svn path=/trunk/; revision=52705 - -commit 336befd -Author: Jakub Zawadzki -Date: Sun Oct 20 10:03:32 2013 +0000 - - Remove allocation stem from PROTO_NODE_NEW() macro. - - Tree root-node will be allocated using g_slice() - - svn path=/trunk/; revision=52704 - -commit 7cc5d87 -Author: Evan Huus -Date: Sun Oct 20 02:38:51 2013 +0000 - - Remove non-ASCII characters causing checkAPI failures - - svn path=/trunk/; revision=52703 - -commit f5442e2 -Author: Evan Huus -Date: Sun Oct 20 02:24:34 2013 +0000 - - Fix format error. - - svn path=/trunk/; revision=52702 - -commit b054d20 -Author: Evan Huus -Date: Sun Oct 20 02:18:19 2013 +0000 - - Don't use g_assert_cmpint, it isn't happy on Windows. g_assert is nearly as good - except it doesn't produce as nice error messages. - - svn path=/trunk/; revision=52701 - -commit 7969855 -Author: Michael Mann -Date: Sun Oct 20 02:17:42 2013 +0000 - - Convert the proto_tree_add_text calls that should have been expert info. - - svn path=/trunk/; revision=52700 - -commit badde83 -Author: Evan Huus -Date: Sun Oct 20 02:10:39 2013 +0000 - - Take a blind stab at adding oids_test to nmake - - svn path=/trunk/; revision=52699 - -commit 522b4ce -Author: Michael Mann -Date: Sat Oct 19 23:06:13 2013 +0000 - - Pass SPX "private data" into subdissectors instead of using pinfo->private_data. - - svn path=/trunk/; revision=52698 - -commit e958d8c -Author: Anders Broman -Date: Sat Oct 19 20:25:55 2013 +0000 - - From beroset@mindspring.com: - remove unnecessary and unused oid_resolv_cleanup() - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9295 - - svn path=/trunk/; revision=52697 - -commit 3c813bb -Author: Anders Broman -Date: Sat Oct 19 20:19:35 2013 +0000 - - From Zoltán Lajos Kis: - dissect flow_mod body in openflow_v4 - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283 - - svn path=/trunk/; revision=52696 - -commit 09e32f5 -Author: Anders Broman -Date: Sat Oct 19 20:16:00 2013 +0000 - - Minor optimizations. - - svn path=/trunk/; revision=52695 - -commit 1f35491 -Author: Evan Huus -Date: Sat Oct 19 19:40:02 2013 +0000 - - Don't link explicitly with libwmem, it's already in libwireshark and the symbol - doubling leads to all sorts of very subtle badness (including test failures due - to funny internal assertions because the two wmems have mismatching state). - - Make wmem_init and wmem_cleanup PUBLIC instead of LOCAL so that they don't get - stripped and don't cause a link failure when trying to build oids_test (now that - it's not linking with libwmem explicitly). There is possibly a better way to fix - this, but I'm not sure what it is. - - svn path=/trunk/; revision=52694 - -commit 3635bea -Author: Michael Mann -Date: Sat Oct 19 18:52:13 2013 +0000 - - Add OID unit tests. Bug 9294 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9294) - - From Ed Beroset - - svn path=/trunk/; revision=52692 - -commit b752cfa -Author: Michael Mann -Date: Sat Oct 19 16:50:52 2013 +0000 - - Correct source code formatting. Bug 9146 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9146) - - From Roland Knall - - svn path=/trunk/; revision=52691 - -commit 030b8c5 -Author: Pascal Quantin -Date: Sat Oct 19 16:13:40 2013 +0000 - - Update comments - - svn path=/trunk/; revision=52690 - -commit 2ec414c -Author: Balint Reczey -Date: Sat Oct 19 15:51:36 2013 +0000 - - Minor refactoring in CMake ABI dump generation - - svn path=/trunk/; revision=52689 - -commit 70dce86 -Author: Balint Reczey -Date: Sat Oct 19 14:55:12 2013 +0000 - - Set and use TMPDIR for ABI dump generation when using CMake - - svn path=/trunk/; revision=52688 - -commit f6e6660 -Author: Pascal Quantin -Date: Sat Oct 19 14:10:05 2013 +0000 - - Update E.212 list to Operational Bulletin No. 1038 (15.X.2013) - - svn path=/trunk/; revision=52687 - -commit d9a0c65 -Author: Pascal Quantin -Date: Sat Oct 19 14:09:14 2013 +0000 - - Update ITU E.164 list to Operational Bulletin No. 1038 (15.X.2013) - - svn path=/trunk/; revision=52686 - -commit 64018e9 -Author: Jörg Mayer -Date: Sat Oct 19 10:04:39 2013 +0000 - - Convert to new hf handling - - svn path=/trunk/; revision=52685 - -commit 141673b -Author: Jörg Mayer -Date: Sat Oct 19 09:04:10 2013 +0000 - - Some more decoding of mint traffic, start reformatting (incomplete) - - svn path=/trunk/; revision=52684 - -commit 1554929 -Author: Michael Mann -Date: Sat Oct 19 02:45:01 2013 +0000 - - Only allow one popup dialog in UAT dialog. Editing/copying/deleting can modify the uat list and other open dialogs will not be aware of it and lead to unexpected behavior (including crashes). Fixes bug 9129 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9129) - - #BACKPORT(1.10) - - svn path=/trunk/; revision=52683 - -commit 54413b1 -Author: Michael Tüxen -Date: Fri Oct 18 22:39:31 2013 +0000 - - Fix writing enhanced packet blocks when flags are - provided: Don't write the end od options parameter - twice. - - svn path=/trunk/; revision=52682 - -commit 7ab98fb -Author: Jeff Morriss -Date: Fri Oct 18 21:47:05 2013 +0000 - - Get it actually building when we don't HAVE_LIBPCAP. - - It would seem moc doesn't know about or pay attention to #ifdefs so take them - out of wireshark_application.h . - - svn path=/trunk/; revision=52681 - -commit 3b1463d -Author: Jeff Morriss -Date: Fri Oct 18 21:32:59 2013 +0000 - - Clean up warnings when we don't HAVE_LIBPCAP. - - svn path=/trunk/; revision=52680 - -commit 2657071 -Author: Michael Mann -Date: Fri Oct 18 21:17:01 2013 +0000 - - Don't allow invalid ranges to be specified for the stats tree. Bug 9130 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9130) - - Not sure which memory allocation should be used here (using wmem caused crash), but this revision can at least be easily backported to 1.10 where the bug was reported. - - Also allow a single number to be used in the stats range since it's considered a valid "range" by the UAT. - - svn path=/trunk/; revision=52679 - -commit d3a09e0 -Author: Jakub Zawadzki -Date: Fri Oct 18 21:11:11 2013 +0000 - - - Remove hf_ integers from few more dissectors - - udp: remove proto_udp. - - svn path=/trunk/; revision=52678 - -commit f86132a -Author: Guy Harris -Date: Fri Oct 18 20:28:11 2013 +0000 - - White space cleanups (thanks either to shekhar.chandra@citrix.com or - Bill Meier; see bug 9280). - - svn path=/trunk/; revision=52677 - -commit d69a93f -Author: Jeff Morriss -Date: Fri Oct 18 18:28:57 2013 +0000 - - Simplify a bit (in a way which will hopefully actually work): just don't add -Wshorten-64-to-32 to CXXFLAGS. Also, add AM_CLEAN_FLAGS to AM_CXXFLAGS, not AM_CPPFLAGS. - - svn path=/trunk/; revision=52676 - -commit 2322bd3 -Author: Evan Huus -Date: Fri Oct 18 18:10:46 2013 +0000 - - Fix lemon FSF address and add license exception for the generated mate grammar - files. One of them has no license (it is just defines) and the other gets picked - up as LGPL for no reason I can discern. - - svn path=/trunk/; revision=52675 - -commit 2ac63d7 -Author: Jeff Morriss -Date: Fri Oct 18 17:42:32 2013 +0000 - - Add -Wno-shorten-64-to-32 (if we can) when compiling the Qt UI. - - svn path=/trunk/; revision=52674 - -commit db68b80 -Author: Jeff Morriss -Date: Fri Oct 18 16:56:27 2013 +0000 - - Add AM_CLEAN_CFLAGS (-Werror) to AM_CPPFLAGS so we get notified of warnings in - the C++ stuff. - - ui/qt/CMakeLists.txt adds -Wno-shorten-64-to-32 on 64-bit systems but it - doesn't seem necessary on Fedora 18 (64-bit). Leaving it out for now--let's - see what others say... - - svn path=/trunk/; revision=52673 - -commit be9eede -Author: Gerald Combs -Date: Fri Oct 18 16:32:43 2013 +0000 - - Make sure LIBGCRYPT_CFLAGS is added to AM_CPPFLAGS. - - svn path=/trunk/; revision=52672 - -commit 19f63eb -Author: Bill Meier -Date: Fri Oct 18 15:08:19 2013 +0000 - - Revert SVN #52650 as per discussion on wireshark-dev - - svn path=/trunk/; revision=52671 - -commit 4578df7 -Author: Michael Mann -Date: Fri Oct 18 14:41:01 2013 +0000 - - Use Z_tree for the subtree - - svn path=/trunk/; revision=52670 - -commit 1318ec2 -Author: Jörg Mayer -Date: Fri Oct 18 13:09:22 2013 +0000 - - Beginnings of Motrola's MiNT protocol. - Most important missing item: Fill in the test functions - to avoid using all packets to the (fixed) ports. - - svn path=/trunk/; revision=52669 - -commit 1b0fa2e -Author: Jörg Mayer -Date: Fri Oct 18 13:06:33 2013 +0000 - - Forgot in the previous checkin. - - svn path=/trunk/; revision=52668 - -commit 662c770 -Author: Jörg Mayer -Date: Fri Oct 18 13:06:05 2013 +0000 - - After looking for something in the column-*.h files and - not finding it, I finally found it in column_info.h - Renamed column_info.h to column-info.h to have consistency - with the column*h files. - - svn path=/trunk/; revision=52667 - -commit 2197f29 -Author: Bill Meier -Date: Fri Oct 18 04:31:08 2013 +0000 - - Revert SVN #52665. - - Compilation fails on (only the ?) OSX-10.6-x64 buildbot with error: - - netscaler.c: In function 'nstrace_read_v30': - netscaler.c:1295: warning: implicit conversion shortens 64-bit value into a 32-bit value - - (Life is too short for me to dig multiple levels deep into a set of macros to try to see which - actual line of code is causing the problem. Maybe the patch submitter can identify the problem). - - - svn path=/trunk/; revision=52666 - -commit c50b988 -Author: Bill Meier -Date: Fri Oct 18 03:36:04 2013 +0000 - - From Shekhar Chandra: support for version 3.0 of netscaler packet wire format. - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280 - - From me: fix indentation(tabs->spaces) and trailing whitespace. - - - svn path=/trunk/; revision=52665 - -commit 42c52d8 -Author: Michael Mann -Date: Fri Oct 18 01:53:32 2013 +0000 - - Add more filterable fields around EDNS(0) - - svn path=/trunk/; revision=52664 - -commit 98f3bb5 -Author: Gerald Combs -Date: Thu Oct 17 22:34:38 2013 +0000 - - Sign all of the executables. - - svn path=/trunk/; revision=52663 - -commit e746a62 -Author: Michael Mann -Date: Thu Oct 17 20:54:42 2013 +0000 - - Bugfix an apparent typo in edns0 "Higher bits in extended RCODE". Bug 9199 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9199). - - #BACKPORT(1.10) - - svn path=/trunk/; revision=52662 - -commit e7202d1 -Author: Gerald Combs -Date: Thu Oct 17 17:50:00 2013 +0000 - - If static analysis is enabled disable error checking when compiling the - Qt code. This should hopefully work around a builder issue. - - svn path=/trunk/; revision=52661 - -commit cbe8af0 -Author: Evan Huus -Date: Thu Oct 17 12:24:25 2013 +0000 - - Revert the optimization in r52578. As Jakub predicted, it caused at least one - infinite loop to pop up. We're just going to have to eat the performance hit. - (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9282) - - svn path=/trunk/; revision=52660 - -commit 744f471 -Author: Tomas Kukosa -Date: Thu Oct 17 11:24:43 2013 +0000 - - H.225.0: fix handling of compound parameters in Generic Extensible Framework (H.460.22 did not work well) - - svn path=/trunk/; revision=52659 - -commit 934bfff -Author: Evan Huus -Date: Thu Oct 17 02:43:21 2013 +0000 - - Temporarily revert r52651 it caused a regression when trying to tvb_memcpy from - a negative offset (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9277) - - svn path=/trunk/; revision=52658 - -commit 747f140 -Author: Michael Mann -Date: Thu Oct 17 02:13:23 2013 +0000 - - Properly decode CAPWAP Data Keep-Alive's. Bug 9165 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165) - - From Andreas Schultz - - From me: Use expert API instead of throwing exception for a bad length. - - svn path=/trunk/; revision=52657 - -commit 9e494db -Author: Michael Mann -Date: Thu Oct 17 01:23:12 2013 +0000 - - Be able to search through HTTP request and HTTP response lines. Bug 9134 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9134) - - From Edwin Groothuis - - svn path=/trunk/; revision=52656 - -commit 5344c7f -Author: Evan Huus -Date: Wed Oct 16 22:52:40 2013 +0000 - - If the length we allocated was 0, don't try and write to the returned pointer. - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9276 - - svn path=/trunk/; revision=52655 - -commit f6884b5 -Author: Gerald Combs -Date: Wed Oct 16 22:39:44 2013 +0000 - - Add checks to see if CC and/or CXX are Clang. Add "-Qunused-arguments" - to CFLAGS and/or CXXFLAGS as needed. - - svn path=/trunk/; revision=52654 - -commit 80b5c92 -Author: Bill Meier -Date: Wed Oct 16 20:35:08 2013 +0000 - - Remove trailing blanks; Fix some indentation; - Add editor modelines. - - svn path=/trunk/; revision=52653 - -commit 94ba4e9 -Author: Bill Meier -Date: Wed Oct 16 20:32:57 2013 +0000 - - Fix inconsistent indentation & formatting, trailing blanks. - Add some parens. - Add editor modelines. - - svn path=/trunk/; revision=52652 - -commit 4223c93 -Author: Anders Broman -Date: Wed Oct 16 20:05:59 2013 +0000 - - Create an internal _tvb_memcpy() without the sanity checks to be caled from tvb internal routines with sanity checks to avoid duplicated checks. - - svn path=/trunk/; revision=52651 - -commit 26ad68d -Author: Anders Broman -Date: Wed Oct 16 20:02:14 2013 +0000 - - Prepend to lists rather than append as that's more efficient. - - svn path=/trunk/; revision=52650 - -commit fe55299 -Author: Gerald Combs -Date: Wed Oct 16 18:40:13 2013 +0000 - - Don't bother checking for clang, just add -Qunused-arguments to the - compiler flags checks. - - svn path=/trunk/; revision=52649 - -commit 09066e4 -Author: Evan Huus -Date: Wed Oct 16 18:08:24 2013 +0000 - - In packet-wsp.c, don't use the get_long_integer macro where we only need the - very smallest part of its logic. Just call tvb_get_guint8 directly and check - that the return is between 1 and 4. Properly fixes the set-but-unused and - associated warnings that were showing up. - - svn path=/trunk/; revision=52648 - -commit 7c2219f -Author: Pascal Quantin -Date: Wed Oct 16 17:32:45 2013 +0000 - - 1.11.0 -> 1.11.1 - - svn path=/trunk/; revision=52647 - -commit 5fba0c2 -Author: Gerald Combs -Date: Wed Oct 16 17:22:58 2013 +0000 - - If we're using Clang add -Qunused-arguments in order to avoid a bunch - of warnings described at - http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html - - svn path=/trunk/; revision=52646 - -commit 1701f42 -Author: Gerald Combs -Date: Wed Oct 16 17:19:59 2013 +0000 - - Fix warnings found by Clang 5.0 (-Wself-assign and -Wparentheses-equality). - - Move code from ipv6-utils.h to packet-ipv6.c since that was the only - place it was used. Comment out unused code. - - svn path=/trunk/; revision=52645 - -commit 4515b2b -Author: Gerald Combs -Date: Wed Oct 16 17:05:29 2013 +0000 - - Fix a comment. - - svn path=/trunk/; revision=52644 - -commit 2aa86c5 -Author: Gerald Combs -Date: Wed Oct 16 16:44:56 2013 +0000 - - Back out the previous commit. We'll have to find a different fix. - - svn path=/trunk/; revision=52643 - -commit cdebec1 -Author: Gerald Combs -Date: Wed Oct 16 16:41:28 2013 +0000 - - Work around a self-assingment error picked up by Clang 5.0. - - svn path=/trunk/; revision=52642 - -commit 9b40d29 -Author: Bill Meier -Date: Wed Oct 16 14:17:05 2013 +0000 - - Fix (what appears to be) a minor bug when dissecting RTMP. - - svn path=/trunk/; revision=52641 - -commit 9382064 -Author: Pascal Quantin -Date: Wed Oct 16 03:06:46 2013 +0000 - - Upgrade RRLP dissector to V11.0.0 - - svn path=/trunk/; revision=52640 - -commit 55f3af2 -Author: Bill Meier -Date: Wed Oct 16 02:39:09 2013 +0000 - - Fix various: whitespace, comments & etc. - Add editor modelines. - - svn path=/trunk/; revision=52639 - -commit 9ae071f -Author: Bill Meier -Date: Wed Oct 16 02:34:03 2013 +0000 - - Add blank line before 'and by' - - svn path=/trunk/; revision=52638 - -commit d61a6dd -Author: Chris Maynard -Date: Wed Oct 16 01:10:04 2013 +0000 - - Add Ed Beroset to the list of Wireshark authors. - - svn path=/trunk/; revision=52637 - -commit f6e09fa -Author: Bill Meier -Date: Wed Oct 16 00:57:28 2013 +0000 - - From Ed Beroset: add modelines and fix irregular indenting; - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9273 - - This patch adds modelines and cleans up the irregular indentation of - this dissector's code. The only other change was in - asn1/c1222/packet-c1222-template.c to consolidate an #ifdef that had a - redundant #endif (line 812) and subsequent reopening #ifdef (line - 824). The only thing between them was comments, so the span of the - original #ifdef (line 644) was simply extended by eliminating those - two lines. - - The purpose for this patch is to make the file easier to edit and - understand in advance of more substantive patches later. This patch - is intended to be easy to review by having only non-substantive - changes. - - - svn path=/trunk/; revision=52636 - -commit 78d3fe6 -Author: Pascal Quantin -Date: Wed Oct 16 00:35:02 2013 +0000 - - Update the list of new protocols supported - - svn path=/trunk/; revision=52635 - -commit 7b3dfaa -Author: Evan Huus -Date: Tue Oct 15 23:16:35 2013 +0000 - - As suggested separately by both Jakub and Anders: only read the - WIRESHARK_DEBUG_WMEM_OVERRIDE environment variable once in wmem_init, not every - time wmem_allocator_new is called. We currently create a new pinfo pool for - every packet we dissect, so this is a small performance win, especially when - getenv is slow (which may happen if a large number of environment variables are - set, such as when fuzz-testing). - - svn path=/trunk/; revision=52634 - -commit c4dcd0c -Author: Gerald Combs -Date: Tue Oct 15 23:03:48 2013 +0000 - - If CODE_SIGN_IDENTITY is set use it to sign the app bundle and the - installer package. Add commented-out code to sign the .dmg as well in - case Apple supports that in the future. - - svn path=/trunk/; revision=52633 - -commit fb9d429 -Author: Gerald Combs -Date: Tue Oct 15 21:31:32 2013 +0000 - - Adjust parenthesis to make gcc happy. - - svn path=/trunk/; revision=52632 - -commit 6731cba -Author: Anders Broman -Date: Tue Oct 15 21:28:04 2013 +0000 - - Don't try heuristic dissectors on second pass if no match was found in the first one. - - svn path=/trunk/; revision=52631 - -commit 49343d6 -Author: Balint Reczey -Date: Tue Oct 15 20:14:47 2013 +0000 - - Fix ABI check error for libwireshark - - svn path=/trunk/; revision=52630 - -commit 6fcea10 -Author: Gerald Combs -Date: Tue Oct 15 19:21:04 2013 +0000 - - 1.11.0 → 1.11.1. - - svn path=/trunk/; revision=52629 - -commit b4f3f2f -Author: Gerald Combs -Date: Tue Oct 15 18:40:00 2013 +0000 - - Try building 1.11.0. - - svn path=/trunk/; revision=52628 - -commit 63e4539 -Author: Chris Maynard -Date: Tue Oct 15 18:27:35 2013 +0000 - - From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9272 - - Add tshark -G column-formats report and document the missing ftypes, heuristic-decodes and plugins reports. - - From me: Sort the reports. Add modelines to epan/column.c. Minor whitespace changes. - - svn path=/trunk/; revision=52627 - -commit b0080ae -Author: Anders Broman -Date: Tue Oct 15 18:21:03 2013 +0000 - - g_slist_prepend() should be faster than g_slist_append() use it where the order shouldn't matter. - - svn path=/trunk/; revision=52626 - -commit 6bb579e -Author: Jakub Zawadzki -Date: Tue Oct 15 18:20:59 2013 +0000 - - Micro-optimize print_columns(): replace g_snprintf() & g_strlcat() with memcpy(). - - svn path=/trunk/; revision=52625 - -commit 9c3be9d -Author: Anders Broman -Date: Tue Oct 15 18:19:57 2013 +0000 - - Try to optimize heuristics slightly. - - svn path=/trunk/; revision=52624 - -commit 4ae53bc -Author: Cal Turney -Date: Tue Oct 15 16:41:29 2013 +0000 - - Reorder all of the bitmask trees according to its endianess from highest to lowest order bit. - These consist of the following bitmask fields: - [packet-smb.c] 'Create Flags', 'Access Mask', 'File Attributes', 'Share Access', 'Create Options', - 'Security Flags', 'Optional Support'(in TreeConnect AndX responses), and "Quota Flags" - [packet-smb2.c] 'Flags', 'Session Flags', 'Security mode', and 'Interface Capabilities'. - - [packet-smb.c] Made the tfs_file_attribute_xxx true_false_string values less verbose and more compact. - - [packet-smb2.c] Changed all references to "RMDA" to RDMA". - - [packet_smb.c] In dissect_qfi_SMB_FILE_NETWORK_OPEN_INFO() (GetInfo response) changed "Unknown Field" - to "Reserved" (See capture 'DMtrace2.cap' frame 20023). - - svn path=/trunk/; revision=52623 - -commit 821e1a7 -Author: Gerald Combs -Date: Tue Oct 15 16:40:19 2013 +0000 - - Add another cast. - - svn path=/trunk/; revision=52622 - -commit c70baa2 -Author: Gerald Combs -Date: Tue Oct 15 16:29:38 2013 +0000 - - Add casts to fix some shortening errors. - - svn path=/trunk/; revision=52621 - -commit 720de30 -Author: Gerald Combs -Date: Tue Oct 15 15:22:03 2013 +0000 - - Add some missing parenthesis. Make sure we set our font in the right place. - - Make the ColorUtils::fromColorT() convenience function a little more - convenient. Use it. - - svn path=/trunk/; revision=52620 - -commit 156659e -Author: Martin Kaiser -Date: Tue Oct 15 15:15:59 2013 +0000 - - limit the values written to phdr.(cap)len to guint32, not to guint16 - - We read a two-byte length field and add a constant number of header - bytes to this length, so we could in theory be larger than guint16. - - svn path=/trunk/; revision=52619 - -commit ef33b36 -Author: Martin Kaiser -Date: Tue Oct 15 15:11:40 2013 +0000 - - code review of parse_s1_W_stats() - - range check for array index - don't assign the result of pntohs() to a gint16 - range check for the values stored in phdr.(cap)len - - svn path=/trunk/; revision=52618 - -commit 7d66e38 -Author: Evan Huus -Date: Tue Oct 15 13:15:38 2013 +0000 - - Don't do canaries in blocks of guint32, it appears to cause alignment issues - when running tests on Solaris. Revert back to byte-at-a-time, but do fewer bytes - to avoid a performance hit. - - svn path=/trunk/; revision=52617 - -commit 586dea0 -Author: Evan Huus -Date: Tue Oct 15 13:05:31 2013 +0000 - - Check the length *before* accessing the array, and cap the - length-retrieved-from-packet at the size of the array we have. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9270 - - svn path=/trunk/; revision=52616 - -commit a6d8e18 -Author: Evan Huus -Date: Tue Oct 15 12:34:45 2013 +0000 - - Fix a length check in the OID code, we add an extra byte if is_first, not the - other way around. Also add an assert so it blows up if we get it wrong, rather - than leading to uninitialized memory. - - Fixes the last errors I can find in - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9268 - - svn path=/trunk/; revision=52615 - -commit 8956ee2 -Author: Balint Reczey -Date: Tue Oct 15 07:30:05 2013 +0000 - - Factor out common parts of ABI checks to UseABICheck.cmake - - svn path=/trunk/; revision=52614 - -commit 66de013 -Author: Chris Maynard -Date: Tue Oct 15 03:38:09 2013 +0000 - - Fix Coverity CID 1106801: Missing break in switch. - - svn path=/trunk/; revision=52613 - -commit bc3cd56 -Author: Gerald Combs -Date: Tue Oct 15 01:10:52 2013 +0000 - - Make sure we have a valid capture file pointer in win32_export_file(). - Fixes bug 9271. - - svn path=/trunk/; revision=52612 - -commit 2b0c8b1 -Author: Gerald Combs -Date: Tue Oct 15 00:48:34 2013 +0000 - - Fill in the help links. Make sure they do something when they're clicked. - - Try to make the task list width match its contents. - - svn path=/trunk/; revision=52611 - -commit 4520cc0 -Author: Gerald Combs -Date: Tue Oct 15 00:17:23 2013 +0000 - - Remove some commented code. - - svn path=/trunk/; revision=52610 - -commit 856668d -Author: Michael Mann -Date: Tue Oct 15 00:05:45 2013 +0000 - - Fix the bitcoin dissector to be able to dissect recent version of the protocol. Bug 8844 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8844) - - Changes: - - All messages now have a checksum (and not only version and verack). - - In the version message: user agent added as a string preceded by a varint length. - - Port in an address is in little endian and not big endian. - - In the version message the receiving and emitting address where inverted. - - From Eric Masson - - svn path=/trunk/; revision=52609 - -commit 21e17b8 -Author: Anders Broman -Date: Mon Oct 14 21:50:37 2013 +0000 - - Reverting as requested by Jakub, eventhoug I don't think this prticular entry is useful as it's duplicated in the tree and almost certanly never vissible. - - svn path=/trunk/; revision=52608 - -commit 0efe942 -Author: Gerald Combs -Date: Mon Oct 14 21:17:38 2013 +0000 - - Let Qt lay out and size elements in FollowStreamDialog. Make it - resizable. Get rid of the group box -- the OS X and Windows HIGs - discourage its use and I'm not sure if it fits the GNOME HIG in this - case either. Make the stream contents monospace. Set the cursor to the - beginning of the text when we follow a stream. - - Continue the War On Unnecessary Dialogs. Move "Find"ing from a pop-up - window to the main Follow dialog. Wrap back to the beginning as needed. - - Add a "Cancel" button. Make sure it and the escape key work as expected. - - svn path=/trunk/; revision=52607 - -commit 2e405d7 -Author: Evan Huus -Date: Mon Oct 14 20:35:56 2013 +0000 - - Replace XXX with explanation based on discussion with Jakub on -dev. - - svn path=/trunk/; revision=52606 - -commit bef9e93 -Author: Evan Huus -Date: Mon Oct 14 20:29:23 2013 +0000 - - Slightly clarify the wmem release note entry. - - svn path=/trunk/; revision=52605 - -commit ecb5860 -Author: Anders Broman -Date: Mon Oct 14 18:18:16 2013 +0000 - - Adding to col info is probably useless as next dissector will overwrite it. - - svn path=/trunk/; revision=52604 - -commit 7541b47 -Author: Anders Broman -Date: Mon Oct 14 18:16:11 2013 +0000 - - Try to pptimize heuristics slightly. - - svn path=/trunk/; revision=52603 - -commit c94403e -Author: Pascal Quantin -Date: Mon Oct 14 17:55:43 2013 +0000 - - Add dissection of NCM/MBIM data traffic based on data interface class protocol code - - svn path=/trunk/; revision=52602 - -commit 9011036 -Author: Gerald Combs -Date: Mon Oct 14 17:23:58 2013 +0000 - - Look for QtWidgets in the right directory. - - svn path=/trunk/; revision=52601 - -commit 13c1c9d -Author: Gerald Combs -Date: Mon Oct 14 16:54:41 2013 +0000 - - PacketList and ProtoTree need access to MainWindow at initialization - time in order to fill in their respective context menus. R52386 broke - that. Fix it and add comments about handling reparenting. Fixes bug - 9265. - - svn path=/trunk/; revision=52600 - -commit 1eb36c1 -Author: Martin Kaiser -Date: Mon Oct 14 15:03:28 2013 +0000 - - do some range checks when reading vwr files - don't assign the output of pntoh24() to a gint16 - - unfortunately, vwr detection does not work reliably and many pdf files - are recognized as vwr - this commit should prevent wireshark from - crashing when it tries to load the USB 2.0 spec as pdf ;-) - - - svn path=/trunk/; revision=52599 - -commit 3af074a -Author: Jörg Mayer -Date: Mon Oct 14 14:53:36 2013 +0000 - - Make pkgconfig work - sort of: - - fix a typo - - Add the library dirs and not just the libraries. - This would help if the paths that are now returned - were actually correct. - - svn path=/trunk/; revision=52598 - -commit debe9b6 -Author: Pascal Quantin -Date: Mon Oct 14 08:36:38 2013 +0000 - - As reported by Didier Gautheron on -dev (http://www.wireshark.org/lists/wireshark-dev/201310/msg00159.html) : - Since r49923, TCP flags are no more displayed in info column when tree is NULL - - svn path=/trunk/; revision=52597 - -commit 7be4187 -Author: Michael Mann -Date: Mon Oct 14 03:07:32 2013 +0000 - - TLS server key exchange misses sig and hash algorithm for TLS 1.2. Bug 9208 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9208). - - 1. Fix ECDH server key exchange for TLS 1.2 - 2. Fix RSA server key exchange for TLS 1.2 - - From Hauke Mehrtens - - svn path=/trunk/; revision=52596 - -commit 20c163d -Author: Michael Mann -Date: Mon Oct 14 02:34:06 2013 +0000 - - DTLS server key exchange misses sig and hash algorithm for TLS 1.2. Bug 9208 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9208) - - 1. Fix ECDH server key exchange for DTLS 1.2 - 2. Fix RSA server key exchange for DTLS 1.2 - - From Hauke Mehrtens - - svn path=/trunk/; revision=52595 - -commit 5320a5e -Author: Martin Mathieson -Date: Sun Oct 13 22:00:09 2013 +0000 - - DRX: start to show state prior to and after current PDU. - - svn path=/trunk/; revision=52594 - -commit a361571 -Author: Anders Broman -Date: Sun Oct 13 21:25:19 2013 +0000 - - As requested by Zoltán Lajos Kis, split the openflow dissector int one file per protocol version. - - svn path=/trunk/; revision=52593 - -commit ee19aea -Author: Cal Turney -Date: Sun Oct 13 20:19:30 2013 +0000 - - SMB2 SRT can be very inaccurate in the presence of retransmissions: Retransmitted responses not only add additional (bogus) transactions but also the latency associated with them. This can greatly inflate the maximum and average SRT stats especially in the case of retransmissions triggered by the expiry of the rexmit timer (RTOs). Only calculating SRT for the first response received accomplishes this goal without requiring the TCP pref "Do not call subdissectors for error packets" to be set. - - svn path=/trunk/; revision=52592 - -commit 2ac134b -Author: Bill Meier -Date: Sun Oct 13 19:56:52 2013 +0000 - - whitespace fixes; mostly: remove trailing blanks - - svn path=/trunk/; revision=52591 - -commit 5927778 -Author: Bill Meier -Date: Sun Oct 13 19:14:33 2013 +0000 - - Minor whitespace changes - - svn path=/trunk/; revision=52590 - -commit 3118bd5 -Author: Gerald Combs -Date: Sun Oct 13 18:59:23 2013 +0000 - - Don't clobber PKG_CONFIG_PATH. - - svn path=/trunk/; revision=52589 - -commit 76d4b43 -Author: Bill Meier -Date: Sun Oct 13 18:14:59 2013 +0000 - - Minor whitespace, formatting & etc changes. - - svn path=/trunk/; revision=52588 - -commit ee6916b -Author: Evan Huus -Date: Sun Oct 13 16:10:43 2013 +0000 - - When printing PDML, don't assume that all values with bitmasks are represented - as guint32 internally - they may be signed and/or 64-bit. - - svn path=/trunk/; revision=52587 - -commit 4e50b8b -Author: Gerald Combs -Date: Sun Oct 13 14:03:40 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-10-13] - - svn path=/trunk/; revision=52584 - -commit e7a0c26 -Author: Evan Huus -Date: Sun Oct 13 13:13:24 2013 +0000 - - Subsume README.binarytrees into wmem doxygen. The README was out of date - anyways, since Michael made key operations non-destructive in r44380. - - svn path=/trunk/; revision=52583 - -commit 14d9d10 -Author: Michael Mann -Date: Sun Oct 13 12:25:01 2013 +0000 - - openSAFETY: Dissection for second crc as well as plausability check. Bug 9261 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9261). - - From Roland Knall - - svn path=/trunk/; revision=52582 - -commit 1299f24 -Author: Graham Bloice -Date: Sun Oct 13 09:47:32 2013 +0000 - - Set CMake to use Python when building the tap register files. - - svn path=/trunk/; revision=52581 - -commit 9c4ee86 -Author: Graham Bloice -Date: Sun Oct 13 09:21:55 2013 +0000 - - Add CMake properties to targets so that they are logically organised when using a Visual Studio solution. - Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution. - - svn path=/trunk/; revision=52580 - -commit f5decf5 -Author: Pascal Quantin -Date: Sun Oct 13 08:47:05 2013 +0000 - - Fix dissection of Home Provider CID and fix a typo error - - svn path=/trunk/; revision=52579 - -commit efdbb59 -Author: Evan Huus -Date: Sun Oct 13 04:54:14 2013 +0000 - - So a while back Jeff added some code to check that the offset+length passed to - proto_tree_add_item was valid *before* we short-circuited based on a NULL tree. - This was good in that it removed a common source of really-long-loop bugs. It - was less good in that it cost us about 8% in speed when doing a tree-less - dissection, but we decided the tradeoff was worth it. - - After Anders' recent mail to -dev about performance, I started thinking about - how to optimize this. It occurred to me that the vast majority of the logic - involved in the check was dealing with the length value - fetching the actual - length if it was a counted string, calculating the length if it was -1, adding - the length to the offset in a way that was free from overflows, etc. - - All of this is (theoretically) unnecessary - simply checking the offset without - worrying about the length will still catch the very-long-loops, since it is the - offset that increases in each iteration, not the length. - - All that to justify: - - implement tvb_ensure_offset_exists which throws an exception if the offset is - not within the tvb - - use it instead of all the complicated other logic in the pre-short-circuit - step of proto_tree_add_item and friends - - This gives us back about 3/4 of the performance we lost in the original patch. - We're still ~2% slower than without any check, but this is the best I can think - of right now. - - svn path=/trunk/; revision=52578 - -commit f65ab94 -Author: Evan Huus -Date: Sun Oct 13 00:13:20 2013 +0000 - - Order our conditionals to take advantage of the fact that we know tvb->length <= - tvb->reported_length. Small performance win on the hot path, and a bit easier to - read. - - svn path=/trunk/; revision=52577 - -commit 6390f33 -Author: Pascal Quantin -Date: Sat Oct 12 23:48:43 2013 +0000 - - Update the User Guide for the upcoming 1.11.0 release - - svn path=/trunk/; revision=52576 - -commit a11b04b -Author: Evan Huus -Date: Sat Oct 12 23:41:55 2013 +0000 - - Tweak/simplify some tvbuff length check functions slightly. In my benchmarks of - dissecting without tree, they are costly because they now happen for every - proto_tree_add_item call even if tree is NULL. - - svn path=/trunk/; revision=52575 - -commit 3ab8799 -Author: Jörg Mayer -Date: Sat Oct 12 22:08:03 2013 +0000 - - Remove some things that I added while not understanding the real - problem/solution. - "Long" since solved by copying the solution from Makefile.nmake. - - Small update to the status of cmake builds on windows - - svn path=/trunk/; revision=52574 - -commit c2b2d20 -Author: Evan Huus -Date: Sat Oct 12 21:01:17 2013 +0000 - - Redo r52569 in a way that doesn't break the GUI. Add a mem_pool member to - tree_data and reference it directly when allocating/freeing tree items. This - lets us keep multiple around when we need them, and still lets us use - wmem_free_all for a major speedup. It also, coincidentally, lets us get rid of - the annoying fi_tmp hack that was needed before, since that element gets swept - up in the free_all with everything else. - - Keep one pool cached to avoid creating/destroying a pool for each packet, - another minor performance win. - - The various changes in approach seem to balance out pretty much exactly, this - still gives ~11% over pre-52569. - - svn path=/trunk/; revision=52573 - -commit 2e1497b -Author: Evan Huus -Date: Sat Oct 12 18:14:19 2013 +0000 - - Revert r52569, it breaks the GUI since that sometimes has multiple trees active - at once. - - svn path=/trunk/; revision=52572 - -commit b610734 -Author: Chris Maynard -Date: Sat Oct 12 18:13:26 2013 +0000 - - If the offset is out of bounds, have tvb_length_remaining() and tvb_reported_length_remaining() return 0 instead of -1. This should provide a better long-term fix for bugs/problems such as seen in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263. In the long-run, if we like this behavior, we can change the return value to a guint as well. Let's let it simmer for awhile first ... - - svn path=/trunk/; revision=52571 - -commit 65accd3 -Author: Chris Maynard -Date: Sat Oct 12 18:03:34 2013 +0000 - - Don't assume that tvb_length_remaining() or tvb_reported_length_remaining() always return a value >= 0. Part of fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263 - - #BACKPORT(1.10,1.8) - - svn path=/trunk/; revision=52570 - -commit 540e9c7 -Author: Evan Huus -Date: Sat Oct 12 17:57:51 2013 +0000 - - Use wmem_free_all on the tree pool rather than freeing each node, label and - field_info separately. We still have to walk the tree in order to free certain - fvalues, but that's not a big deal. Another ~11% speed-up running "tshark -nVr" - on a large capture. - - svn path=/trunk/; revision=52569 - -commit d19a207 -Author: Evan Huus -Date: Sat Oct 12 17:32:41 2013 +0000 - - Use a wmem block allocator to allocate field_infos, proto_nodes and item_labels. - Even without making use of free_all (which should be possible) this still - results in ~8% speedup running "tshark -nVr" on a large file in my tests. - - svn path=/trunk/; revision=52568 - -commit f1ee43a -Author: Pascal Quantin -Date: Sat Oct 12 14:29:40 2013 +0000 - - Update User Guide for 1.11 preparation - - svn path=/trunk/; revision=52567 - -commit 214a2d7 -Author: Pascal Quantin -Date: Sat Oct 12 14:05:32 2013 +0000 - - From Todd Newton via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9262 : - Fix dissection of PTP Management messages - - svn path=/trunk/; revision=52566 - -commit 137be14 -Author: Evan Huus -Date: Sat Oct 12 13:14:30 2013 +0000 - - We can't use proto_tree_add_uint_* for FT_TIME fields, use proto_tree_add_time_* - instead. Fixes another one of the issues that shows up in - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263 - - svn path=/trunk/; revision=52565 - -commit b581aff -Author: Evan Huus -Date: Sat Oct 12 12:53:35 2013 +0000 - - Based on help and suggestions from Johannes Berg, fix Radiotap Header decode the - right way. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9256 without - reintroducing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9212 - - svn path=/trunk/; revision=52564 - -commit fa1027a -Author: Evan Huus -Date: Sat Oct 12 12:38:56 2013 +0000 - - From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9229 - - Add a new strutil function format_text_chr that replaces unprintable characters - with a single passed-in char (eg a '.' or a '-') instead of a C-style escape. - This is useful for displaying binary data that frequently but not always - contains text; otherwise the number of C escape codes makes it unreadable. - - svn path=/trunk/; revision=52563 - -commit 522f74e -Author: Gerald Combs -Date: Sat Oct 12 03:44:20 2013 +0000 - - Have pixbuf_to_widget() use a guint8 * to match - gdk_pixbuf_new_from_inline(). - - svn path=/trunk/; revision=52562 - -commit 7335343 -Author: Gerald Combs -Date: Sat Oct 12 03:00:04 2013 +0000 - - Another Solaris Studio C++ fix. - - svn path=/trunk/; revision=52561 - -commit 6e3892e -Author: Evan Huus -Date: Sat Oct 12 02:41:44 2013 +0000 - - Free the actual struct, not the typedef thereof, because the typedef is actually - a typedef of a *pointer* to the struct, not the struct itself, which are - different sizes. - - This doesn't show up under valgrind because the length isn't checked in that - case, everything gets subsumed in valgrind's malloc/free hooks. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9264 - - svn path=/trunk/; revision=52560 - -commit 1f2043d -Author: Gerald Combs -Date: Sat Oct 12 02:29:17 2013 +0000 - - Solaris Studio C++ won't let us pass the address of main() to - init_progfile_dir(). Try using QCoreApplication::applicationFilePath() - instead. - - svn path=/trunk/; revision=52559 - -commit 6a5afa8 -Author: Gerald Combs -Date: Sat Oct 12 01:02:34 2013 +0000 - - Update to the latest Windows library tags. Add an "install_qt" target. - - svn path=/trunk/; revision=52558 - -commit fcff2c9 -Author: Gerald Combs -Date: Sat Oct 12 00:12:24 2013 +0000 - - QT_DIR → QT5_BASE_DIR. This matches the CMake environment. - - svn path=/trunk/; revision=52557 - -commit 383ed64 -Author: Gerald Combs -Date: Fri Oct 11 23:52:19 2013 +0000 - - Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake. - - svn path=/trunk/; revision=52556 - -commit c01ab40 -Author: Jörg Mayer -Date: Fri Oct 11 23:03:18 2013 +0000 - - With Gerald's patch we should no longer require GTK includes for QT-Only builds - (untested). - - svn path=/trunk/; revision=52555 - -commit 90b20ab -Author: Gerald Combs -Date: Fri Oct 11 21:42:49 2013 +0000 - - One more HAVE_LIBPCAP. - - svn path=/trunk/; revision=52554 - -commit aae1de7 -Author: Jeff Morriss -Date: Fri Oct 11 21:29:12 2013 +0000 - - cf_start_tail() is (now) just a wrapper around cf_open(). Get rid of it and just call cf_open(). - - svn path=/trunk/; revision=52553 - -commit 564ca2d -Author: Gerald Combs -Date: Fri Oct 11 21:26:26 2013 +0000 - - Try to fix Qt compilation when libpcap is disabled. - - svn path=/trunk/; revision=52552 - -commit 2dcfce3 -Author: Jeff Morriss -Date: Fri Oct 11 20:48:13 2013 +0000 - - Fix some formatting. - - svn path=/trunk/; revision=52551 - -commit 15b539f -Author: Jeff Morriss -Date: Fri Oct 11 20:29:11 2013 +0000 - - Replace a question in a comment with a better explanation (that answers the question). - - svn path=/trunk/; revision=52550 - -commit d06d2fd -Author: Jeff Morriss -Date: Fri Oct 11 19:55:34 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8943 : - - List Windows Server 2012 (and a couple of Home Server versions) as supported OS. - - While at it, remove the list of the various "NT-based" Windows versions from - a couple of other places (this effectively removes statements that we still - support NT4.0 and 2000). - - svn path=/trunk/; revision=52549 - -commit d643779 -Author: Gerald Combs -Date: Fri Oct 11 18:42:34 2013 +0000 - - Build with Qt by default. - - svn path=/trunk/; revision=52548 - -commit a631772 -Author: Gerald Combs -Date: Fri Oct 11 17:58:12 2013 +0000 - - More ui/util.h includes. - - svn path=/trunk/; revision=52545 - -commit 3623167 -Author: Gerald Combs -Date: Fri Oct 11 17:47:43 2013 +0000 - - Include ui/util.h. - - svn path=/trunk/; revision=52544 - -commit 6262bb3 -Author: Jeff Morriss -Date: Fri Oct 11 17:43:07 2013 +0000 - - There's no need to include prefs.h twice. - - svn path=/trunk/; revision=52543 - -commit 259768d -Author: Gerald Combs -Date: Fri Oct 11 17:20:50 2013 +0000 - - Remove GTK+ and global cfile dependencies from file_dlg_win32.c. - - Move the declaration of set_last_open_dir() to ui/util.h. It still - has separate GTK+ and Qt implemenations. We might want to move it to - ui/util.c at some point. Remove a lot of unnecessary GTK+ includes. - Remove most of the references to the global cfile while we're at it. - - svn path=/trunk/; revision=52542 - -commit ee5397d -Author: Jörg Mayer -Date: Fri Oct 11 11:43:37 2013 +0000 - - The env variable is QT5_BASE_DIR, as documented in README.cmake - Make documentation and implementatoin consistent - - svn path=/trunk/; revision=52541 - -commit f0e92ef -Author: Jörg Mayer -Date: Fri Oct 11 11:25:40 2013 +0000 - - The path for the Qt5 installation now needs to be set as a - windows environment variable. - - svn path=/trunk/; revision=52540 - -commit f5fd46f -Author: Jörg Mayer -Date: Fri Oct 11 11:11:41 2013 +0000 - - qtshark and wireshark(gtk2) now actually find their libs. - - svn path=/trunk/; revision=52539 - -commit 28282a9 -Author: Jörg Mayer -Date: Fri Oct 11 10:32:11 2013 +0000 - - Now the GUI programs (wireshark/gtk2 and qtshark) compile and link - - svn path=/trunk/; revision=52538 - -commit a37a217 -Author: Pascal Quantin -Date: Fri Oct 11 10:32:05 2013 +0000 - - Fix another fuzz failure - - svn path=/trunk/; revision=52537 - -commit a183a4f -Author: Guy Harris -Date: Fri Oct 11 07:53:17 2013 +0000 - - We don't need to check for lauxlib.h. - - svn path=/trunk/; revision=52536 - -commit 8719ceb -Author: Jörg Mayer -Date: Fri Oct 11 07:38:45 2013 +0000 - - Make airpcap detection work - - svn path=/trunk/; revision=52535 - -commit 5db6b8a -Author: Guy Harris -Date: Fri Oct 11 06:53:29 2013 +0000 - - Check for sa_len in struct sockaddr. - - svn path=/trunk/; revision=52534 - -commit 3179493 -Author: Guy Harris -Date: Fri Oct 11 06:48:45 2013 +0000 - - We don't check for lauxlib.h or lualib.h, and we don't need to - we just - check whether we have Lua or not. Get rid of the cmakedefines for those - two headers. (The autoconf script should perhaps do the check - differently.) - - svn path=/trunk/; revision=52533 - -commit 059423c -Author: Guy Harris -Date: Fri Oct 11 06:10:32 2013 +0000 - - Fix check for inflatePrime in zlib (ZLIB_LIBRARIES isn't set at that - point, you want ZLIB_LIBRARY). - - svn path=/trunk/; revision=52532 - -commit 75ccff5 -Author: Evan Huus -Date: Fri Oct 11 01:33:40 2013 +0000 - - Destroy dissector tables on shutdown and use epan scoped memory of handles. - Cleans up another 600KB of "still accessible" memory. - - svn path=/trunk/; revision=52531 - -commit 59e24df -Author: Gerald Combs -Date: Fri Oct 11 01:31:59 2013 +0000 - - "install-generated-files" depends on "doc". Set dependencies - accordingly. - - svn path=/trunk/; revision=52530 - -commit c03546c -Author: Gerald Combs -Date: Fri Oct 11 01:16:19 2013 +0000 - - qtshark.exe doesn't depend on tshark_OBJECTS. - - svn path=/trunk/; revision=52529 - -commit abd75d1 -Author: Evan Huus -Date: Fri Oct 11 01:11:21 2013 +0000 - - Free all the heuristict dissector lists and their entries on shutdown, another - few KB of "still reachable" data down. - - svn path=/trunk/; revision=52528 - -commit 545455d -Author: Jeff Morriss -Date: Fri Oct 11 00:42:02 2013 +0000 - - Fix compilation when we don't HAVE_LIBGCRYPT - - svn path=/trunk/; revision=52527 - -commit 64cc800 -Author: Jeff Morriss -Date: Fri Oct 11 00:31:01 2013 +0000 - - Don't assume people have subversion--I just copied my home directory to a new - machine and it would have been nice if this script and installed subversion - for me. - - Install perl-podlators too (for pod2man). Need to check if that's the package - name to use on SuSE too... - - svn path=/trunk/; revision=52526 - -commit c62f096 -Author: Gerald Combs -Date: Fri Oct 11 00:29:21 2013 +0000 - - Don't return an error if cleaning the Qt directory fails. - - svn path=/trunk/; revision=52525 - -commit 2ee9b16 -Author: Guy Harris -Date: Fri Oct 11 00:05:08 2013 +0000 - - Note that dladdr() isn't being found on OS X, even though it's - available. - - svn path=/trunk/; revision=52524 - -commit 2ed259c -Author: Evan Huus -Date: Thu Oct 10 23:59:57 2013 +0000 - - When TCP options are truncated, we only add the truncated length to the tree, - not the whole length. Fixes an invalid access with the capture from - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263 - - svn path=/trunk/; revision=52523 - -commit e5336d2 -Author: Guy Harris -Date: Thu Oct 10 23:54:53 2013 +0000 - - Move the QT_MACEXTRAS_LIB cmakedefine in cmakeconfig.h.in to the - equivalent location in config.h.in, to simplify comparing the two files. - - Add some tests from the autoconf script to CMake: - - check for setresgid() and setresuid(); - - check for struct stat having an st_flags member. - - Get rid of INTTYPES_H_DEFINES_FORMATS; we don't appear to check for it, - and we don't use it (we're using GLib's formatting functions, which have - their own way of handling 64-bit integers). - - Get rid of STDC_HEADERS; it's in autoconf because autoconf was - originally developed back when you couldn't rely in ANSI C and has never - been removed, and something we're using for other purposes checks for - it, not because we explicitly test for it, but we don't test it in the - code, and CMake doesn't even check for it. - - svn path=/trunk/; revision=52522 - -commit 2f067f2 -Author: Gerald Combs -Date: Thu Oct 10 23:52:29 2013 +0000 - - Use the right package name. - - svn path=/trunk/; revision=52521 - -commit 06a3d11 -Author: Gerald Combs -Date: Thu Oct 10 23:45:16 2013 +0000 - - Try to discover Qt similar to the way we discover Python. - - svn path=/trunk/; revision=52520 - -commit 878186b -Author: Guy Harris -Date: Thu Oct 10 23:33:21 2013 +0000 - - We use g_ascii_strtoll(), not strtoll(), so we no longer need to check - for strtoll() (if we ever did check for it). - - svn path=/trunk/; revision=52519 - -commit 564797a -Author: Gerald Combs -Date: Thu Oct 10 23:11:19 2013 +0000 - - Try to locate QtMacExtras. - - svn path=/trunk/; revision=52518 - -commit 2accaae -Author: Guy Harris -Date: Thu Oct 10 22:56:48 2013 +0000 - - Fix other HAVE_LUA entry. - - svn path=/trunk/; revision=52517 - -commit 59e052e -Author: Jörg Mayer -Date: Thu Oct 10 22:19:45 2013 +0000 - - Fix a few things - untested until current build finishes. - - svn path=/trunk/; revision=52516 - -commit baf34b0 -Author: Guy Harris -Date: Thu Oct 10 21:02:50 2013 +0000 - - Don't check for pcap_version(); we don't use it. - - Sort the #cmakedefines in cmakeconfig.h.in to more closely match the - order in config.h.in, to make it easier to make sure CMake and autofoo - are doing the same checks. Remove some #cmakedefines that don't - correspond to check that are being done either by CMake or autofoo. - - svn path=/trunk/; revision=52515 - -commit 260a3af -Author: Guy Harris -Date: Thu Oct 10 20:36:11 2013 +0000 - - Check for bpf_image(), just as the autoconf script does. - - svn path=/trunk/; revision=52514 - -commit 2a59ee5 -Author: Jörg Mayer -Date: Thu Oct 10 20:35:32 2013 +0000 - - Add Airpcap detection, use it by default on win32 - - QT5 compile working - NOT. It's almost working, except - that I *still* need to get GTK detection working on Win :-( - - - svn path=/trunk/; revision=52513 - -commit 561a071 -Author: Jeff Morriss -Date: Thu Oct 10 20:23:59 2013 +0000 - - Don't close the Capture Options window if there was an error in what was - selected (and we're not going to start capturing). That way the user can fix - whatever was wrong without having to re-open the dialog. - - svn path=/trunk/; revision=52512 - -commit 36fe610 -Author: Guy Harris -Date: Thu Oct 10 20:20:45 2013 +0000 - - Just describe HAVE_LUA as "Define to use Lua"; it's not tied to a - version, and this matches cmakeconfig.h.in. - - svn path=/trunk/; revision=52511 - -commit dea61da -Author: Pascal Quantin -Date: Thu Oct 10 20:19:27 2013 +0000 - - Fix an infinite loop detected during fuzz testing - - svn path=/trunk/; revision=52510 - -commit ce17930 -Author: Guy Harris -Date: Thu Oct 10 20:14:12 2013 +0000 - - HAVE_LUA is for Lua, not some particular version thereof. - - Reorder to match config.h.in (which is autogenerated). - - svn path=/trunk/; revision=52509 - -commit aeec217 -Author: Guy Harris -Date: Thu Oct 10 20:10:18 2013 +0000 - - Get rid of apparently-undefined and apparently-unused #defines. - - svn path=/trunk/; revision=52508 - -commit 37a7e33 -Author: Chris Maynard -Date: Thu Oct 10 19:48:37 2013 +0000 - - Revert the changes made to resolve https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 (When following an HTTP tcp stream decode gzip data automatically), as they caused a bigger problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 ("Follow TCP Stream" shows only first HTTP req+res). - - #BACKPORT(1.10) - - - svn path=/trunk/; revision=52506 - -commit d8231f1 -Author: Anders Broman -Date: Thu Oct 10 19:30:29 2013 +0000 - - Try to make the build bot happy. - - svn path=/trunk/; revision=52505 - -commit d038be7 -Author: Anders Broman -Date: Thu Oct 10 19:17:48 2013 +0000 - - Flag the addresses used in the trace which has been resolved and only add those to the list used to create the NRB. - - svn path=/trunk/; revision=52504 - -commit f29544f -Author: Evan Huus -Date: Thu Oct 10 17:44:55 2013 +0000 - - Add a call to tvb_ensure_bytes_exist before we allocate memory based on our - offset+size, prevents attempts to allocate outrageous memory, fixing - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9260 - - svn path=/trunk/; revision=52503 - -commit 7a1a387 -Author: Gerald Combs -Date: Thu Oct 10 17:30:56 2013 +0000 - - Fixes for the utility-launcher script. - - If we don't find Wireshark.app in WIRESHARK_APP_DIR or - /Applications/Wireshark.app, look for it using its bundle ID. Add a - description of this process to the Read Me First files. Look for - executables in the right subdirectory depending on our UI flavor. - - Make sure we don't add GTK+-specific items to the app bundle if we're - using Qt. - - svn path=/trunk/; revision=52502 - -commit 689618c -Author: Jörg Mayer -Date: Thu Oct 10 17:28:50 2013 +0000 - - Build qtshark by default, use qt5 by default. To turn - off building qtshark do "cmake ... -DBUILD_qtshark=OFF ..." - or change your local copy of CMakeOptions.txt - - Small update to README.cmake (when running nmake I recommend - using /X- to avoid some (viewing) corruptions. - - - svn path=/trunk/; revision=52501 - -commit b80fad5 -Author: Chris Maynard -Date: Thu Oct 10 17:23:12 2013 +0000 - - Fix a couple of typos. - - svn path=/trunk/; revision=52500 - -commit 607e329 -Author: Jörg Mayer -Date: Thu Oct 10 17:16:21 2013 +0000 - - Explain about setpath.bat - - svn path=/trunk/; revision=52499 - -commit 7c25a38 -Author: Jörg Mayer -Date: Thu Oct 10 17:13:02 2013 +0000 - - lib is required for linking, the dlls are in bin - And with this change, I'm finally able to run the executables in the - top builddir. - - svn path=/trunk/; revision=52498 - -commit a50dee3 -Author: Evan Huus -Date: Thu Oct 10 16:18:49 2013 +0000 - - From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9246 - - Fix memory leaks and bad memory accesses in c1222 dissector. - - From me: use realloc in a handoff function since it may get called multiple - times, and we only need the latest. - - svn path=/trunk/; revision=52497 - -commit 1370003 -Author: Evan Huus -Date: Thu Oct 10 16:07:20 2013 +0000 - - From Marko Hrastovec via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9239 - - Add dissection of Asterix category 008. - - svn path=/trunk/; revision=52496 - -commit 59c91b3 -Author: Chris Maynard -Date: Thu Oct 10 16:04:41 2013 +0000 - - Safer to compare return value of tvb_reported_length_remaining() > 0 than != 0. - Convert tabs to spaces. - - svn path=/trunk/; revision=52495 - -commit 943356c -Author: Cal Turney -Date: Thu Oct 10 15:53:45 2013 +0000 - - "Expert Info (Error/Malformed) trying to fetch an unsigned integer with length 0" errors when an attempt is made to display the File Attributes within the FID subtree of SMB requests and responses. In addition, not all the options and masks were marked with PROTO_ITEM_SET_GENERATED(item) when appropriate to do so; - - Fix1: The proto_tree_add_item() was changed to proto_tree_add_uint. - Fix2: "If (len==0) PROTO_ITEM_SET_GENERATED(item);" was added to dissect_nt_create_options_bits(), dissect_nt_share_access_bits(), dissect_smb_access_mask_bits(), dissect_nt_create_bits(), and dissect_file_ext_attr_bits(). - - svn path=/trunk/; revision=52494 - -commit bcf51e8 -Author: Jeff Morriss -Date: Thu Oct 10 14:53:19 2013 +0000 - - Fix the core dump reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9258 : - - After calling wtap_close(), set the wth to NULL so we don't try to close it - again later. (The core only happens when tshark isn't keeping up with dumpcap's - file rotation.) - - Wireshark still has a problem but it's a different one. - - svn path=/trunk/; revision=52493 - -commit 36e0adf -Author: Jörg Mayer -Date: Thu Oct 10 13:37:15 2013 +0000 - - Generate setpath.bat to set the paths necessary for running - the generated binaries inside the build dir. - - svn path=/trunk/; revision=52492 - -commit 526f7cf -Author: Jörg Mayer -Date: Thu Oct 10 09:10:53 2013 +0000 - - The path approach can't work this way: Trying to set an environment - variable of our parent process isn't going to work. Plan B is to write - this stuff into a file and manually run it once. - - Hard code the QT5 search path on Windows for now. - - svn path=/trunk/; revision=52489 - -commit 7af36bb -Author: Balint Reczey -Date: Thu Oct 10 08:41:14 2013 +0000 - - Revert "Fix using fop from CMake" - - This reverts commit r52484 - - svn path=/trunk/; revision=52488 - -commit a77e375 -Author: Pascal Quantin -Date: Thu Oct 10 08:15:55 2013 +0000 - - Slightly change heuristics - - svn path=/trunk/; revision=52487 - -commit ee0fc35 -Author: Pascal Quantin -Date: Thu Oct 10 07:30:57 2013 +0000 - - Add fragmentation support - - svn path=/trunk/; revision=52486 - -commit c3d138d -Author: Jörg Mayer -Date: Thu Oct 10 07:13:36 2013 +0000 - - As the Qt build will not use portaudio, we don't need to - put portaudio flags into config.pri - - svn path=/trunk/; revision=52485 - -commit 6602789 -Author: Balint Reczey -Date: Thu Oct 10 05:02:50 2013 +0000 - - Fix using fop from CMake - - svn path=/trunk/; revision=52484 - -commit aa57e00 -Author: Guy Harris -Date: Wed Oct 9 22:30:59 2013 +0000 - - Fix signed vs. unsigned comparison warnings. - - svn path=/trunk/; revision=52483 - -commit 60d0a97 -Author: Martin Mathieson -Date: Wed Oct 9 22:10:15 2013 +0000 - - Don't update DRX state when preference is turned off - - svn path=/trunk/; revision=52482 - -commit f2f95a4 -Author: Pascal Quantin -Date: Wed Oct 9 21:59:41 2013 +0000 - - Update a comment - - svn path=/trunk/; revision=52481 - -commit 61d0ac9 -Author: Anders Broman -Date: Wed Oct 9 21:36:03 2013 +0000 - - Change the default UDP port to 0. - - svn path=/trunk/; revision=52480 - -commit 6a8ceca -Author: Gerald Combs -Date: Wed Oct 9 20:49:12 2013 +0000 - - Sometimes we need to @rpathify libraries from more than one directory. - Instead of trying to match libraries from $LIBPREFIX, exclude libraries - that aren't in well-known system paths and which haven't previously been - @rpathified. - - svn path=/trunk/; revision=52479 - -commit 51d6f57 -Author: Anders Broman -Date: Wed Oct 9 20:31:23 2013 +0000 - - Check if first char is printable. - - svn path=/trunk/; revision=52478 - -commit f678c0f -Author: Anders Broman -Date: Wed Oct 9 20:30:18 2013 +0000 - - Try to fix - packet-rtpproxy.c:217: warning: comparison between signed and unsigned - - svn path=/trunk/; revision=52477 - -commit 6ca246c -Author: Anders Broman -Date: Wed Oct 9 20:14:12 2013 +0000 - - Make RTPProxy a newstyle dissector. - - svn path=/trunk/; revision=52476 - -commit ca78b8f -Author: Anders Broman -Date: Wed Oct 9 20:12:08 2013 +0000 - - g_list_prepend() is faster. - - svn path=/trunk/; revision=52475 - -commit ba3e8e0 -Author: Michael Mann -Date: Wed Oct 9 19:43:02 2013 +0000 - - Make column "filter name" prefixed with _ws. to be the same as other "*shark application filters" created in r52462. - - svn path=/trunk/; revision=52474 - -commit 576a160 -Author: Gerald Combs -Date: Wed Oct 9 17:58:39 2013 +0000 - - When we display an error message in the interface list make sure it's - word-wrapped. - - svn path=/trunk/; revision=52473 - -commit de733af -Author: Guy Harris -Date: Wed Oct 9 17:34:49 2013 +0000 - - 0xffffffffffff doesn't necessarily fit in an int, so use - G_GINT64_CONSTANT(). Make it unsigned while we're at it. - - Clean up indentation. - - svn path=/trunk/; revision=52472 - -commit 2693e12 -Author: Evan Huus -Date: Wed Oct 9 17:30:50 2013 +0000 - - Add some license headers after emailing the respective authors to confirm. - - svn path=/trunk/; revision=52471 - -commit 4860e10 -Author: Evan Huus -Date: Wed Oct 9 17:24:16 2013 +0000 - - Slight simplification, inline a function only ever called once. - - svn path=/trunk/; revision=52470 - -commit 7058b87 -Author: Evan Huus -Date: Wed Oct 9 17:21:30 2013 +0000 - - From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9238 - - Add test for ANSI C12.22 decryption. - - svn path=/trunk/; revision=52469 - -commit 32bc65a -Author: Anders Broman -Date: Wed Oct 9 16:20:54 2013 +0000 - - Try to make more efficient heuristick checks. - - svn path=/trunk/; revision=52468 - -commit 16085e8 -Author: Cal Turney -Date: Wed Oct 9 16:13:18 2013 +0000 - - If the capture is frame sliced at or beyond the TCP 20-byte fixed length portion of the TCP header and tcp_analyze_seq is enabled, TCP analysis is not conducted: As much of the options field as possible should be dissected and TCP analysis should be performed. - Patch was tested with snaplens of: - 49 and 52: (TCP fixed header incomplete) TCP analysis NOT performed. - 54: (Fixed header complete but entire options wfield was sliced off) TCP analysis ran and was OK. - 64: (Fixed header complete but a portion of the options field was missing) Options were dissected to the extent possible. TCP analysis ran and was OK. - 66: (Fixed header and options complete) TCP analysis ran and was OK. - 70: (Fixed header and options complete plus 4 bytes) TCP analysis ran and was OK. - - svn path=/trunk/; revision=52467 - -commit 6a67588 -Author: Pascal Quantin -Date: Wed Oct 9 16:07:24 2013 +0000 - - From Peter Van Eynde via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9252 : - Fix WCCP fix hash buckets assignment info decoding - - svn path=/trunk/; revision=52464 - -commit 65a8127 -Author: Michael Mann -Date: Wed Oct 9 15:19:04 2013 +0000 - - Improve on r52458 and bugfix a few places where offset wasn't incrementing. Helps fix bug 9248 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9248) and should be good enough to backport. - - svn path=/trunk/; revision=52463 - -commit 9ccefb0 -Author: Michael Mann -Date: Wed Oct 9 12:56:19 2013 +0000 - - Prefix all "Wireshark application specific" display filters with a "_ws." to distinguish them from dissector filters. - - This was committed now to get it into the 1.11 release so users can start getting used to the changed filter names. - - svn path=/trunk/; revision=52462 - -commit a56818a -Author: Pascal Quantin -Date: Wed Oct 9 09:53:48 2013 +0000 - - Add an option (off by default) to force decoding of unknown USB control data as MBIM - - svn path=/trunk/; revision=52461 - -commit de8242e -Author: Gerald Combs -Date: Wed Oct 9 00:03:14 2013 +0000 - - Fix a comment. - - svn path=/trunk/; revision=52460 - -commit f54c08e -Author: Gerald Combs -Date: Tue Oct 8 23:45:26 2013 +0000 - - Add some QT_DIR checks. - - svn path=/trunk/; revision=52459 - -commit 74501b2 -Author: Evan Huus -Date: Tue Oct 8 23:16:53 2013 +0000 - - Hacky fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9248 - Just break out of the loop if offset doesn't go up. - - There's almost certainly a better fix - the dissector is weird, and I'm not sure - if all the _length_remaining() checks are important or legacy, and what affect - they have on this issue. - - At the very least this will pacify the fuzzbots until somebody has time to - figure it out properly. - - svn path=/trunk/; revision=52458 - -commit d95d8d7 -Author: Evan Huus -Date: Tue Oct 8 23:05:29 2013 +0000 - - Replace a strbuf with a much simpler strdup_printf since it was in fact only - modified in one place. Much reduces memory usage, and makes it clear that - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9248 is an infinite loop not - a memory problem. - - svn path=/trunk/; revision=52457 - -commit b3c844f -Author: Gerald Combs -Date: Tue Oct 8 23:03:56 2013 +0000 - - Add an initial Qt configuration and makefile targets. - - svn path=/trunk/; revision=52456 - -commit 69da562 -Author: Evan Huus -Date: Tue Oct 8 21:12:06 2013 +0000 - - Don't try and construct an OID string if the len is zero. Fixes - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9246 - - svn path=/trunk/; revision=52455 - -commit 0863791 -Author: Jörg Mayer -Date: Tue Oct 8 20:41:57 2013 +0000 - - Try to set PATH on Windows to all required dlls/libs to allow - running the executables from the build tree without installation. - It doesn't really work yet but the troubleshooting has to wait - until either I've gotten some sleep or someone else fixes it. - - svn path=/trunk/; revision=52454 - -commit 69473b4 -Author: Gerald Combs -Date: Tue Oct 8 20:21:36 2013 +0000 - - Use a plain package name even if we're building with GTK3. Hopefully - we're beyond the "experimental" stage now. - - svn path=/trunk/; revision=52453 - -commit b505bb7 -Author: Gerald Combs -Date: Tue Oct 8 18:25:10 2013 +0000 - - Add notes about Qt, wmem, and bug 9242. - - svn path=/trunk/; revision=52452 - -commit 5b3f870 -Author: Anders Broman -Date: Tue Oct 8 18:17:45 2013 +0000 - - Add 3GPP AVP 533 - 537 - - svn path=/trunk/; revision=52451 - -commit 795dbb7 -Author: Martin Mathieson -Date: Tue Oct 8 17:13:34 2013 +0000 - - Separate state struct into separate config and running_state structs. Also, mod startOffset when working out if short cycle onDuration should be started - - svn path=/trunk/; revision=52450 - -commit 2553de1 -Author: Evan Huus -Date: Tue Oct 8 15:09:59 2013 +0000 - - From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9245 - - Fix test suite so that it doesn't attempt to use color if ncurses is not - installed. This came up when I attempted to use the test suite under Windows - with cygwin installed but not ncurses. The result is not entirely broken but - the error messages saying that "tput is not a valid command" make the menus and - results difficult to read. - - svn path=/trunk/; revision=52449 - -commit 54c558f -Author: Evan Huus -Date: Tue Oct 8 15:05:45 2013 +0000 - - Reorganize handling of incomplete fragments slightly. The logic hasn't changed - much, but I think this way's a little clearer, and it made it much easier to - figure out where the memory leak was. - - Fixes the leaks from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9243 - - svn path=/trunk/; revision=52448 - -commit 8a9e9de -Author: Martin Kaiser -Date: Tue Oct 8 11:23:22 2013 +0000 - - mpeg pes private data is 16 bytes long, see iso 13818-1 - - svn path=/trunk/; revision=52447 - -commit c75a0a6 -Author: Anders Broman -Date: Tue Oct 8 06:10:26 2013 +0000 - - Add information about the IANA assigned UDP port. - - svn path=/trunk/; revision=52446 - -commit 56d8797 -Author: Evan Huus -Date: Tue Oct 8 01:09:51 2013 +0000 - - Don't try and fetch the repeat value of slot 0, since it makes us underflow the - array we're accessing. - - Fixes the uninitialized value errors in - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9243 - - svn path=/trunk/; revision=52445 - -commit 7c50731 -Author: Martin Mathieson -Date: Mon Oct 7 21:57:07 2013 +0000 - - Starting to debug DRX support - - svn path=/trunk/; revision=52443 - -commit 9f45bac -Author: Gerald Combs -Date: Mon Oct 7 19:37:22 2013 +0000 - - Try to fix building the GTK flavor OS X app. - - svn path=/trunk/; revision=52442 - -commit df1b8d3 -Author: Jeff Morriss -Date: Mon Oct 7 19:06:39 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9209 : - - Debian still uses XPMs for their menu system[1] so distribute wsicon32.xpm in - the source tarball again (reverting part of r48565). This is the icon that - debian/wireshark.menu refers to. - - [1] http://lintian.debian.org/tags/menu-icon-not-in-xpm-format.html - - svn path=/trunk/; revision=52441 - -commit 67e98ca -Author: Anders Broman -Date: Mon Oct 7 18:32:48 2013 +0000 - - From Erik Hugne: - tYN flag in named messages - - Named messages are both used for connectionless - messaging and connection setup requests. A SYN - flag is now represented by the previously reserved - bit 18 in word 0 to differentiate named messages from - connection requests. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9241 - - svn path=/trunk/; revision=52440 - -commit 88130d4 -Author: Anders Broman -Date: Mon Oct 7 18:29:57 2013 +0000 - - From Erik Hugne: - tipc: update discovery protocol header according to spec - - Dissection of word 1 in the TIPC ndisc protocol header - is wrong. The field called "Broadcast ack no" should - be "Node Signature" (16 bits wide). - "Requested Links" is also wrong. This should actually be - 5 bits reserved, followed by a 8 bit "Minor protocol version" - field - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9241 - - svn path=/trunk/; revision=52439 - -commit ced6613 -Author: Evan Huus -Date: Mon Oct 7 16:34:00 2013 +0000 - - From Michal Labedzki via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9232 - - Use wmem_strbuf instead of manual string management in btsdp. Fixes fuzz - failure. - - From me: minor tweak to make the patch apply to current trunk. - - svn path=/trunk/; revision=52438 - -commit daba11a -Author: Martin Kaiser -Date: Mon Oct 7 15:22:08 2013 +0000 - - dissect mpeg registration descriptor - - svn path=/trunk/; revision=52437 - -commit f9da278 -Author: Pascal Quantin -Date: Mon Oct 7 12:16:30 2013 +0000 - - MBIM data is transferred over CDC-Data interface class. Remove useless code. - - svn path=/trunk/; revision=52436 - -commit 65f5c9a -Author: Pascal Quantin -Date: Mon Oct 7 10:15:04 2013 +0000 - - Dissect MBIM traffic over USB bulk - - svn path=/trunk/; revision=52435 - -commit f02d2f8 -Author: Pascal Quantin -Date: Mon Oct 7 08:14:15 2013 +0000 - - Update function name in debug info - - svn path=/trunk/; revision=52434 - -commit 1394b21 -Author: Anders Broman -Date: Mon Oct 7 04:49:44 2013 +0000 - - Try to fix Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 "Fix build for VS 2012 (MSVC_VARIANT==MSVC2012EE)" - - svn path=/trunk/; revision=52433 - -commit 6013cbd -Author: Jörg Mayer -Date: Mon Oct 7 00:25:43 2013 +0000 - - Try to get gtk3 detection working via pkg-config - (not yet working). - - svn path=/trunk/; revision=52432 - -commit 05908de -Author: Jörg Mayer -Date: Mon Oct 7 00:21:23 2013 +0000 - - NEED_STRPTIME_H needs to be detected properly for windows. - Set it manually for now. - - svn path=/trunk/; revision=52431 - -commit 0777f96 -Author: Evan Huus -Date: Sun Oct 6 23:39:16 2013 +0000 - - Another path and ordering tweak. - - svn path=/trunk/; revision=52430 - -commit 84aebfb -Author: Jörg Mayer -Date: Sun Oct 6 23:35:39 2013 +0000 - - Small update wrt the Windows build. - - svn path=/trunk/; revision=52429 - -commit 087c885 -Author: Evan Huus -Date: Sun Oct 6 23:29:59 2013 +0000 - - More tweaking of test suite path variables, trying to make everything play - nicely on Windows and Linux both. - - svn path=/trunk/; revision=52428 - -commit 0c25744 -Author: Jörg Mayer -Date: Sun Oct 6 22:17:24 2013 +0000 - - The code (at least) in dumpcap assumes that PCAP_CREATE is not - available on Windows - but we detect it in winpcap. - - With this change dumpcap compiles and links - - - svn path=/trunk/; revision=52427 - -commit f625f54 -Author: Jörg Mayer -Date: Sun Oct 6 22:15:38 2013 +0000 - - Remove an uncommented line: The file is now part of wsutil - - svn path=/trunk/; revision=52426 - -commit 2e59bc7 -Author: Jörg Mayer -Date: Sun Oct 6 22:14:37 2013 +0000 - - Use the correct syntax for the shell - - svn path=/trunk/; revision=52425 - -commit f016e8c -Author: Jörg Mayer -Date: Sun Oct 6 21:25:44 2013 +0000 - - Libwireshark now links on windows with cmake - - svn path=/trunk/; revision=52424 - -commit e5d29e2 -Author: Pascal Quantin -Date: Sun Oct 6 21:23:39 2013 +0000 - - Add support for relative OID to PER dissector - - svn path=/trunk/; revision=52423 - -commit 30f8fb1 -Author: Jörg Mayer -Date: Sun Oct 6 21:07:58 2013 +0000 - - Undo r52382 for this file: We use a different solution on Windows - - svn path=/trunk/; revision=52422 - -commit 32efaf8 -Author: Jörg Mayer -Date: Sun Oct 6 21:05:47 2013 +0000 - - Add $Id$ - - svn path=/trunk/; revision=52421 - -commit 16333c0 -Author: Pascal Quantin -Date: Sun Oct 6 20:59:05 2013 +0000 - - From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9192 : - Cleanup of relative and absolute OID decoding in packet-ber.c - - svn path=/trunk/; revision=52420 - -commit 0f8133c -Author: Jörg Mayer -Date: Sun Oct 6 20:51:13 2013 +0000 - - More copying of config.h.win32 stuff into cmake - - svn path=/trunk/; revision=52419 - -commit 88eb040 -Author: Jörg Mayer -Date: Sun Oct 6 20:32:56 2013 +0000 - - Fix a typo - - svn path=/trunk/; revision=52418 - -commit 13ae682 -Author: Evan Huus -Date: Sun Oct 6 20:30:12 2013 +0000 - - Fix nameres test suite cleanup after recent changes. - - svn path=/trunk/; revision=52417 - -commit c73bbc6 -Author: Jörg Mayer -Date: Sun Oct 6 19:58:18 2013 +0000 - - Make FindGTK3 work again - - svn path=/trunk/; revision=52416 - -commit 00c8690 -Author: Evan Huus -Date: Sun Oct 6 19:07:30 2013 +0000 - - Ignore g711.c it's under some weird Sun license but appears to be fully - GPL-compatible as far as I can tell (not a lawyer). - - svn path=/trunk/; revision=52415 - -commit 5dfd0ad -Author: Gilbert Ramirez -Date: Sun Oct 6 19:05:31 2013 +0000 - - Add license text to dftestlib files, and point to the - capture files that someone renamed from *.cap to *.pcap. - - svn path=/trunk/; revision=52414 - -commit 004c706 -Author: Evan Huus -Date: Sun Oct 6 19:04:10 2013 +0000 - - Remove packet-vj.c as it does not appear to be under a license we can use. - - svn path=/trunk/; revision=52413 - -commit 62c230c -Author: Evan Huus -Date: Sun Oct 6 18:57:01 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174 - - Reorg more of the test variables, still separating source and test directories. - More minor fixes from me. - - svn path=/trunk/; revision=52412 - -commit 7888bec -Author: Jörg Mayer -Date: Sun Oct 6 18:19:58 2013 +0000 - - Missed this part of Grahams patch. - - svn path=/trunk/; revision=52411 - -commit fb0af7e -Author: Jörg Mayer -Date: Sun Oct 6 18:15:43 2013 +0000 - - config.h.win32 used another solution - - svn path=/trunk/; revision=52410 - -commit d28324b -Author: Jörg Mayer -Date: Sun Oct 6 18:11:41 2013 +0000 - - Add a comment about PCAP_VERSION - - svn path=/trunk/; revision=52409 - -commit 59cca50 -Author: Jörg Mayer -Date: Sun Oct 6 18:11:05 2013 +0000 - - Finding GTK3 works now, but the list of libs is incomplete - - svn path=/trunk/; revision=52408 - -commit 433ea57 -Author: Jörg Mayer -Date: Sun Oct 6 17:04:18 2013 +0000 - - Remove trailing whitespace - - svn path=/trunk/; revision=52407 - -commit db51201 -Author: Jörg Mayer -Date: Sun Oct 6 16:11:50 2013 +0000 - - Set some values for Windows manually where autodetection - does not yet work. - - svn path=/trunk/; revision=52406 - -commit efb42cf -Author: Jörg Mayer -Date: Sun Oct 6 15:56:30 2013 +0000 - - Rewrite FindPCAP.cmake to current practices - - svn path=/trunk/; revision=52405 - -commit 07f25c7 -Author: Michael Mann -Date: Sun Oct 6 15:51:31 2013 +0000 - - WebSphere MQ V7 Bug Fix 8322 TSHM_EBCDIC. Bug 9198 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9198) - - From Ed Beroset. - - svn path=/trunk/; revision=52404 - -commit eda89e5 -Author: Michael Mann -Date: Sun Oct 6 15:38:32 2013 +0000 - - Improve "eHRPD Indicator" NVSE dissection in 3GPP2 A11 Registration Request. Bug 9206 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9206) - - From Masayuki Takemura - - svn path=/trunk/; revision=52403 - -commit 81a0f15 -Author: Evan Huus -Date: Sun Oct 6 14:15:38 2013 +0000 - - Try to fix unittest path magic on windows. - - svn path=/trunk/; revision=52400 - -commit fc4c37c -Author: Gerald Combs -Date: Sun Oct 6 14:03:44 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-10-06] - - svn path=/trunk/; revision=52399 - -commit 0faf9a0 -Author: Evan Huus -Date: Sun Oct 6 13:22:12 2013 +0000 - - Rewrite the layout case statement as two separate ones, grouping and using - fallthrough to reduce the amount of duplication. - - svn path=/trunk/; revision=52398 - -commit e0cc11c -Author: Evan Huus -Date: Sun Oct 6 12:44:10 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174 - - Support running most tests out-of-tree. Use case is to have a source tree and - use a semi-unprivileged user to perform tests (to rule out interference). - - From me: - - fix unit-test suite, it has to build the binaries it runs so it must - more-or-less ignore the out-of-tree stuff - - fix name-res suite, just missing a path qualifier - - - svn path=/trunk/; revision=52397 - -commit f5cebd0 -Author: Jörg Mayer -Date: Sun Oct 6 12:25:46 2013 +0000 - - Hack around the "/MD overridden by /MDd" messages. - Better solutions welcome. - - svn path=/trunk/; revision=52396 - -commit 5cd147c -Author: Jörg Mayer -Date: Sun Oct 6 10:40:46 2013 +0000 - - The recent update to asn2wrs affected one additional dissector. - - svn path=/trunk/; revision=52395 - -commit 94f0e1f -Author: Michael Mann -Date: Sun Oct 6 02:42:14 2013 +0000 - - Fully support relative AP-titles in C12.22. Bug 9196 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9196) - - From Ed Beroset - - svn path=/trunk/; revision=52394 - -commit ee208c8 -Author: Michael Mann -Date: Sun Oct 6 02:31:10 2013 +0000 - - Add support for RELATIVE-OID ASN.1 type. Bug 9192 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9192) - - From Ed Beroset. - - svn path=/trunk/; revision=52393 - -commit 625fbd5 -Author: Michael Mann -Date: Sun Oct 6 02:07:47 2013 +0000 - - Allow a "more complex" algorithm to finding proto_tree_add_text overuse. Disabled by default, but used when I want to go on an add filterability spree. convert_proto_tree_add_text.pl makes these easier to fix, so why not be pickier about the percentages that dissectors use. - - svn path=/trunk/; revision=52392 - -commit 7f36cf3 -Author: Michael Mann -Date: Sun Oct 6 01:53:26 2013 +0000 - - Add IEEE802.11ac VHT NDP announcement dissection. Bug 9224 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9224) - - From Luca Coelho - - From me: make sure return value of tvb_length_remaining is positive. - - svn path=/trunk/; revision=52391 - -commit 5d7b8db -Author: Michael Mann -Date: Sun Oct 6 01:14:46 2013 +0000 - - Improved zebra dissector. Bug 9219 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9219) - - From Hannes Hofer - - From me: some cleanup noticed during review. - - svn path=/trunk/; revision=52390 - -commit b3f440f -Author: Gerald Combs -Date: Sat Oct 5 22:51:02 2013 +0000 - - Add a link to GammaRay. - - svn path=/trunk/; revision=52389 - -commit 0db37a0 -Author: Gerald Combs -Date: Sat Oct 5 22:47:43 2013 +0000 - - Make the task list colors more consistent. - - svn path=/trunk/; revision=52388 - -commit 29bcbc5 -Author: Jörg Mayer -Date: Sat Oct 5 22:41:09 2013 +0000 - - (Hopefully) unbreak windows build (#define'ing to 0 is not - undefined). - - svn path=/trunk/; revision=52387 - -commit c37cd6b -Author: Gerald Combs -Date: Sat Oct 5 22:39:49 2013 +0000 - - Fix the white-rectangle-at-startup artifact with the help of GammaRay[1]. - - Make extra_split_ a member variable again. Make it and master_split_ - full-on values. Set various parent/child relationships at startup - so that each widget is associated with a layout (which appears to be - the actual fix). - - Make the throttled startup delay huge so that it's easier to browse - using GammaRay. - - [1] https://github.com/KDAB/GammaRay - - svn path=/trunk/; revision=52386 - -commit 07a5c74 -Author: Jörg Mayer -Date: Sat Oct 5 21:56:23 2013 +0000 - - Invert NEED_INET_ATON_H to HAVE_INET_ATON_H - Remove unused NEED_G_ASCII_STRTOULL_H - - svn path=/trunk/; revision=52385 - -commit f303dfd -Author: Jörg Mayer -Date: Sat Oct 5 21:23:57 2013 +0000 - - Fix a typo (letover from autotools times) which accidentally - worked with cmake on unix but not on windows - - svn path=/trunk/; revision=52384 - -commit 5c1eafd -Author: Evan Huus -Date: Sat Oct 5 21:00:25 2013 +0000 - - From Peter A. Bigot via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9225 - - Fix CoAP option decoding. It's perfectly acceptable for the Payload Marker to - appear with no preceding options. Without this check such a situation produces - an invalid diagnostic: end-of-options marker found, but option length isn't 15 - - svn path=/trunk/; revision=52383 - -commit eb1ee41 -Author: Jörg Mayer -Date: Sat Oct 5 20:49:44 2013 +0000 - - editcap and capinfos compile now with cmake - - svn path=/trunk/; revision=52382 - -commit 8b4c5a5 -Author: Martin Kaiser -Date: Sat Oct 5 18:57:15 2013 +0000 - - remove some more if (tree) checks - - svn path=/trunk/; revision=52381 - -commit 21b5802 -Author: Martin Kaiser -Date: Sat Oct 5 18:42:54 2013 +0000 - - add editor modelines - - svn path=/trunk/; revision=52380 - -commit 71a4ec8 -Author: Martin Kaiser -Date: Sat Oct 5 18:38:25 2013 +0000 - - remove some unnecessary if (tree) checks - - svn path=/trunk/; revision=52379 - -commit a15760b -Author: Martin Kaiser -Date: Sat Oct 5 18:29:17 2013 +0000 - - From Jacob Erlbeck - - Fix GPRS-NS protocol dissector for STATUS PDU - - When a NS-STATUS message contains a PDU, the packet description - refers to the contained PDU and the offset is wrong, thus finding - information elements that are not present. - - This fixes the implementation by checking, whether the PDU dissector - has been called recursively and by updating the offset correctly. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9221 - - (from me: use gboolean, separate variable declaration and initialization) - - svn path=/trunk/; revision=52378 - -commit 7b3ac2a -Author: Jörg Mayer -Date: Sat Oct 5 10:17:21 2013 +0000 - - Attempt to get linking working with cmake - without success so far. - - svn path=/trunk/; revision=52377 - -commit 438f4be -Author: Guy Harris -Date: Sat Oct 5 09:13:14 2013 +0000 - - More debugging. - - svn path=/trunk/; revision=52376 - -commit d7ab7a8 -Author: Graham Bloice -Date: Sat Oct 5 08:02:17 2013 +0000 - - Updated instructions for Windows CMake usage when build a Visual Studio solution. - - svn path=/trunk/; revision=52375 - -commit 83d4da3 -Author: Jörg Mayer -Date: Fri Oct 4 23:46:08 2013 +0000 - - Document a little progress wrt cmake windows builds. - - svn path=/trunk/; revision=52374 - -commit 150fb74 -Author: Jörg Mayer -Date: Fri Oct 4 23:23:16 2013 +0000 - - Make runlex.sh work on Windows - - svn path=/trunk/; revision=52373 - -commit 21bfea7 -Author: Jörg Mayer -Date: Fri Oct 4 22:18:57 2013 +0000 - - Looks like we have problems invoking shell scripts from - cmake on windows - so explicitely run the shell with the - script as argument - - svn path=/trunk/; revision=52372 - -commit afb568c -Author: Jörg Mayer -Date: Fri Oct 4 22:08:46 2013 +0000 - - libwsutil needs to link against libgmodule2 - - svn path=/trunk/; revision=52371 - -commit 30f0ea3 -Author: Jörg Mayer -Date: Fri Oct 4 21:59:18 2013 +0000 - - ssize_t is missing on Windows, so typdef it. - - svn path=/trunk/; revision=52370 - -commit 1f278f0 -Author: Graham Bloice -Date: Fri Oct 4 17:32:04 2013 +0000 - - Updated email address for Chris Bontje and myself. - - svn path=/trunk/; revision=52369 - -commit de3867e -Author: Jörg Mayer -Date: Fri Oct 4 16:55:33 2013 +0000 - - The PERL variable name is deprecated, use PERL_EXECUTABLE instead. - - svn path=/trunk/; revision=52368 - -commit 3c96218 -Author: Jörg Mayer -Date: Fri Oct 4 16:55:04 2013 +0000 - - Get pod2man to work on windows: call via perl - - svn path=/trunk/; revision=52367 - -commit 8fcf96c -Author: Martin Kaiser -Date: Fri Oct 4 16:07:26 2013 +0000 - - header length includes the adaptation header - - svn path=/trunk/; revision=52366 - -commit e6080d0 -Author: Martin Mathieson -Date: Fri Oct 4 16:05:18 2013 +0000 - - More DRX changes - - svn path=/trunk/; revision=52365 - -commit 9c0f237 -Author: Jörg Mayer -Date: Fri Oct 4 15:51:59 2013 +0000 - - Add a missing file on the Windows platform. - Add missing $Id$ tags. - - svn path=/trunk/; revision=52364 - -commit 6c498c7 -Author: Jörg Mayer -Date: Fri Oct 4 15:42:23 2013 +0000 - - Add Win support (and add a "hacked" case where the zlib - stuff has been compiled in place but not installed) - - svn path=/trunk/; revision=52363 - -commit 8f46fd5 -Author: Martin Kaiser -Date: Fri Oct 4 15:40:24 2013 +0000 - - TABs -> spaces - - svn path=/trunk/; revision=52362 - -commit 325d831 -Author: Jörg Mayer -Date: Fri Oct 4 15:10:27 2013 +0000 - - Detecting these modules finally works on Windows setup - - svn path=/trunk/; revision=52361 - -commit 319d0fb -Author: Jörg Mayer -Date: Fri Oct 4 13:22:36 2013 +0000 - - Cleanup similar to FindGTHREAD2.cmake - - svn path=/trunk/; revision=52360 - -commit 2103728 -Author: Jörg Mayer -Date: Fri Oct 4 13:22:01 2013 +0000 - - Remove now unneeded stuff missed by previous cleanup. - - svn path=/trunk/; revision=52359 - -commit 5ec13cf -Author: Jörg Mayer -Date: Fri Oct 4 13:08:21 2013 +0000 - - Remove a debug "printf" - - svn path=/trunk/; revision=52358 - -commit 67bae10 -Author: Martin Kaiser -Date: Fri Oct 4 12:52:36 2013 +0000 - - in a uat dialogue, allow only one popup for confirming a deletion of an - element - - this should at least partially fix bug 9129 - - svn path=/trunk/; revision=52357 - -commit 00ab245 -Author: Jörg Mayer -Date: Fri Oct 4 12:49:06 2013 +0000 - - Replace the old version by a more modern one that only - tries to find glib2 and not other stuff as well. - Not tested on OS X due to problems with my build environment. - - svn path=/trunk/; revision=52356 - -commit a1c82a0 -Author: Martin Kaiser -Date: Fri Oct 4 12:21:17 2013 +0000 - - dissect the remaining components of the smart card descriptor - (without going into too much detail) - - svn path=/trunk/; revision=52355 - -commit cf3ac5e -Author: Pascal Quantin -Date: Fri Oct 4 10:29:57 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9228 : - Ensure that decompressed tvb exists before trying to add it to the tree - - svn path=/trunk/; revision=52354 - -commit 2ab20bf -Author: Graham Bloice -Date: Fri Oct 4 10:12:13 2013 +0000 - - From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9195: - - Added object decoding for Device Attributes - Added object decoding for IIN read - Improved decoding of Counter Freeze objects - - svn path=/trunk/; revision=52353 - -commit f485bea -Author: Jörg Mayer -Date: Fri Oct 4 08:13:07 2013 +0000 - - Update coding style, use FIND_PACKAGE_HANDLE_STANDARD_ARGS - instead of doing handmade stuff to the same effect. - - svn path=/trunk/; revision=52352 - -commit 0e6a533 -Author: Jörg Mayer -Date: Fri Oct 4 07:48:25 2013 +0000 - - Fix a typo - - svn path=/trunk/; revision=52351 - -commit e56915b -Author: Jörg Mayer -Date: Fri Oct 4 07:41:43 2013 +0000 - - Fogot to set the _INCLUDE_DIRS variable, thus it - would only work on platforms where the required path got set for - another package - - svn path=/trunk/; revision=52350 - -commit 76c769e -Author: Evan Huus -Date: Fri Oct 4 02:21:39 2013 +0000 - - Initialize the SegmentType to the appropriate "Unknown" value so that if the - subdissector bails early we don't use uninitialized memory. Also add modelines. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9226 - - svn path=/trunk/; revision=52349 - -commit 58e2773 -Author: Guy Harris -Date: Fri Oct 4 01:55:16 2013 +0000 - - Rename epan/dissectors/packet-s5066.c to - epan/dissectors/packet-s5066sis.c, to clarify that it's not for STANAG - 5066 as a whole, but just for the Subnetwork Interface Sublayer. - There's currently an enhancement to support the Data Transport Sublayer, - which adds a epan/dissectors/packet-s5066dts.c file. - - svn path=/trunk/; revision=52348 - -commit e0cb13c -Author: Evan Huus -Date: Fri Oct 4 00:33:58 2013 +0000 - - From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9215 - - better handling of CAUT Structure in mq dissector - - svn path=/trunk/; revision=52347 - -commit 1805a79 -Author: Evan Huus -Date: Fri Oct 4 00:30:57 2013 +0000 - - Mark unused parameter. - - svn path=/trunk/; revision=52346 - -commit 3dc5f04 -Author: Pascal Quantin -Date: Thu Oct 3 22:09:28 2013 +0000 - - Add dissection of MBIM (extended) functional descriptor - - svn path=/trunk/; revision=52345 - -commit a2f8b3d -Author: Pascal Quantin -Date: Thu Oct 3 21:46:20 2013 +0000 - - Try to please Linux and OSX buildbots - - svn path=/trunk/; revision=52344 - -commit 246077e -Author: Pascal Quantin -Date: Thu Oct 3 18:20:09 2013 +0000 - - Fix dissection of MBIM_PIN_LIST_INFO - - svn path=/trunk/; revision=52343 - -commit a0201b0 -Author: Martin Mathieson -Date: Thu Oct 3 15:04:39 2013 +0000 - - More DRX changes - getting closer (still mostly untested) - - svn path=/trunk/; revision=52342 - -commit a891f3e -Author: Michael Mann -Date: Thu Oct 3 01:54:02 2013 +0000 - - Make expert items used in "low level" proto functions filterable (and ensure they are called even with a NULL tree). I don't really like the Type Length Mismatch "protocol", but it doesn't seem that much different than the exception "protocols". - - svn path=/trunk/; revision=52341 - -commit b9eecb6 -Author: Guy Harris -Date: Thu Oct 3 00:33:30 2013 +0000 - - Report what file we were using to determine the architecture. - - svn path=/trunk/; revision=52340 - -commit 85779fa -Author: Pascal Quantin -Date: Wed Oct 2 20:17:29 2013 +0000 - - Remove C++ comments - - svn path=/trunk/; revision=52339 - -commit 539b24f -Author: Pascal Quantin -Date: Wed Oct 2 19:59:35 2013 +0000 - - From Audric Schiltknecht via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9218 : - Fix typo in MODCOD list of DVB-S2 dissector - - svn path=/trunk/; revision=52338 - -commit 99422f3 -Author: Pascal Quantin -Date: Wed Oct 2 19:52:42 2013 +0000 - - Add dissection of GSM/CDMA SMS in PDU mode - - svn path=/trunk/; revision=52337 - -commit 76e8ff1 -Author: Pascal Quantin -Date: Wed Oct 2 18:04:06 2013 +0000 - - Replace the 3 dissector tables (with a single entry in each) by a direct call to the GSM SMS dissector - - svn path=/trunk/; revision=52336 - -commit f7c8ee4 -Author: Alexis La Goutte -Date: Wed Oct 2 17:56:27 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9216 ssl: Support PSK larger than 16 octets - - PSK allows up to 2^16-1 octets as key according to RFC 4279 (PSK for - TLS). Therefore remove the restriction of 16 octets. While at it, skip - testing for negative size as this is unnecessary. - - Reported at: - http://ask.wireshark.org/questions/25157/can-not-decrypt-ssl-psk-traffic - - svn path=/trunk/; revision=52335 - -commit 5685440 -Author: Pascal Quantin -Date: Wed Oct 2 17:33:19 2013 +0000 - - Let's please fix-encoding-args.pl - - svn path=/trunk/; revision=52334 - -commit 4b18251 -Author: Martin Mathieson -Date: Wed Oct 2 16:51:10 2013 +0000 - - More progress on DRX checking - - svn path=/trunk/; revision=52333 - -commit 07fb69f -Author: Pascal Quantin -Date: Wed Oct 2 16:40:06 2013 +0000 - - Revert files committed by mistake in r52331 - - svn path=/trunk/; revision=52332 - -commit 5d183ee -Author: Pascal Quantin -Date: Wed Oct 2 16:37:10 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9211 : - Add basic conversation support for rtpproxy dissector - - svn path=/trunk/; revision=52331 - -commit 1d4b8d6 -Author: Pascal Quantin -Date: Wed Oct 2 15:33:00 2013 +0000 - - From Pavel via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9204 : - Fix parsing of padding in RTP header extension - - svn path=/trunk/; revision=52330 - -commit 1e14c2d -Author: Michael Mann -Date: Wed Oct 2 01:43:39 2013 +0000 - - Textual corrections to EtherNet/IP dissector. Bug 9213 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9213) - - From Joakim Wiberg - - From me: Change blurbs to NULL since they are duplicates of field name. - - svn path=/trunk/; revision=52329 - -commit e2351b6 -Author: Evan Huus -Date: Tue Oct 1 22:57:35 2013 +0000 - - Convert an _add_bytes to an _add_item (it used to be an _add_bytes_format prior - to r52272; that treats NULL as get-from-the-tvb, whereas _add_bytes treats NULL - as an error). - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9214 - - svn path=/trunk/; revision=52328 - -commit ccbb52b -Author: Evan Huus -Date: Tue Oct 1 22:50:29 2013 +0000 - - Add a dissector assert to _set_bytes like the one in _set_oid, noticed while - debugging https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9214 - - svn path=/trunk/; revision=52327 - -commit 1b9b3dc -Author: Guy Harris -Date: Tue Oct 1 21:54:20 2013 +0000 - - Undo my previous manual undo of an RTF change made by the Mountain Lion - version of TextEdit, so that this is solely the result of TextEdit. - - svn path=/trunk/; revision=52324 - -commit 4c16969 -Author: Gerald Combs -Date: Tue Oct 1 21:43:51 2013 +0000 - - Add Wireshark back to the GTK+ package. - - svn path=/trunk/; revision=52323 - -commit e83ce4b -Author: Guy Harris -Date: Tue Oct 1 21:41:54 2013 +0000 - - We install the wrapper scripts for the command-line tools in - /usr/local/bin, not in /Library/Wireshark. - - svn path=/trunk/; revision=52322 - -commit 99f457b -Author: Gerald Combs -Date: Tue Oct 1 21:04:13 2013 +0000 - - Use separate "Read me first" files for Qt and GTK+. - - svn path=/trunk/; revision=52321 - -commit 4e6f6a5 -Author: Alexis La Goutte -Date: Tue Oct 1 19:35:34 2013 +0000 - - Enable RC2 support with libgcrypt - - The name "RC2" is not used by libgcrypt, instead it uses - "RFC2268_". RFC2268_40 and RFC2268_128 are both documented, - though only RFC2268_40 is implemented right now. - - As documented in RFC2246 (TLS 1.0), section 6.3.1 Export key generation - example, exportable ciphers (in this case, the - TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 cipher) only use 40 bits of the - key_block, but the real key (final_{client,server}_write_key) used for - the actual algorithm (RC2) is still 16 bytes (128 bits). Therefore - RFC2268_128 is the correct name to use. - - As libgcrypt 1.5.3 does not support the 128-bit keys, I have submitted a - patch for libgcrypt to support the larger 128-bit rc2 keys has been - submitted to gcrypt-devel@gnupg.org (it sits in their mail queue as I am - not subscribed). - - svn path=/trunk/; revision=52320 - -commit 6b00384 -Author: Alexis La Goutte -Date: Tue Oct 1 19:34:00 2013 +0000 - - Update Aruba dictionary (from ArubaOS 6.3 and ClearPass 6.2) - - svn path=/trunk/; revision=52319 - -commit b3c3bd6 -Author: Martin Mathieson -Date: Tue Oct 1 16:19:42 2013 +0000 - - Call mac_lte_drx_control_element_received and make it static again - - svn path=/trunk/; revision=52318 - -commit d6950e2 -Author: Michael Mann -Date: Tue Oct 1 15:30:22 2013 +0000 - - FINALLY remove the check_col API so that reviewers won't have to mention that it's deprecated. Now it just won't compile if its included in a dissector. - - svn path=/trunk/; revision=52317 - -commit 12dd69e -Author: Michael Mann -Date: Tue Oct 1 15:14:59 2013 +0000 - - Remove check_col. - - svn path=/trunk/; revision=52316 - -commit df58485 -Author: Pascal Quantin -Date: Tue Oct 1 14:49:01 2013 +0000 - - From Didier Gautheron via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9210 : - Add 'deflate' to SIP Content-Encoding - - svn path=/trunk/; revision=52315 - -commit 8e2c3ba -Author: Pascal Quantin -Date: Tue Oct 1 14:47:03 2013 +0000 - - Add MPS extensions as found on http://compliance.usb.org/mbim/ - - svn path=/trunk/; revision=52314 - -commit 0334c5b -Author: Michael Mann -Date: Tue Oct 1 14:45:03 2013 +0000 - - Remove check_col from generated DCE/RPC dissectors. Bug 8804 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8804). - - I still couldn't figure out how to generate the source, so I made the modifications to the generated dissectors "manually" (search/replace tool in VS) that would match the "PIDL source" included here. - - I will be sending the "PIDL source" (non dissector files) to the samba team. - - svn path=/trunk/; revision=52313 - -commit c6371f0 -Author: Evan Huus -Date: Tue Oct 1 13:09:51 2013 +0000 - - Add cast. - - svn path=/trunk/; revision=52312 - -commit 3955de8 -Author: Evan Huus -Date: Tue Oct 1 13:07:25 2013 +0000 - - Add some additional checks around the radiotap iterator initialization, to fix - the invalid access errors in - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9212 - - (also add modelines) - - svn path=/trunk/; revision=52311 - -commit 55371ca -Author: Michael Mann -Date: Tue Oct 1 13:02:12 2013 +0000 - - Remove check_col for all non-generated DCE/RPC dissectors. - - svn path=/trunk/; revision=52310 - -commit 233a6cd -Author: Pascal Quantin -Date: Tue Oct 1 07:41:30 2013 +0000 - - Sort alphabetically the list - - svn path=/trunk/; revision=52309 - -commit 3c10ffd -Author: Pascal Quantin -Date: Mon Sep 30 20:38:23 2013 +0000 - - Plug MBIM dissector to USB one - With this change and the use of USBPcap, it becomes possible to dissect MBIM messages on Windows 8.1 - - svn path=/trunk/; revision=52308 - -commit d837d9f -Author: Pascal Quantin -Date: Mon Sep 30 20:36:38 2013 +0000 - - Fix compilation warnings - - svn path=/trunk/; revision=52307 - -commit 5cb299d -Author: Pascal Quantin -Date: Mon Sep 30 20:16:58 2013 +0000 - - Add basic request / response tracking - - svn path=/trunk/; revision=52306 - -commit 5e641a6 -Author: Pascal Quantin -Date: Mon Sep 30 20:14:42 2013 +0000 - - Add identification of Windows 8.1 / Windows Server 2012 R2 - - svn path=/trunk/; revision=52305 - -commit 1e5ff91 -Author: Michael Mann -Date: Mon Sep 30 18:02:32 2013 +0000 - - Add some expert info. The main reason for doing this was there were a bunch of proto_tree_add_bytes_format calls that were passing hf_ variables that weren't of type FT_BYTES, and I assume that should lead to a dissector assert/fuzzbot failure. - - For consistency all places that "didn't have enough bytes", got an expert message, regardless of whether the upcoming field itself was a FT_BYTES type. - - svn path=/trunk/; revision=52304 - -commit 2d1b16f -Author: Gerald Combs -Date: Mon Sep 30 17:33:59 2013 +0000 - - The Qt executables shouldn't need any wrappers. Just copy them over - as-is. - - svn path=/trunk/; revision=52303 - -commit 5687b33 -Author: Gerald Combs -Date: Mon Sep 30 17:19:48 2013 +0000 - - Make sure we copy Wireshark's libraries to Frameworks. Use top_builddir - instead of top_srcdir. It shouldn't make any difference in our case but - it's more correct. - - svn path=/trunk/; revision=52302 - -commit c70b1a5 -Author: Michael Mann -Date: Mon Sep 30 16:10:40 2013 +0000 - - Convert proto_tree_add_int_format calls to proto_tree_add_int_format_value where appropriate. - - svn path=/trunk/; revision=52301 - -commit 50fd09f -Author: Michael Mann -Date: Mon Sep 30 15:59:27 2013 +0000 - - Convert proto_tree_add_int64_format calls to proto_tree_add_int64_format_value where appropriate. - - svn path=/trunk/; revision=52300 - -commit ffaeb8a -Author: Michael Mann -Date: Mon Sep 30 15:52:24 2013 +0000 - - Convert proto_tree_add_uint64_format calls to proto_tree_add_uint64_format_value where appropriate. - - svn path=/trunk/; revision=52299 - -commit 47bca84 -Author: Michael Mann -Date: Mon Sep 30 15:42:18 2013 +0000 - - Convert proto_tree_add_double_format calls to proto_tree_add_double_format_value where appropriate. - - svn path=/trunk/; revision=52298 - -commit 097feb5 -Author: Gerald Combs -Date: Mon Sep 30 15:37:11 2013 +0000 - - Be a little more verbose. - - svn path=/trunk/; revision=52297 - -commit cf80442 -Author: Michael Mann -Date: Mon Sep 30 15:21:09 2013 +0000 - - Convert some proto_tree_add_string_format calls to something more appropriate. - - There seem to be several cases of proto_tree_add_string_format where a "string" value/filter doesn't really make sense because it's always empty, and is just being used as a "filterable subtree header (placeholder)". They appear to be more for "presense" than "value" and should probably be FT_NONE, although I'd almost argue for removing the filter in favor of proto_tree_add_text. - - svn path=/trunk/; revision=52296 - -commit 2211ab0 -Author: Gerald Combs -Date: Mon Sep 30 13:12:28 2013 +0000 - - Use macdeployqt to add the Qt bits to our bundle. Put our libraries in - Contents/Frameworks since that's what macdeployqt expects. Have - osx-dmg.sh look at the correct executable. - - svn path=/trunk/; revision=52295 - -commit 67da8b6 -Author: Evan Huus -Date: Mon Sep 30 11:57:14 2013 +0000 - - From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9160 - - Extend the BPDU dissector in packet-bpdu.c so that it recognizes and displays - the PVID TLV in Cisco's PVST+/RPVST+ BPDUs. - - svn path=/trunk/; revision=52294 - -commit 2468b33 -Author: Gerald Combs -Date: Mon Sep 30 11:29:58 2013 +0000 - - More Qt app bundle migration. Still doesn't work quite right. - - svn path=/trunk/; revision=52293 - -commit 0a75c9d -Author: Gerald Combs -Date: Mon Sep 30 10:20:43 2013 +0000 - - Start migrating the OS X app bundle to Qt. This will likely break the - installers. - - svn path=/trunk/; revision=52292 - -commit acf8fbb -Author: Martin Mathieson -Date: Mon Sep 30 10:15:50 2013 +0000 - - Deep copy needed (clang warning flagged by Alexis!) - - svn path=/trunk/; revision=52291 - -commit 88c79b0 -Author: Alexis La Goutte -Date: Mon Sep 30 09:03:41 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=52290 - -commit 3776270 -Author: Alexis La Goutte -Date: Mon Sep 30 09:03:28 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=52289 - -commit bdd2350 -Author: Alexis La Goutte -Date: Mon Sep 30 09:03:16 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=52288 - -commit 8a95992 -Author: Alexis La Goutte -Date: Mon Sep 30 09:03:06 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=52287 - -commit fe92d7a -Author: Alexis La Goutte -Date: Mon Sep 30 09:02:56 2013 +0000 - - Fix indent (use 4 spaces) - - svn path=/trunk/; revision=52286 - -commit 2f3a181 -Author: Alexis La Goutte -Date: Mon Sep 30 09:02:44 2013 +0000 - - Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - svn path=/trunk/; revision=52285 - -commit 098819b -Author: Alexis La Goutte -Date: Mon Sep 30 08:38:00 2013 +0000 - - Fix compile when use gzip from make dist-gzip (Missing some images) - - svn path=/trunk/; revision=52284 - -commit d5cd2f3 -Author: Jörg Mayer -Date: Mon Sep 30 08:12:46 2013 +0000 - - Don't link qtshark against portaudio - - svn path=/trunk/; revision=52283 - -commit a6f406a -Author: Gerald Combs -Date: Mon Sep 30 07:55:11 2013 +0000 - - Strip out references to PortAudio. Qt has its own audio module (Phonon). - We'll presumably use that. - - svn path=/trunk/; revision=52282 - -commit d1544e8 -Author: Evan Huus -Date: Mon Sep 30 00:05:43 2013 +0000 - - Use array_length macro in two places. Add modelines. Remove trailing whitespace. - - svn path=/trunk/; revision=52281 - -commit 9a0e88b -Author: Guy Harris -Date: Sun Sep 29 22:54:13 2013 +0000 - - For an EPB, write out an "end of options" option if we write out any - other options. - - Eliminate duplicate comment. - - Fix indentation. - - svn path=/trunk/; revision=52280 - -commit c8be3dc -Author: Pascal Quantin -Date: Sun Sep 29 22:50:27 2013 +0000 - - Add a MBIM (Mobile Broadband Interface Model) dissector - Still to be done: - - fragmentation support - - plug the MBIM dissector on USB dissector - - svn path=/trunk/; revision=52279 - -commit 5cd75ac -Author: Jörg Mayer -Date: Sun Sep 29 22:40:25 2013 +0000 - - As pointed out in bug 9127, tcpdump dissects Juniper Attributes - quite well - reimplement that in Wireshark. - - There is room for improvement in this patch, e.g. use subtrees for - the subattributes. - - svn path=/trunk/; revision=52278 - -commit 3a57abe -Author: Guy Harris -Date: Sun Sep 29 22:20:32 2013 +0000 - - Add a routine to return the length of a string option, given the string; - 0 means "this option won't be written", and use it when writing pcap-ng - blocks. - - svn path=/trunk/; revision=52277 - -commit f3e28f3 -Author: Evan Huus -Date: Sun Sep 29 21:06:44 2013 +0000 - - Remove unused variable. - - svn path=/trunk/; revision=52276 - -commit b068763 -Author: Guy Harris -Date: Sun Sep 29 20:53:13 2013 +0000 - - Rename routines that write pcap-ng files to "pcapng_xxx" rather than - "libpcap_xxx". - - Rename the low-level write routine in pcapio.c to write_to_file(), as - it's used for both pcap and pcap-ng files. - - svn path=/trunk/; revision=52275 - -commit c42263f -Author: Guy Harris -Date: Sun Sep 29 20:26:25 2013 +0000 - - We always write to a FILE *, so: - - make libpcap_write_to_file() static; - - don't pass it as an argument to write routines, just have them - call it directly; - - make the handle argument a FILE *. - - Make the data length argument to libpcap_write_to_file() a size_t, as - that's what, for example, fwrite() takes as a size argument. - - svn path=/trunk/; revision=52274 - -commit 9b2ecdc -Author: Guy Harris -Date: Sun Sep 29 19:11:37 2013 +0000 - - Use a common routine to write out string options. - - This fixes a problem noted in bug 9202, where the calculation of the - padding for the SHB_HARDWARE option was wrong. - - svn path=/trunk/; revision=52273 - -commit e6f1bd9 -Author: Michael Mann -Date: Sun Sep 29 18:19:29 2013 +0000 - - Convert several proto_tree_add_bytes_format calls to proto_tree_add_bytes_format_value. - - svn path=/trunk/; revision=52272 - -commit 33583f2 -Author: Guy Harris -Date: Sun Sep 29 18:07:33 2013 +0000 - - Removing the assignments to "str" was an error, as its value is returned - from the functions. - - svn path=/trunk/; revision=52271 - -commit 33ae47f -Author: Michael Mann -Date: Sun Sep 29 17:18:56 2013 +0000 - - Cleanup some proto_tree_add_ipv4_format calls that shouldn't be. - - svn path=/trunk/; revision=52270 - -commit e584687 -Author: Michael Mann -Date: Sun Sep 29 16:40:01 2013 +0000 - - Convert proto_tree_add_time_format to either proto_tree_add_time or proto_tree_add_time_format_value. - - Only proto_tree_add_time_format calls remaining are in packet-ncp2222.inc, which may just need some additional filters. - - svn path=/trunk/; revision=52269 - -commit da2adc7 -Author: Michael Mann -Date: Sun Sep 29 15:49:04 2013 +0000 - - Convert proto_tree_add_ipxnet_format to proto_tree_add_ipxnet_format_value. Now proto_tree_add_ipxnet_format is currently unused. - - svn path=/trunk/; revision=52268 - -commit afc9629 -Author: Gerald Combs -Date: Sun Sep 29 14:03:41 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-09-29] - - svn path=/trunk/; revision=52265 - -commit c1dd5d3 -Author: Evan Huus -Date: Sun Sep 29 12:44:50 2013 +0000 - - Replace some val_to_str calls with the equivalent val_to_str_const calls (and - implement rval_to_str_const to do this). The format-strings didn't have any - parameter specifiers in them, so they were clearly never used (or they would - have blown up) but still a bug. - - This is one of the first steps towards converting val_to_str and friends to - wmem. I'm honestly not sure what the best approach is for the API in this case: - the vast majority of usage is within dissectors, so just hard-coding packet - scope (the way they currently hard-code ep_ scope) doesn't look terrible, but - there are *some* uses in taps and other places that will need to be converted to - something else if we go that route. Adding a wmem_pool parameter just for the - uncommon case seems a bit like overkill, though perhaps it is the right thing to - do. - - svn path=/trunk/; revision=52264 - -commit 640a45d -Author: Guy Harris -Date: Sun Sep 29 00:37:04 2013 +0000 - - Get rid of a redundant check - pcapng_read_packet_block() already checks - whether the (zero-based) interface ID is < the number of interface IDs, - so we don't need to do so in pcapng_read(). - - Unions are tricky - if the compiler doesn't ensure that the right - component of the union is being used at any given time, various problems - can happen. - - Remove some members from the "data" union in the wtapng_block_t - structure, and use a local variable of the specified type. - - svn path=/trunk/; revision=52262 - -commit dc0b725 -Author: Evan Huus -Date: Sat Sep 28 23:45:18 2013 +0000 - - Don't assert that the key to a wmem tree operation is short. If XMPP wants to - use a 1500-byte string as a key, so be it. It will be slow, but at least it will - work. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9078 - - svn path=/trunk/; revision=52261 - -commit dcbc510 -Author: Evan Huus -Date: Sat Sep 28 23:26:23 2013 +0000 - - From Peter Van Eynde via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9187 - - Fix some minor length calculation mistakes in the WCCP decoder. - - svn path=/trunk/; revision=52260 - -commit 5cbfbf3 -Author: Guy Harris -Date: Sat Sep 28 21:29:11 2013 +0000 - - Make the sample "The following bugs have been fixed:" entry match the - syntax used in actual release notes we've shipped (putting the buglist - link in parentheses). - - svn path=/trunk/; revision=52257 - -commit 18aea72 -Author: Guy Harris -Date: Sat Sep 28 21:25:44 2013 +0000 - - Mention bug 9200 being fixed. - - svn path=/trunk/; revision=52256 - -commit 658a162 -Author: Guy Harris -Date: Sat Sep 28 21:06:17 2013 +0000 - - The pcap-ng spec says the captured length is the minimum of the - interface snapshot length and the packet length; make it so. - - svn path=/trunk/; revision=52253 - -commit d399dcb -Author: Guy Harris -Date: Sat Sep 28 20:08:39 2013 +0000 - - Actually, the captured length must be the minimum of: - - the number of bytes available for packet data in the block; - - the packet length; - - *and* the snapshot length for the interface. - - One more fix for bug 9200, so it should *now* be fixed. - - svn path=/trunk/; revision=52250 - -commit 1d00d58 -Author: Guy Harris -Date: Sat Sep 28 19:26:23 2013 +0000 - - Fix cut-and-pasteo. - - Finishes the fix for bug 9200. - - svn path=/trunk/; revision=52247 - -commit bdd2378 -Author: Guy Harris -Date: Sat Sep 28 18:25:07 2013 +0000 - - Correctly calculate the captured length in a Simple Packet Block - - subtract out the minimum SPB size, which includes the length of - *everything* except for the packet data. - - Fixes one problem found by the file in bug 9200. - - svn path=/trunk/; revision=52244 - -commit a582b72 -Author: Guy Harris -Date: Sat Sep 28 18:03:20 2013 +0000 - - In a Simple Packet Block, the captured length isn't the block length - minus the lengths of the two length fields and the packet length field, - it's the minimum of that and the packet length, as there might be - padding. - - Fixes one problem found by the file in bug 9200. - - While we're at it, pcapng_read_packet_block() and - pcapng_read_simple_packet_block() return an integer, not a Boolean; - return 0, not FALSE (they have the same value, but returning 0 makes it - clearer that the return value isn't restricted to TRUE or FALSE). - - svn path=/trunk/; revision=52241 - -commit 12912b6 -Author: Guy Harris -Date: Sat Sep 28 17:44:50 2013 +0000 - - There's no interface ID in a Simple Packet Block. - - Fixes one problem found by the file in bug 9200. - - svn path=/trunk/; revision=52238 - -commit 8157963 -Author: Anders Broman -Date: Sat Sep 28 08:58:06 2013 +0000 - - Start dissect multipart messages. - - svn path=/trunk/; revision=52237 - -commit ca52337 -Author: Evan Huus -Date: Sat Sep 28 02:41:49 2013 +0000 - - Fix various warnings in (hopefully) the right ways. - - svn path=/trunk/; revision=52236 - -commit e5379de -Author: Michael Mann -Date: Sat Sep 28 00:45:44 2013 +0000 - - 1. Remove PITEM_FINFO from add_tlv_subtree and add_protocol_subtree (as well as some other minor cleanup) and adjust the calling functions accordingly. - - 2. Converted several add_protocol_subtree calls to add_tlv_subtree to get true filterability. Many of the add_protocol_subtree are effectively being (ab)used as proto_tree_add_text with different highlighting. - - 3. Convert tvb_new_subset into tvb_new_subset_length. - - Still looks like some of the remaining "protocols" need more specific filters, and should just be regular FT_BYTES fields. - - svn path=/trunk/; revision=52235 - -commit 21bcd56 -Author: Jörg Mayer -Date: Fri Sep 27 22:30:34 2013 +0000 - - Fix a typo (a missed replace) - - svn path=/trunk/; revision=52234 - -commit 1306b0f -Author: Jörg Mayer -Date: Fri Sep 27 20:33:29 2013 +0000 - - Hack for - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9127 - - With 6 unknown bytes leading to the two known values for the - last two bytes this cannot yet be properly dissected. Dissect - the one known case. More traces with additional properties - required to get more sense into the first 6 bytes. - - svn path=/trunk/; revision=52233 - -commit 9e93af2 -Author: Martin Mathieson -Date: Fri Sep 27 16:40:50 2013 +0000 - - And also where it is declared. Doesn't VSC++ warn about anything? - - svn path=/trunk/; revision=52232 - -commit e848820 -Author: Martin Mathieson -Date: Fri Sep 27 16:38:45 2013 +0000 - - Temporarily make an uncalled function non-static, until it gets called - - svn path=/trunk/; revision=52231 - -commit e4186e8 -Author: Martin Mathieson -Date: Fri Sep 27 16:29:05 2013 +0000 - - Remove unused parameter - - svn path=/trunk/; revision=52230 - -commit f655b55 -Author: Martin Mathieson -Date: Fri Sep 27 16:18:09 2013 +0000 - - Another step towards DRX support in LTE MAC - - svn path=/trunk/; revision=52229 - -commit 703dad7 -Author: Jörg Mayer -Date: Fri Sep 27 08:06:44 2013 +0000 - - Fix: - - /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-openflow.c: In function ‘dissect_openflow_v_1_3’: - /home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-openflow.c:1125:18: error: variable ‘version’ set but not used [-Werror=unused-but-set-variable] - guint8 type, version; - - Remove some trailing whitespace. - - svn path=/trunk/; revision=52228 - -commit 4ddecad -Author: Gerald Combs -Date: Fri Sep 27 03:33:26 2013 +0000 - - Have ChmodBPF kludge^Wcreate as many BPF devices as possible at startup. - - The welcome screen in the Qt port runs "dumpcap -S" to draw sparklines. - On OS X this means that it holds open a BPF device for each interface. - Trying to capture using another instance of Wireshark (or tcpdump, or - tshark, or...) will trigger the creation of an additional BPF device but - we won't have permission to use it. Forcing device creation at startup - works around this. - - svn path=/trunk/; revision=52227 - -commit 1662d89 -Author: Anders Broman -Date: Thu Sep 26 21:21:54 2013 +0000 - - Fix: - packet-openflow.c:577:31: error: "/*" within comment - packet-openflow.c:655:24: error: "/*" within comment - cc1: warnings being treated as errors - packet-openflow.c: In function 'dissect_openflow_features_reply_v1_3': - packet-openflow.c:671: warning: unused parameter 'pinfo' - packet-openflow.c:671: warning: unused parameter 'length' - packet-openflow.c: In function 'dissect_openflow_multipart_request_v1_3': - packet-openflow.c:809: warning: unused parameter 'pinfo' - packet-openflow.c:809: warning: unused parameter 'length' - packet-openflow.c: At top level: - packet-openflow.c:1033: warning: return type defaults to 'int' - packet-openflow.c:1119: warning: return type defaults to 'int' - - svn path=/trunk/; revision=52226 - -commit 408ba7b -Author: Anders Broman -Date: Thu Sep 26 21:15:44 2013 +0000 - - From beroset@mindspring.com: - - c1222 dissector has wrong tag value for BER-encoding of calling_AE_qualifier - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9193 - - svn path=/trunk/; revision=52225 - -commit 578ead4 -Author: Anders Broman -Date: Thu Sep 26 21:08:49 2013 +0000 - - From beroset@mindspring.com: - removed obsolete references to se_alloc - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9194 - - svn path=/trunk/; revision=52224 - -commit a8a0450 -Author: Anders Broman -Date: Thu Sep 26 21:05:04 2013 +0000 - - Start refactoring to dissect each version separatly. - - svn path=/trunk/; revision=52223 - -commit 179b148 -Author: Anders Broman -Date: Thu Sep 26 21:04:10 2013 +0000 - - Add a few AVP:s - - svn path=/trunk/; revision=52222 - -commit f216d4e -Author: Chris Maynard -Date: Thu Sep 26 17:27:53 2013 +0000 - - When a line of text wraps to the next line, the character that caused the line to wrap was not being printed. - - #BACKPORT(1.10,1.8) - - svn path=/trunk/; revision=52221 - -commit 5ee2b14 -Author: Guy Harris -Date: Wed Sep 25 22:53:53 2013 +0000 - - Do all checks against the reported length; a packet that wasn't captured - in its entirety due to a snapshot length being specified is not - malformed. - - Instead of checking for the the sum of the offset and the value length - being less than the offset, check whether the TLV length is <= 4 and, if - so, just quit at that point (that also handles the "value is zero - length" case). That makes sure that valuelength isn't negative; given - that length is < 65536, valuelength < 65532, so that won't cause offset - to overflow, so that means offset won't go backwards. - - svn path=/trunk/; revision=52220 - -commit 9973f5f -Author: Anders Broman -Date: Wed Sep 25 21:15:25 2013 +0000 - - From beroset@mindspring.com: - - oid_subid2encoded generates faulty encodings for 3-, 4- and 5-byte subid values - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9188 - - svn path=/trunk/; revision=52219 - -commit 49b08e6 -Author: Anders Broman -Date: Wed Sep 25 21:11:25 2013 +0000 - - From Masayuki Takemura: - According to 3GPP R8/R9/R10/R11, the mobility option "3GPP Specific PMIPv6 error - code" is 1 octet length. - - However, in the source file packet-mip6.c, the length of the option is set to 4 octets (around line 1744): - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9183 - - svn path=/trunk/; revision=52218 - -commit 0fdbb8c -Author: Anders Broman -Date: Wed Sep 25 21:06:05 2013 +0000 - - Dissect bssmap_reroute_cmd and bssmap_reroute_complete and - add new IE dissection to bssmap_cl3_info. - - svn path=/trunk/; revision=52217 - -commit 19fdb49 -Author: Anders Broman -Date: Wed Sep 25 20:58:37 2013 +0000 - - Add the abillity to let vendor AVP subdisectors add Message type to the info column. - - svn path=/trunk/; revision=52216 - -commit 376c579 -Author: Michael Mann -Date: Wed Sep 25 19:13:10 2013 +0000 - - Minor correction to dissection of DLR frames in Ethernet/IP dissector. Bug 9186 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9186) - - From Joakim Wiberg - - svn path=/trunk/; revision=52215 - -commit eb64e87 -Author: Evan Huus -Date: Wed Sep 25 16:57:21 2013 +0000 - - Prevent offset overflow in DTP dissector. Fixes - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9184 - - Also add modelines. - - svn path=/trunk/; revision=52214 - -commit 95bc2da -Author: Evan Huus -Date: Wed Sep 25 16:41:09 2013 +0000 - - Require the NTLMSSP response contents to be long enough before we try to memcpy - it. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9182 - - svn path=/trunk/; revision=52213 - -commit 31f9c28 -Author: Jörg Mayer -Date: Wed Sep 25 10:11:07 2013 +0000 - - Beginning to work on bug 9127 (Juniper proprietary TLV in RSVP): - - Print hexdump of unknown or vendor specific toplevel TLVs - - Try to print the name of type 204 (something still missing) - - svn path=/trunk/; revision=52212 - -commit 80d1fde -Author: Gerald Combs -Date: Wed Sep 25 00:26:36 2013 +0000 - - Delete extra_split if we're not using it. This keeps its handle from - showing up in the main window. Make it local to layoutPanes(). - - svn path=/trunk/; revision=52211 - -commit 71e0d23 -Author: Evan Huus -Date: Tue Sep 24 22:42:27 2013 +0000 - - From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9180 - - A few enhancements to the SEL Fast Message (selfm) Dissector: - - Final piece of dissection for standard Fast Meter messages to display pad byte - (if present) and single-byte checksum footer. - - Enhancement to digital word display to show 1-byte bit patterns on proto_item - without requiring user to expand tree. - - svn path=/trunk/; revision=52210 - -commit f92832c -Author: Michael Mann -Date: Tue Sep 24 21:06:05 2013 +0000 - - Prevent crashing as a result of tree removal in r52208. Tree removal + this patch should be the "quick" fix to bug 5349 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5349). I knew the tree check was preventing some dissection/column data/etc, but from the comments in bug 5349, the tree check was also protecting this (and maybe other) crashes (due to missed NULL checking). - - I want to follow up with some massive cleanup (remove PITEM_FINFO calls), but this with r52208 should be good enough to backport to 1.8 and 1.10 to fix bug 5349. Cleanup shouldn't need to be backported. - - svn path=/trunk/; revision=52209 - -commit 9e24ed6 -Author: Guy Harris -Date: Tue Sep 24 20:32:19 2013 +0000 - - You are in a twisty little maze of code paths, all different. Get rid - of the if (tree) tests in dissect_mac_header_generic_decoder(), as some - of the stuff done inside there should be done even if we're not building - a protocol tree, e.g. CRC stuff and calling subdissectors. - - Get rid of a gratuitous pair of curly braces, and fix the indentation of - one line, while we're at it. - - svn path=/trunk/; revision=52208 - -commit 84ac869 -Author: Guy Harris -Date: Tue Sep 24 19:57:41 2013 +0000 - - Stuff used when checking the CRC needs to be done regardless of whether - we're building a protocol tree or not. - - svn path=/trunk/; revision=52207 - -commit ff7b1d8 -Author: Guy Harris -Date: Tue Sep 24 19:56:56 2013 +0000 - - Get rid of unused variable. - - svn path=/trunk/; revision=52206 - -commit d08e970 -Author: Guy Harris -Date: Tue Sep 24 19:09:10 2013 +0000 - - Fix copy-and-pasteo(?). - - svn path=/trunk/; revision=52205 - -commit 36fd921 -Author: Guy Harris -Date: Tue Sep 24 19:07:22 2013 +0000 - - One advantage of making as many things as possible static is that, if - they're not being used, the compiler can be made to warn about that. - - In this case, Broadcast_Control_Pointer_IE() was used because of a - missing case in a switch statement; put that case in. - - svn path=/trunk/; revision=52204 - -commit 1ac3997 -Author: Michael Mann -Date: Tue Sep 24 18:45:39 2013 +0000 - - Wimax dissector improvements: - - 1. Remove message type field from all MAC Management "sub"dissectors and place it in Mac Management subdissector itself. This may cause backwards-compatibility issues (malformed packets) with third-party subdissectors of the MAC Management dissector, but it didn't make sense to have so many filters for a single enumerated value, especially when the various "protocol" filters covers many of them. - - 2. Removed some if(tree) checks as column info and calling other dissectors are sometimes executed underneath. Some of this is in preparation for addressing bug 5349. - - 3. Make all dissector functions (and a few others) static, and use register_dissector() when necessary. - - 4. Convert generic decoder CRC errors into expert info, rather than have it be a "protocol" filter (it just looks funny that way) - - - In general, these dissectors seem "over-protocolized". I understand the need for all of the dissectors, but I don't know if they all need "protocol" status. - - svn path=/trunk/; revision=52203 - -commit 019e64f -Author: Pascal Quantin -Date: Tue Sep 24 17:56:17 2013 +0000 - - Upgrade RRC dissector to v11.7.0 - - svn path=/trunk/; revision=52202 - -commit 9a495ec -Author: Jörg Mayer -Date: Tue Sep 24 16:50:21 2013 +0000 - - On Win it's nmake, not make - - svn path=/trunk/; revision=52201 - -commit 31267e5 -Author: Jeff Morriss -Date: Tue Sep 24 01:12:44 2013 +0000 - - From Wido Kelling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9176 : - - Fix decoding of the Auto-Negotiation bits in LLDP (they were off by one). - - svn path=/trunk/; revision=52199 - -commit 221f85f -Author: Jeff Morriss -Date: Tue Sep 24 01:04:10 2013 +0000 - - From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9173 : - - This enhancement add the missing structure CAUT, some missing integer - converted to Strings and some field that were unknown to a better explanation. - - Sorted alphabetically the MQCFINT_Parse VALS structure to better find what is - missing in this VALS structure - - svn path=/trunk/; revision=52198 - -commit 6d255f8 -Author: Jeff Morriss -Date: Tue Sep 24 00:31:49 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6596 : - - Allow reading SSL keylog files with carriage returns. - - svn path=/trunk/; revision=52197 - -commit d456079 -Author: Jörg Mayer -Date: Mon Sep 23 21:45:55 2013 +0000 - - Beginnings of win cmake support (not yet working), created by Graham Bloice, - some smaller changes by me. - - README.cmake - Document how to (one day) run on Windows - - CMakeLists.txt - Use MSVC compiler flags for MSVC instead of gcc flags - - FindWSWinLibs.cmake - New: Creates HINTS for finding includes and libraries - inside the Wireshark support library installation. - - FindXXX.cmake - Make use of HINTS generated by FindWSWinLibs.cmake - - This has not really been tested on Windows as my installation seems to have - automagically downloaded some fixes and is in an inconsistent state since. - Will probably need to reinstall. - - svn path=/trunk/; revision=52194 - -commit d74564d -Author: Pascal Quantin -Date: Mon Sep 23 21:21:58 2013 +0000 - - Ensure to release an existing DRX configuration when receiving a RRC Connection Setup message - - svn path=/trunk/; revision=52193 - -commit 15ba18d -Author: Pascal Quantin -Date: Mon Sep 23 20:20:36 2013 +0000 - - Upgrade LPPa dissector to v11.3.0 - - svn path=/trunk/; revision=52192 - -commit db64bbc -Author: Anders Broman -Date: Mon Sep 23 19:02:33 2013 +0000 - - Add dissection of new IEs in UL_UNITDATA - - svn path=/trunk/; revision=52191 - -commit eb7cb19 -Author: Martin Mathieson -Date: Mon Sep 23 17:34:18 2013 +0000 - - Another step towards tracking UE DRX state - - svn path=/trunk/; revision=52190 - -commit d09b1db -Author: Michael Mann -Date: Mon Sep 23 15:54:29 2013 +0000 - - DTP Dissector Enhancements - - 1) Corrections to the naming and terminology of DTP, its TLVs, types and values - - 2) Improvements to the dissection of Trunk Status and Trunk Type TLVs whose values and meaning have not been properly decoded so far - - 3) Improvements to the dissection of the Domain TLV (now using proto_tree_add_item() to display its value; this also allows for filtering operations) - - 4) Minor cleanups to the code (mainly renaming the macro names to make them more consistent) - - - From Peter Paluch, Bug 9156 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9156) - - svn path=/trunk/; revision=52189 - -commit 2a1175c -Author: Evan Huus -Date: Mon Sep 23 12:09:58 2013 +0000 - - Tiny indentation fix. - - svn path=/trunk/; revision=52188 - -commit f1ba7e1 -Author: Evan Huus -Date: Mon Sep 23 12:09:20 2013 +0000 - - The pointer into proto_tree_add_oid can be NULL if the length is 0. Exposed - because wmem_alloc(pool, 0) returns NULL (like pretty much every other - malloc-style function) where ep_ or se_ alloc did not. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9175 - - svn path=/trunk/; revision=52187 - -commit bd3d51b -Author: Alexis La Goutte -Date: Mon Sep 23 07:20:53 2013 +0000 - - Fix Function call argument is an uninitialized value warning found by Clang - - svn path=/trunk/; revision=52186 - -commit 2b301ce -Author: Alexis La Goutte -Date: Mon Sep 23 07:20:45 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=52185 - -commit 0449518 -Author: Alexis La Goutte -Date: Mon Sep 23 07:20:38 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=52184 - -commit 5576d25 -Author: Alexis La Goutte -Date: Mon Sep 23 07:20:28 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=52183 - -commit 800b45f -Author: Guy Harris -Date: Sun Sep 22 21:51:05 2013 +0000 - - From Peter Wu: on systems other than Windows, skip the GUI tests if the - DISPLAY environment variable isn't set. - - From me: note that this won't be the right thing to do on OS X if we - switch to a toolkit that doesn't use X11, and that this may or may not - be the right thing to do with toolkits using Wayland or Mir directly. - - svn path=/trunk/; revision=52182 - -commit d158983 -Author: Evan Huus -Date: Sun Sep 22 20:18:25 2013 +0000 - - Fix some typos, indentation. Don't try to write the NRB if the pointer to our - two lists is itself NULL. - - svn path=/trunk/; revision=52181 - -commit 102c452 -Author: Pascal Quantin -Date: Sun Sep 22 20:04:35 2013 +0000 - - More emem -> wmem conversion: - - tvb_get_g_stringz()/tvb_get_ephemeral_stringz()/tvb_get_seasonal_stringz() -> tvb_get_stringz() - - tvb_get_g_stringz_enc()/tvb_get_ephemeral_stringz_enc() -> tvb_get_stringz_enc() - - tvb_get_ephemeral_unicode_stringz() -> tvb_get_unicode_stringz() - - tvb_bcd_dig_to_ep_str() -> tvb_bcd_dig_to_wmem_packet_str() - - update docs accordingly - - svn path=/trunk/; revision=52180 - -commit 1210a33 -Author: Evan Huus -Date: Sun Sep 22 20:01:32 2013 +0000 - - Fix -Wshadow, indentation - - svn path=/trunk/; revision=52179 - -commit 6aa5e30 -Author: Evan Huus -Date: Sun Sep 22 19:58:22 2013 +0000 - - Remove unused parameter. - - svn path=/trunk/; revision=52178 - -commit a8bd9fb -Author: Anders Broman -Date: Sun Sep 22 19:43:51 2013 +0000 - - Turn off debuging. - - svn path=/trunk/; revision=52177 - -commit 20108d7 -Author: Anders Broman -Date: Sun Sep 22 19:40:02 2013 +0000 - - Get rid of struct addrinfo, use the hastables for name resolution instead. - - svn path=/trunk/; revision=52176 - -commit 9175c79 -Author: Michael Tüxen -Date: Sun Sep 22 17:16:02 2013 +0000 - - Update SCTP PPIDs and use newly assigned value. - - svn path=/trunk/; revision=52175 - -commit a0c53ff -Author: Pascal Quantin -Date: Sun Sep 22 15:50:55 2013 +0000 - - emem -> wmem conversion: - - ep_tvb_get_bits() -> wmem_packet_tvb_get_bits() - - tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup() - - tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode() - - tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string() - - tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string() - - tvb_get_ephemeral_string_enc() -> tvb_get_string_enc() - - update docs accordingly - - svn path=/trunk/; revision=52172 - -commit c4a608a -Author: Gerald Combs -Date: Sun Sep 22 14:03:42 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-09-22] - - svn path=/trunk/; revision=52169 - -commit e33209d -Author: Jeff Morriss -Date: Sun Sep 22 14:00:52 2013 +0000 - - Don't declare proto_mac_mgmt_msg_ucd_decoder twice. - - svn path=/trunk/; revision=52168 - -commit 6ceb84b -Author: Michael Mann -Date: Sun Sep 22 00:50:24 2013 +0000 - - Make dissectors register for their MAC Management Message Type and use dissector_try_uint to do any dissection. Many "outside" (third-party) message types appear to exist. - - Have the makefiles do all the work setting up proto_register_ and proto_reg_handoff_, rather than sprinkled throughout the dissectors with extern declarations. - - More is coming to make more functions static (because of current makefile fixes) and cleanup MAC Management dissectors to remove unnecessary/duplicative code, but I wanted to get the build issues squared away. - - svn path=/trunk/; revision=52167 - -commit 39d3b8c -Author: Gerald Combs -Date: Sun Sep 22 00:48:03 2013 +0000 - - Remove U3 references. - - svn path=/trunk/; revision=52166 - -commit 9afac16 -Author: Evan Huus -Date: Sat Sep 21 17:37:31 2013 +0000 - - Update to tvb_g_memdup in tvb test suite. - - svn path=/trunk/; revision=52165 - -commit 6df83e8 -Author: Evan Huus -Date: Sat Sep 21 17:04:41 2013 +0000 - - Add _g_ to the names of functions that allocate glib memory. This is a bit more - explicit, and frees up the "generic" names (like tvb_memdup) for new signatures - that take the appropriate wmem pool. - - Majority of the conversion done with sed. - - svn path=/trunk/; revision=52164 - -commit 8abfcae -Author: Evan Huus -Date: Sat Sep 21 16:27:55 2013 +0000 - - Lower the default RTMPT max reassembly size. A bigger bandaid for - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6898 - - svn path=/trunk/; revision=52163 - -commit 514b38f -Author: Pascal Quantin -Date: Sat Sep 21 11:08:35 2013 +0000 - - Make it more obvious that the function is using wmem memory - - svn path=/trunk/; revision=52162 - -commit c90d29c -Author: Jeff Morriss -Date: Fri Sep 20 20:52:04 2013 +0000 - - As pointed out by Kurt in http://ask.wireshark.org/questions/24886/error-failed-build-dependencies-while-making-rpm : - - If we're not building with gtk3 we now need to add --with-gtk2 . - - svn path=/trunk/; revision=52161 - -commit 857dbb0 -Author: Pascal Quantin -Date: Fri Sep 20 19:40:26 2013 +0000 - - From Mathias Guettler via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9159 : - ESIS dissector exception due to incorrect length parameter to 'proto_tree_add_uint' - - svn path=/trunk/; revision=52160 - -commit 0120181 -Author: Pascal Quantin -Date: Fri Sep 20 19:11:23 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9164 : - Add dissector_try_uint_new() to the list of exported symbols - - svn path=/trunk/; revision=52159 - -commit a92dd77 -Author: Michael Mann -Date: Fri Sep 20 19:02:15 2013 +0000 - - Enhance DOCSIS dissector with new fields. Bug 9149 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9149) - - From Jerry Negele - - svn path=/trunk/; revision=52158 - -commit 61c9a77 -Author: Michael Mann -Date: Fri Sep 20 18:35:10 2013 +0000 - - Bugfix a few items: - - 1. Correct Interface Flag enumeration - 2. Dissect ARP data without making it look like its an ARP packet by disabling column writing. - - svn path=/trunk/; revision=52157 - -commit 4212b20 -Author: Evan Huus -Date: Fri Sep 20 14:41:22 2013 +0000 - - Don't use g_strv_length on a single string, just use strlen. Also do the - null-check *before* calling strlen (if it's even necessary?) - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9166 - - svn path=/trunk/; revision=52156 - -commit f3e76b0 -Author: Anders Broman -Date: Fri Sep 20 14:20:06 2013 +0000 - - Indicate Sequence of 0 length. - - svn path=/trunk/; revision=52155 - -commit 95c5f81 -Author: Anders Broman -Date: Fri Sep 20 14:19:31 2013 +0000 - - DCH-ID can be 255 - - svn path=/trunk/; revision=52154 - -commit 067ca19 -Author: Anders Broman -Date: Fri Sep 20 14:06:43 2013 +0000 - - Try to make heuristic slightly faster. - - svn path=/trunk/; revision=52153 - -commit 9c5ff39 -Author: Alexis La Goutte -Date: Thu Sep 19 21:16:46 2013 +0000 - - From Chun-Yeow via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9163 Ability to Decode the Number of Mesh Peerings - - Decode the mesh formation information fields related to the number of mesh peerings - - Signed-off-by: Chun-Yeow Yeoh - - svn path=/trunk/; revision=52152 - -commit 2477170 -Author: Alexis La Goutte -Date: Thu Sep 19 20:41:22 2013 +0000 - - Add Peter Wu to AUTHORS - - (Thanks for the work on SSL/TLS/DTLS Ciphers) - - svn path=/trunk/; revision=52151 - -commit 23f9100 -Author: Alexis La Goutte -Date: Thu Sep 19 20:27:12 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers - - Really add support for AEAD ciphers (GCM) - - GCM uses counter mode with authentication tags (the latter is currently - not supported). As for the key material, there is no MAC (because the - auth tag is supposed to verify the authenticity). - - Finally, correct the GCM cipher suite definitions: IV block size of - 4 bytes and GCM instead of CBC mode. - - svn path=/trunk/; revision=52150 - -commit a87da76 -Author: Alexis La Goutte -Date: Thu Sep 19 20:27:05 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers - - Use IV from record for CBC mode, add padding/IV length check - - Add summary of RFCs to make it more obvious why certain parts (IV, MAC, - padding) are used. Merge DTLS and TLS blocks for extracting IV. This - saves an unnecessary memmove() because the input pointer is, well, just - a local variable and can therefore be incremented. - - Validate padding and IV lengths before using it. A crash could occur - if the explicit IV is missing (this would make memmove write before its - buffer). The missing padding check had as implication that a misleading - error is returning with a negative length (not exploitable). - - Use IV from record for CBC mode, previously it decrypted the first block - incorrectly and then threw this "decrypted" IV away. Now it extracts the - IV and uses this for decrypting the first fragment block. (remember that - CBC xor's the output of the block cipher with the previous ciphertext - (or IV for the first block)). - - This is a preparation for GCM which does not have a MAC. The skip_mac - branch is necessary to make the compiler happy in this patch, 'mac' - could otherwise be uninitialised. - - svn path=/trunk/; revision=52149 - -commit cf7f5dd -Author: Alexis La Goutte -Date: Thu Sep 19 20:26:57 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers - - Correct cipher suites list, add TLS_ annotations - - Add official TLS_ names as comment and correct: - - 6: RC2 is a block cipher using MD5, not stream+SHA. - - 25,26,27: should be SHA instead of MD5 - - 98: DES export is a block cipher using 56-bits[1], not stream. - - 99: DES export should be using 56-bits[1]. - - 138: removed commented RC4 cipher because it is not a block cipher - - Besides these comments and corrections, there are no further changes. - - [1]: http://tools.ietf.org/html/draft-ietf-tls-56-bit-ciphersuites-00 - - svn path=/trunk/; revision=52148 - -commit f4a4271 -Author: Alexis La Goutte -Date: Thu Sep 19 20:26:50 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers - - Drop export_cipher and dig_len, cleaner digest access - - Removed dig_len as this magic number is dependent on dig. The digests - variable is converted from a string to a structure holding the digest - name and length because of its close dependency. - - Introduce another struct+function to get rid of the magic number 0x40 - (DIG_MD5). - - Removed export_cipher bit as this is dependent on eff_bits < bits. - Verified with: - grep ,KEX_ packet-ssl-utils.c | awk -F, '{bits=$6!=$7;ex=$9; - if ((bits && !ex) || (!bits && ex))print $6, $7, $8, "###", $0}'. - - Removed space before SIG_RSA for cipher 51 for consistency with others. - - svn path=/trunk/; revision=52147 - -commit 9e36ab4 -Author: Alexis La Goutte -Date: Thu Sep 19 20:26:41 2013 +0000 - - Add *.lai file to wireshark - - svn path=/trunk/; revision=52146 - -commit 606c422 -Author: Evan Huus -Date: Thu Sep 19 17:39:43 2013 +0000 - - Zero the key in ntlmssp, because we don't otherwise fill all of it. I suspect - the tvb_memcpy on the next line should be taking more data, but I don't know - enough about the protocol to be sure. This is the least disruptive way to fix - the last valgrind error from - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8941 - - svn path=/trunk/; revision=52145 - -commit 27c4a47 -Author: Evan Huus -Date: Thu Sep 19 13:04:37 2013 +0000 - - Enum was used after all. Restore it and namespace it with GLUSTER_ to avoid the - collision. - - svn path=/trunk/; revision=52144 - -commit 6c41404 -Author: Evan Huus -Date: Thu Sep 19 13:00:57 2013 +0000 - - From Mark Vitale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9141 - - Decode AFS RXAFSCB_GetCapabilities RPC requests with their replies. - - svn path=/trunk/; revision=52143 - -commit 4964806 -Author: Evan Huus -Date: Thu Sep 19 12:50:25 2013 +0000 - - Remove unused enum that started conflicting with /usr/include/dirent.h on my - system. - - svn path=/trunk/; revision=52142 - -commit d353e38 -Author: Balint Reczey -Date: Wed Sep 18 21:51:45 2013 +0000 - - Revert "Prefer newer Lua versions" - - The original version was OK, obviously. - - svn path=/trunk/; revision=52141 - -commit 3db47e6 -Author: Balint Reczey -Date: Wed Sep 18 21:13:36 2013 +0000 - - Prefer newer Lua versions - - svn path=/trunk/; revision=52140 - -commit 63c297c -Author: Chris Maynard -Date: Wed Sep 18 14:49:03 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9138 (Malformed NORM packet) having to do with Wireshark assuming that all remaining bytes in the packet are part of the "cc_node_list", rather than stopping dissection according to the hdr_len field in the NORM Common Message Header. - - Ref: http://tools.ietf.org/html/rfc3940#section-4.2.3.4 - - #BACKPORT(1.10, 1.8) - - svn path=/trunk/; revision=52139 - -commit b80c836 -Author: Jeff Morriss -Date: Wed Sep 18 14:23:14 2013 +0000 - - Rename PCAP files to .pcap; set mime-type appropriately. Should these files be in the test/captures directory? - - svn path=/trunk/; revision=52138 - -commit 9983ada -Author: Gilbert Ramirez -Date: Wed Sep 18 05:12:04 2013 +0000 - - Missed one file from dfilter-test.py - Updated license in ancient tool. - - svn path=/trunk/; revision=52137 - -commit 4797eaf -Author: Gilbert Ramirez -Date: Wed Sep 18 05:07:46 2013 +0000 - - Update dfilter-test.py to use a much more modern test harness, - the "unittest" module that comes with Python. Specifically, this - takes advantage of a couple of features in the "unittest" in - Python 2.7. The tests are all the same as before, but much - better managed. - - This is in preparation for some work on the display filter code. - - svn path=/trunk/; revision=52136 - -commit ab7d8cc -Author: Chris Maynard -Date: Wed Sep 18 03:58:07 2013 +0000 - - Fix a couple of EXPORT_DEPENDS - - svn path=/trunk/; revision=52135 - -commit 6883f69 -Author: Jörg Mayer -Date: Wed Sep 18 03:31:03 2013 +0000 - - Add the dependeny handling for windows builds as well - - svn path=/trunk/; revision=52134 - -commit ae8824d -Author: Chris Maynard -Date: Wed Sep 18 02:58:14 2013 +0000 - - Missed 1 character replacement as part of r52132. - - svn path=/trunk/; revision=52133 - -commit b9ee9fa -Author: Chris Maynard -Date: Wed Sep 18 02:48:29 2013 +0000 - - Remove all non-ASCII characters from all .asn files. I didn't see the harm in replacing them all as opposed to only those not copied verbatim from other sources. - - svn path=/trunk/; revision=52132 - -commit 0fb41d1 -Author: Pascal Quantin -Date: Tue Sep 17 21:56:35 2013 +0000 - - From Jason Wzhy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9157 : - BSSGP: Fix dissection of Trace Type IE in SGSN-INVOKE-TRACE message - - svn path=/trunk/; revision=52131 - -commit 953c6fe -Author: Pascal Quantin -Date: Tue Sep 17 21:34:05 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52130 - -commit af15a51 -Author: Jörg Mayer -Date: Tue Sep 17 20:45:00 2013 +0000 - - Fix remaining dependencides for -exp.cnf files. - - svn path=/trunk/; revision=52129 - -commit 2b44f14 -Author: Pascal Quantin -Date: Tue Sep 17 20:06:48 2013 +0000 - - Fix off by 1 error when dissecting Data Radio Bearer identity number - - svn path=/trunk/; revision=52128 - -commit de20bbf -Author: Jörg Mayer -Date: Tue Sep 17 19:43:37 2013 +0000 - - More dependeny updates for asn1 -exp.cnf files. - Only three remaining: p7, p22, x509ce - thanks to Chris Maynard for the list. - - svn path=/trunk/; revision=52127 - -commit 882ca2e -Author: Bill Meier -Date: Tue Sep 17 19:23:11 2013 +0000 - - Remove some unneeded #includes... - - svn path=/trunk/; revision=52126 - -commit ac62145 -Author: Jörg Mayer -Date: Tue Sep 17 18:55:18 2013 +0000 - - Regenerate all files where the .cnf files had whitespace changes. - - svn path=/trunk/; revision=52125 - -commit 7316284 -Author: Bill Meier -Date: Tue Sep 17 18:55:17 2013 +0000 - - Reference 'BACnetVendorIdentifiers' value_string using - an extended value string. - - svn path=/trunk/; revision=52124 - -commit 72f8ca4 -Author: Jörg Mayer -Date: Tue Sep 17 18:54:18 2013 +0000 - - One of the wmem patches only updated the generated packet-snmp.c - but not the source. Fix that. - - svn path=/trunk/; revision=52123 - -commit b1a7fc3 -Author: Gerald Combs -Date: Tue Sep 17 18:42:36 2013 +0000 - - Switch the inline functions that use tvbuffs and emem back to macros. - This should hopefully fix linking with Solaris Studio, which doesn't - remove unused inline functions by default. Fix a copy+paste error. - - svn path=/trunk/; revision=52122 - -commit 3bb06ab -Author: Bill Meier -Date: Tue Sep 17 18:33:03 2013 +0000 - - Fix proto_registrar_dump_protocols() bug introduced by the - implementation of BASE_VAL64_STRING value_strings. - - Fixes 'tshark -G values' crash. - - svn path=/trunk/; revision=52121 - -commit fb83410 -Author: Jörg Mayer -Date: Tue Sep 17 18:02:25 2013 +0000 - - When building packet-dap.c on an empty build tree, packet-dap.c would - be incorrect on the first pass and only be correct when remade. - The reason was that disp-exp.cnf was created incorrectly on first pass. - disp-exp.cnf required dop-exp.cnf to build correctly, so add a mechanism - to add dependencies for export files. - - Note: Only the cmake change has been tested, the autofoo stuff requires - testing. - - svn path=/trunk/; revision=52120 - -commit b7bb743 -Author: Bill Meier -Date: Tue Sep 17 16:44:26 2013 +0000 - - Update 'BACnetVendorIdentifiers' value strings from - BACnet vendor ID list dated September 16, 2013. - http://www.bacnet.org/VendorID/BACnet%20Vendor%20IDs.htm - - - svn path=/trunk/; revision=52119 - -commit a2e86de -Author: Chris Maynard -Date: Tue Sep 17 14:45:52 2013 +0000 - - Fix dependency problems (continuation of r52110 and r52112). - - svn path=/trunk/; revision=52118 - -commit af96c7b -Author: Jörg Mayer -Date: Tue Sep 17 05:53:02 2013 +0000 - - Fix a difference to Makefile.common - - svn path=/trunk/; revision=52117 - -commit 80d8b02 -Author: Jörg Mayer -Date: Tue Sep 17 05:51:37 2013 +0000 - - Add svn id tag - - svn path=/trunk/; revision=52116 - -commit e7290ae -Author: Anders Broman -Date: Tue Sep 17 04:55:29 2013 +0000 - - Don't call gethostbyaddr() we have already read the local hosts file, settle for that. - - svn path=/trunk/; revision=52115 - -commit 9876180 -Author: Evan Huus -Date: Mon Sep 16 23:24:32 2013 +0000 - - From Mark Vitale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9142 - - Fix decoding of AFS Volume Name. - - svn path=/trunk/; revision=52114 - -commit 64d9c00 -Author: Evan Huus -Date: Mon Sep 16 23:15:18 2013 +0000 - - From Mark Vitale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9140 - - Add reassembly support for AFS. - - From me: minor tweaks to conform to other reassemblable protocols; indentation - fixes; modelines - - svn path=/trunk/; revision=52113 - -commit 686dd9b -Author: Jörg Mayer -Date: Mon Sep 16 21:45:46 2013 +0000 - - Copy over rev 52110 to cmake - - svn path=/trunk/; revision=52112 - -commit 0017e99 -Author: Jörg Mayer -Date: Mon Sep 16 21:38:42 2013 +0000 - - Forgot to check in regenerated dissector for dap. - - svn path=/trunk/; revision=52111 - -commit e14b587 -Author: Chris Maynard -Date: Mon Sep 16 21:35:27 2013 +0000 - - Fix dependency problem reported by Joerg Mayer on wireshark-dev. - Ref: http://www.wireshark.org/lists/wireshark-dev/201309/msg00151.html - - svn path=/trunk/; revision=52110 - -commit 886332e -Author: Jörg Mayer -Date: Mon Sep 16 21:35:19 2013 +0000 - - Whitespace changes - - svn path=/trunk/; revision=52109 - -commit 945901a -Author: Gerald Combs -Date: Mon Sep 16 21:33:26 2013 +0000 - - address_equal → addresses_equal. Switch from address macros to functions - in the Qt code. - - svn path=/trunk/; revision=52108 - -commit 7d6899b -Author: Pascal Quantin -Date: Mon Sep 16 21:26:03 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9155 : - Ensure that codec_str string is always initialized - - svn path=/trunk/; revision=52107 - -commit 6079691 -Author: Gerald Combs -Date: Mon Sep 16 21:15:49 2013 +0000 - - Convert each of the address.h macros to inline functions. - - Document each function. Note that we now call tvb_get_ptr() before - modifying the address in tvb_set_address() and tvb_set_address_hf(). The - caller doesn't have to worry about doing that any more. Add - add_address_to_hash64(). - - svn path=/trunk/; revision=52106 - -commit 4e74f3a -Author: Jörg Mayer -Date: Mon Sep 16 20:30:34 2013 +0000 - - Don't print a warning about missing svn id when the argument is not - a file. Warn about the "wrong" filetype and continue - - svn path=/trunk/; revision=52105 - -commit 038d3b0 -Author: Anders Broman -Date: Mon Sep 16 18:36:50 2013 +0000 - - Read the local services file. - - svn path=/trunk/; revision=52104 - -commit 1821ed0 -Author: Anders Broman -Date: Mon Sep 16 17:53:41 2013 +0000 - - Don't call getservbyport() on unresolved ports - it's expensive. - We should read the services file in initialize_services instead. - - svn path=/trunk/; revision=52103 - -commit f36c727 -Author: Gerald Combs -Date: Mon Sep 16 17:28:42 2013 +0000 - - Add stream information to the hint label. Update our hint more often. - Add a "to do" list. - - svn path=/trunk/; revision=52102 - -commit 6a1bd21 -Author: Chris Maynard -Date: Mon Sep 16 16:49:17 2013 +0000 - - Trivial: Fix typo. - - svn path=/trunk/; revision=52101 - -commit cc7a3cf -Author: Jeff Morriss -Date: Mon Sep 16 14:08:43 2013 +0000 - - Remove a bunch more set-but-no-longer-used variables. - - svn path=/trunk/; revision=52100 - -commit bf093ef -Author: Jeff Morriss -Date: Mon Sep 16 14:05:31 2013 +0000 - - Remove set-but-no-longer-used variable. - - svn path=/trunk/; revision=52099 - -commit 346f803 -Author: Michael Mann -Date: Mon Sep 16 10:39:06 2013 +0000 - - Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was all manual inspection and most cases were either: - 1. Case sensitivity differences between hf_ field name and formatted string. - 2. Unnecessary whitespace between hf_ field name and colon in formatted string - - There are cases where the hf_ field name doesn't quite match the proto_tree_add_uint_format, but it's close enough that one of them should be "right", I'm just not sure which is, I just know the string in proto_tree_add_uint_format is the one displayed. - - svn path=/trunk/; revision=52098 - -commit 58e4750 -Author: Alexis La Goutte -Date: Mon Sep 16 07:56:04 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=52097 - -commit 9bde187 -Author: Alexis La Goutte -Date: Mon Sep 16 07:54:28 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 - - Update TLS Ciphers - - The attached trivial patch corrects the digest (SHA) length for TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA - - svn path=/trunk/; revision=52096 - -commit 29b63a7 -Author: Gerald Combs -Date: Mon Sep 16 02:04:52 2013 +0000 - - Make sure we don't tap our packets twice. Give the graph has focus after - we redraw it. - - svn path=/trunk/; revision=52095 - -commit 0f6baaa -Author: Gerald Combs -Date: Mon Sep 16 01:19:14 2013 +0000 - - Fix graph type selection. - - svn path=/trunk/; revision=52094 - -commit 6b251c7 -Author: Gerald Combs -Date: Mon Sep 16 00:50:23 2013 +0000 - - Another attempt at axis scaling. Tweak the appearance a little. - - svn path=/trunk/; revision=52093 - -commit 98479b0 -Author: Gerald Combs -Date: Sun Sep 15 23:55:51 2013 +0000 - - When caclulating throughput, only subtract what we've added. Try to fix - axis scaling. - - svn path=/trunk/; revision=52092 - -commit ca637de -Author: Martin Kaiser -Date: Sun Sep 15 22:42:58 2013 +0000 - - mark unused parameter - - svn path=/trunk/; revision=52091 - -commit adb3944 -Author: Evan Huus -Date: Sun Sep 15 22:36:47 2013 +0000 - - Apparently some platforms don't like $ in their macro names. Fix it. - - svn path=/trunk/; revision=52090 - -commit 464bbb1 -Author: Evan Huus -Date: Sun Sep 15 22:34:36 2013 +0000 - - Tweak mq macro and checkAPI to avoid false positives - "garbage" - (like a #define) at the beginning of a line before a value_string no longer - matches so a #define that includes the beginning of a value_string doesn't - confuse the script. - - svn path=/trunk/; revision=52089 - -commit c05e968 -Author: Anders Broman -Date: Sun Sep 15 21:42:13 2013 +0000 - - unused variable 'conversation' - - svn path=/trunk/; revision=52088 - -commit da8240e -Author: Pascal Quantin -Date: Sun Sep 15 21:36:37 2013 +0000 - - emem -> wmem (except uat or init routines) - - svn path=/trunk/; revision=52087 - -commit da27bad -Author: Evan Huus -Date: Sun Sep 15 21:01:45 2013 +0000 - - Comment out hf_ var whose use is also commented out at least for now. - - svn path=/trunk/; revision=52086 - -commit 5bd199d -Author: Evan Huus -Date: Sun Sep 15 20:56:56 2013 +0000 - - From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9072 - - Substantial enhancements to MQ protocol: all Structure, MSG_REQUEST/ASYNC_RESP, - MQ Multi Segment are decoded until version 7.1/7.5 - - svn path=/trunk/; revision=52085 - -commit 5d8143a -Author: Evan Huus -Date: Sun Sep 15 20:47:45 2013 +0000 - - Our hash function is no longer commutative (yay!). However, this means that we - no longer get to check both conversation directions at once "for free" because - the two orderings actually result in different hashes. Do them one at a time. - - Sorry Anders, this may or may not cancel out some of the performance gain you - were looking for. Either way, the new hash function is still an improvement. - - Fixes bidirectional conversation lookup, which was conveniently showing up as - a DTLS decryption failure in the test suite. Go figure. - - svn path=/trunk/; revision=52084 - -commit dd88e1a -Author: Gerald Combs -Date: Sun Sep 15 20:44:57 2013 +0000 - - Make sure the RTT behavior matches the GTK+ port. Make sure we properly - select a graph type. - - svn path=/trunk/; revision=52083 - -commit 432a064 -Author: Evan Huus -Date: Sun Sep 15 20:18:56 2013 +0000 - - Simplification I noticed while reviewing the wmem conversion: there's no need to - strdup the string built in a strbuf if the scope is the same. Remove the - thoroughly unnecessary temporary variable as well. - - svn path=/trunk/; revision=52082 - -commit 82c6375 -Author: Evan Huus -Date: Sun Sep 15 20:11:25 2013 +0000 - - Add the new hash algorithm to the macro we were already using. Create a - temporary address structure for the port-numbers so we can use the same macro, - reducing duplication further. - - Add modelines. - - svn path=/trunk/; revision=52081 - -commit 1359f55 -Author: Pascal Quantin -Date: Sun Sep 15 19:44:19 2013 +0000 - - From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9145 : - openSAFETY: SSDO Abort codes are handled incorrectly - - svn path=/trunk/; revision=52080 - -commit 6653b82 -Author: Anders Broman -Date: Sun Sep 15 19:35:42 2013 +0000 - - Use a better hash algorithm and add a dialouge to get hastable data. - (missed a file) - - svn path=/trunk/; revision=52079 - -commit 7f57fe3 -Author: Anders Broman -Date: Sun Sep 15 19:35:10 2013 +0000 - - Use a better hash algorithm and add a dialouge to get hastable data. - - svn path=/trunk/; revision=52078 - -commit 0e57edb -Author: Martin Kaiser -Date: Sun Sep 15 18:43:04 2013 +0000 - - emem -> wmem for radius - - svn path=/trunk/; revision=52077 - -commit b1272cb -Author: Martin Kaiser -Date: Sun Sep 15 18:27:07 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52076 - -commit 04ec29b -Author: Martin Kaiser -Date: Sun Sep 15 18:20:25 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52075 - -commit 8c7cb82 -Author: Pascal Quantin -Date: Sun Sep 15 18:18:08 2013 +0000 - - No need to use the pinfo pool - - svn path=/trunk/; revision=52074 - -commit 97659c6 -Author: Evan Huus -Date: Sun Sep 15 18:13:42 2013 +0000 - - From Michal Labedzki via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9119 - - Implement the majority of the remaining items from the PN532 spec. - - svn path=/trunk/; revision=52073 - -commit f83c03d -Author: Martin Kaiser -Date: Sun Sep 15 18:13:02 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52072 - -commit 20a4026 -Author: Pascal Quantin -Date: Sun Sep 15 18:03:32 2013 +0000 - - A few more dissectors converted to wmem - - svn path=/trunk/; revision=52071 - -commit a54e67a -Author: Martin Kaiser -Date: Sun Sep 15 18:01:01 2013 +0000 - - TABs -> spaces - add editor modelines - - svn path=/trunk/; revision=52070 - -commit 61aced2 -Author: Jörg Mayer -Date: Sun Sep 15 17:50:35 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52069 - -commit 98baf8b -Author: Jörg Mayer -Date: Sun Sep 15 17:50:18 2013 +0000 - - Add help option - List options one by one - - svn path=/trunk/; revision=52068 - -commit ed321d6 -Author: Martin Kaiser -Date: Sun Sep 15 17:12:54 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52067 - -commit 62c3c0e -Author: Martin Kaiser -Date: Sun Sep 15 16:53:11 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52066 - -commit 4269f30 -Author: Anders Broman -Date: Sun Sep 15 16:49:06 2013 +0000 - - Fix a typo - - svn path=/trunk/; revision=52065 - -commit 516f145 -Author: Anders Broman -Date: Sun Sep 15 16:47:31 2013 +0000 - - Use "cheaper" length check. - - svn path=/trunk/; revision=52064 - -commit 7850883 -Author: Pascal Quantin -Date: Sun Sep 15 15:11:11 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52063 - -commit c5ffff7 -Author: Jörg Mayer -Date: Sun Sep 15 15:00:03 2013 +0000 - - Fix checkapi warnings (missing id) - Replace Makefile.{am,nmake,common} that did not conform by - their asn1/c133/ version. - - svn path=/trunk/; revision=52062 - -commit 05ba7d3 -Author: Jörg Mayer -Date: Sun Sep 15 14:49:16 2013 +0000 - - http://url is NOT a c++ style comment - - svn path=/trunk/; revision=52061 - -commit 65ff43f -Author: Jörg Mayer -Date: Sun Sep 15 14:37:46 2013 +0000 - - Finish asn1 emem -> wmem conversion. - Left are snmp and those functions that don't have wmem equivalents. - - svn path=/trunk/; revision=52060 - -commit c65459c -Author: Jörg Mayer -Date: Sun Sep 15 14:33:38 2013 +0000 - - emem -> wmem (don't forget about .cnf) - - svn path=/trunk/; revision=52058 - -commit b936b04 -Author: Gerald Combs -Date: Sun Sep 15 14:03:44 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-09-15] - - svn path=/trunk/; revision=52056 - -commit 9486a3d -Author: Pascal Quantin -Date: Sun Sep 15 13:46:13 2013 +0000 - - More wmem conversion (leaving uat related functions aside) - - svn path=/trunk/; revision=52055 - -commit 8886503 -Author: Jörg Mayer -Date: Sun Sep 15 13:24:14 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52054 - -commit 868b345 -Author: Pascal Quantin -Date: Sun Sep 15 10:29:49 2013 +0000 - - Convert a few more dissectors to wmem API - - svn path=/trunk/; revision=52053 - -commit 07c29e7 -Author: Pascal Quantin -Date: Sun Sep 15 09:12:01 2013 +0000 - - Convert a few more dissectors to wmem API - - svn path=/trunk/; revision=52052 - -commit eda53fd -Author: Alexis La Goutte -Date: Sun Sep 15 06:59:32 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9153 [PATCH trivial] Fix Application Data record parsing for TLS 1.1/1.2 and DTLS 1.0/1.2 - - Using memcpy on overlapping memory has undefined behaviour (read: on GCC 4.8.1 this destroys the plaintext and invalidates the MAC). - - This patch fixes parsing Application Data records for TLS 1.1 and 1.2 (while I am at it, also for DTLS 1.0/1.2) by using memmove instead of memcpy. - - svn path=/trunk/; revision=52051 - -commit 89244b1 -Author: Alexis La Goutte -Date: Sun Sep 15 06:59:19 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers - - Fix decryption of TLS_RSA_WITH_IDEA_CBC_SHA (0x0007) - - Caught when iterating through all SSLv3 cipher suites. - TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 (0x0006) was another one that - could not be decrypted - - svn path=/trunk/; revision=52050 - -commit 219d171 -Author: Alexis La Goutte -Date: Sun Sep 15 06:59:07 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers - - Add more TLS cipher suites (SEED, AES-GCM, ECC) - - - cipher suites from `RFC 5246 - TLS 1.2` - - cipher suites 150-155 are taken from: RFC 4162 - SEED for TLS - - cipher suites 156-167 are taken from: RFC 5288 - AES-GCM Cipher suites - - cipher suites 49153-49177 are taken from: RFC 4492 - ECC for TLS - - cipher suites 49195-49202 are taken from RFC 5289 - ECC with SHA256/384 and AES GCM - - svn path=/trunk/; revision=52049 - -commit 9ac2566 -Author: Alexis La Goutte -Date: Sun Sep 15 06:58:54 2013 +0000 - - From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers - - Add support for Camellia ciphers - - svn path=/trunk/; revision=52048 - -commit cbf315b -Author: Alexis La Goutte -Date: Sun Sep 15 06:58:41 2013 +0000 - - From Tom Cook via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147 Long / short guard interval not properly read from IxVeriWave vwr files - - The short / long guard interval is located in a different spot than the current vwr reader looks. - - svn path=/trunk/; revision=52047 - -commit be2ebb1 -Author: Evan Huus -Date: Sun Sep 15 02:26:20 2013 +0000 - - Remove unused variables, fix typos. - - svn path=/trunk/; revision=52046 - -commit b38ee91 -Author: Michael Mann -Date: Sun Sep 15 01:48:30 2013 +0000 - - Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. - - The script didn't catch as many as I would have liked, but it's a start. - - The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. - - svn path=/trunk/; revision=52045 - -commit a17cf67 -Author: Martin Kaiser -Date: Sat Sep 14 18:30:43 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52044 - -commit c522d83 -Author: Martin Kaiser -Date: Sat Sep 14 18:20:07 2013 +0000 - - use generic editor modelines - - svn path=/trunk/; revision=52043 - -commit 1fccb6a -Author: Martin Kaiser -Date: Sat Sep 14 18:16:43 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52042 - -commit 17e350d -Author: Martin Kaiser -Date: Sat Sep 14 18:08:28 2013 +0000 - - TABs -> spaces - add editor modelines - - svn path=/trunk/; revision=52041 - -commit f1592c5 -Author: Martin Kaiser -Date: Sat Sep 14 17:56:44 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52040 - -commit ec2fc7f -Author: Jörg Mayer -Date: Sat Sep 14 14:42:35 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52039 - -commit f737cea -Author: Jörg Mayer -Date: Sat Sep 14 14:33:04 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=52038 - -commit 7584f77 -Author: Evan Huus -Date: Sat Sep 14 13:30:02 2013 +0000 - - Only access val_other if tlv_len is sufficiently long. Fixes - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9150 - - Also add modelines. - - svn path=/trunk/; revision=52037 - -commit ef101ed -Author: Evan Huus -Date: Sat Sep 14 13:15:31 2013 +0000 - - _lookup_extended takes a pointer to the key-pointer since it has to set the old - key pointer value. _insert just takes the key-pointer, not a pointer to it. - Passing a pointer-to-a-pointer causes the outer pointer to be dereferenced as a - struct (when it in fact points to a pointer to struct) and leads to incorrect - behaviour and uninitialized/out-of-bounds memory accesses. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9139 - - svn path=/trunk/; revision=52036 - -commit 9b5ab5c -Author: Jörg Mayer -Date: Sat Sep 14 13:11:38 2013 +0000 - - Add copyright (Michael, Joerg and Guy) and license (GPL2+) - - svn path=/trunk/; revision=52035 - -commit 4535fd9 -Author: Evan Huus -Date: Sat Sep 14 12:35:29 2013 +0000 - - From Patrick Lundquist via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7038 - - Fix a bug in Moldudp64 where offset + MOLDUDP64_MSGLEN_LEN was basically - subtracted twice from remaining packet length. - - svn path=/trunk/; revision=52034 - -commit 868a331 -Author: Evan Huus -Date: Sat Sep 14 12:23:19 2013 +0000 - - Add GPL license as per Anders' email. - - svn path=/trunk/; revision=52033 - -commit 5635a1f -Author: Pascal Quantin -Date: Sat Sep 14 11:56:45 2013 +0000 - - Revert to emem for uat - - svn path=/trunk/; revision=52032 - -commit 0743492 -Author: Pascal Quantin -Date: Sat Sep 14 10:53:29 2013 +0000 - - Convert some dissectors to wmem (leaving uat-like memory with emem for now) - - svn path=/trunk/; revision=52031 - -commit f9faa33 -Author: Jörg Mayer -Date: Sat Sep 14 07:00:52 2013 +0000 - - Fix a typo - - svn path=/trunk/; revision=52030 - -commit 7b03b59 -Author: Gerald Combs -Date: Fri Sep 13 23:34:34 2013 +0000 - - Mis-use error bars to draw segments. - - svn path=/trunk/; revision=52029 - -commit f2f2d0e -Author: Evan Huus -Date: Fri Sep 13 23:02:39 2013 +0000 - - Add license header to colorfilters2js.pl as per email from Dirk. - - svn path=/trunk/; revision=52028 - -commit 7f92257 -Author: Gerald Combs -Date: Fri Sep 13 22:29:05 2013 +0000 - - More TCP stream graph updates. - - Scan our segment list (and the capture file) once per stream. Switch the - stream selection control to a QSpinBox. Add graph type selection - actions. The context menu + shortcuts should now be complete. Add the - intitial tcptrace graph. Only ACKs and RWINs so far. A bunch of other - updates and fixes. - - svn path=/trunk/; revision=52027 - -commit 956844f -Author: Chris Maynard -Date: Fri Sep 13 21:59:24 2013 +0000 - - Update a link. - - svn path=/trunk/; revision=52026 - -commit 170a70a -Author: Guy Harris -Date: Fri Sep 13 21:40:19 2013 +0000 - - Copyright notice (GPL, why not). - - svn path=/trunk/; revision=52025 - -commit a4882cd -Author: Jeff Morriss -Date: Fri Sep 13 21:15:29 2013 +0000 - - Add WIRESHARK_APPDATA description to the rawshark and tshark man pages. - - svn path=/trunk/; revision=52024 - -commit d179a1b -Author: Jeff Morriss -Date: Fri Sep 13 21:06:08 2013 +0000 - - Move debian-setup.sh into tools/ - - svn path=/trunk/; revision=52023 - -commit 02cec4d -Author: Chris Maynard -Date: Fri Sep 13 20:15:46 2013 +0000 - - Allow an alternate application data location as specified by the new environment variable, WIRESHARK_APPDATA (chosen instead of my originally proposed WS_APPDATA name since most other Wireshark-specific environment variables were already named with the WIRESHARK_ prefix). - - See also: http://www.wireshark.org/lists/wireshark-users/201309/msg00013.html - - svn path=/trunk/; revision=52022 - -commit e078770 -Author: Pascal Quantin -Date: Fri Sep 13 19:27:53 2013 +0000 - - From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9047 : - EPL: Dissection for WriteMultipleParameter, Node Alias, SDO/ASND structuring - - svn path=/trunk/; revision=52021 - -commit 863e056 -Author: Evan Huus -Date: Fri Sep 13 18:40:15 2013 +0000 - - cmake/TestFileOffsetBits also copied from an upstream with the appropriate - license - - svn path=/trunk/; revision=52020 - -commit b33c061 -Author: Evan Huus -Date: Fri Sep 13 18:36:11 2013 +0000 - - Permit a bunch of 'combo' licenses (meaning GPL + something else we accept in - the same file). - - svn path=/trunk/; revision=52019 - -commit d0d4118 -Author: Evan Huus -Date: Fri Sep 13 18:29:08 2013 +0000 - - Add license header (attributing to Jakub) for a few of the npl files. - - svn path=/trunk/; revision=52018 - -commit b5c48b4 -Author: Evan Huus -Date: Fri Sep 13 18:24:22 2013 +0000 - - Ignore svnversion.h, it's auto-generated. Ignore lemon and except.[ch], they're - imported from upstreams with correct licensing but without a useful header (and - there's no particular reason to carry that delta). - - svn path=/trunk/; revision=52017 - -commit 50bcbef -Author: Chris Maynard -Date: Fri Sep 13 18:11:29 2013 +0000 - - OK, all the Makefiles use -build since r41943, so add that option back for now. - - svn path=/trunk/; revision=52016 - -commit 051c082 -Author: Chris Maynard -Date: Fri Sep 13 18:00:32 2013 +0000 - - Update the comments to match the current usage. - - svn path=/trunk/; revision=52015 - -commit 0d1411f -Author: Jörg Mayer -Date: Fri Sep 13 17:40:32 2013 +0000 - - Add comment where the vendor ids come from - - svn path=/trunk/; revision=52014 - -commit 7623232 -Author: Pascal Quantin -Date: Fri Sep 13 17:25:54 2013 +0000 - - Convert a few more dissectors to wmem - - svn path=/trunk/; revision=52013 - -commit fbef795 -Author: Jörg Mayer -Date: Fri Sep 13 17:23:29 2013 +0000 - - Move common.c to dirty files - - svn path=/trunk/; revision=52012 - -commit b0ef116 -Author: Jörg Mayer -Date: Fri Sep 13 17:23:00 2013 +0000 - - Fix - - /home/jmayer/work/wireshark/svn/trunk/echld/parent.c: In function ‘echld_terminate’: - /home/jmayer/work/wireshark/svn/trunk/echld/parent.c:305:5: error: suggest braces around empty body in ‘do’ statement [-Werror=empty-body] - do ; while(sleep(1)); /* wait a full sec without signals */ - ^ - cc1: all warnings being treated as errors - - - svn path=/trunk/; revision=52011 - -commit 4fb4b2f -Author: Evan Huus -Date: Fri Sep 13 17:21:12 2013 +0000 - - Fix a bug (caught by Pascal) where a tree was being explicitly cast to emem_tree - for some reason, and thus the compiler hadn't flagged a type mismatch when the - tree was converted to wmem. - - svn path=/trunk/; revision=52010 - -commit 79cd883 -Author: Jörg Mayer -Date: Fri Sep 13 17:20:39 2013 +0000 - - Fix might be used uninitialized warning - - svn path=/trunk/; revision=52009 - -commit d6d4c06 -Author: Evan Huus -Date: Fri Sep 13 17:14:55 2013 +0000 - - Replace some emem with wmem. - The windows-common dissector seems to make excessive use of strbufs - I - converted them and simplified a bit, but it could probably be simplified more. - - svn path=/trunk/; revision=52008 - -commit f24067e -Author: Jörg Mayer -Date: Fri Sep 13 17:08:00 2013 +0000 - - Fix warnings shown by gcc-4.8.1 - - /home/jmayer/work/wireshark/svn/trunk/echld/common.c:134:2: error: enum conversion in initialization is invalid in C++ [-Werror=c++-compat] - {0,NULL} - ^ - /home/jmayer/work/wireshark/svn/trunk/echld/common.c:134:2: error: (near initialization for ‘t_map[34].type’) [-Werror=c++-compat] - /home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: note: expected ‘echld_msg_type_t’ but argument is of type ‘guint32’ - /home/jmayer/work/wireshark/svn/trunk/echld/common.c:253:8: error: variable ‘off’ set but not used [-Werror=unused-but-set-variable] - long off; - ^ - cc1: all warnings being treated as errors - - Still todo: - - /home/jmayer/work/wireshark/svn/trunk/echld/common.c: In function ‘echld_read_frame’: - /home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: error: enum conversion when passing argument 4 of ‘cb’ is invalid in C++ [-Werror=c++-compat] - cb( &(r->rp[sizeof(hdr_t)]), HDR_LEN(h), h->h.chld_id, HDR_TYPE(h), h->h.reqh_id, cb_data); - ^ - /home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: note: expected ‘echld_msg_type_t’ but argument is of type ‘guint32’ - - Whitespace fixes - - - svn path=/trunk/; revision=52007 - -commit 9c7e47f -Author: Chris Maynard -Date: Fri Sep 13 16:52:08 2013 +0000 - - Rename --build to --check-addtext/--nocheck-addtext for clarity. - Add --check-addtext/--nocheck-addtext, --check-hf/--nocheck-hf and --debug to the usage output and format the usage output a little better. - - svn path=/trunk/; revision=52006 - -commit cabf974 -Author: Evan Huus -Date: Fri Sep 13 16:48:07 2013 +0000 - - Remove useless-use-of-emem, add modelines. - - svn path=/trunk/; revision=52005 - -commit b3ce4ec -Author: Anders Broman -Date: Fri Sep 13 16:33:28 2013 +0000 - - Try to make the heuristic a bit more efficient. - - svn path=/trunk/; revision=52004 - -commit 35a56ca -Author: Jörg Mayer -Date: Fri Sep 13 14:14:23 2013 +0000 - - Dario Lombardo via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147 - - More emem -> wmem conversion: Addresses se_malloc() calls. - - svn path=/trunk/; revision=52003 - -commit 23d3e3d -Author: Jörg Mayer -Date: Fri Sep 13 10:13:19 2013 +0000 - - Dario Lombardo via - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147 - - Migration from emem to wmem for trivial cases (ep_alloc only). - - - svn path=/trunk/; revision=52002 - -commit 1e762e3 -Author: Jörg Mayer -Date: Fri Sep 13 09:13:09 2013 +0000 - - Remove epan.h from ftypes.h, address.h and tpg.h, - add it to proto.h as it contains macros that require emem.h - - svn path=/trunk/; revision=52001 - -commit f348cd5 -Author: Jörg Mayer -Date: Fri Sep 13 08:49:38 2013 +0000 - - Explicit inclusion of emem.h - - svn path=/trunk/; revision=52000 - -commit e0d70f2 -Author: Jörg Mayer -Date: Fri Sep 13 08:40:51 2013 +0000 - - Include emem.h - - svn path=/trunk/; revision=51999 - -commit 083ef50 -Author: Jörg Mayer -Date: Fri Sep 13 08:26:15 2013 +0000 - - Two more places with now explicit emem.h include - - svn path=/trunk/; revision=51998 - -commit 029e258 -Author: Jörg Mayer -Date: Fri Sep 13 08:16:50 2013 +0000 - - Explicitly include emem.h where it is needed - - svn path=/trunk/; revision=51997 - -commit 1ad6835 -Author: Gerald Combs -Date: Thu Sep 12 23:46:56 2013 +0000 - - Add a context menu to the TCP stream graph which includes all of our - keyboard shortcuts. - - svn path=/trunk/; revision=51996 - -commit e3ef5ac -Author: Jörg Mayer -Date: Thu Sep 12 22:53:40 2013 +0000 - - emem -> wmem - - This was the last dissector in packet-[t-z]*.c that I consider - trivial enough to work on it. The remaining ones a left to people - who intend to think while doing the conversion ;-) - - svn path=/trunk/; revision=51995 - -commit 1810de7 -Author: Jörg Mayer -Date: Thu Sep 12 22:44:08 2013 +0000 - - In some cases add include emem.h - In other cases emem -> wmem - - svn path=/trunk/; revision=51994 - -commit 2614ec5 -Author: Jörg Mayer -Date: Thu Sep 12 22:26:43 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=51993 - -commit c1e9555 -Author: Gerald Combs -Date: Thu Sep 12 22:04:37 2013 +0000 - - Try different arrow glyphs. - - svn path=/trunk/; revision=51992 - -commit 6cedc2c -Author: Pascal Quantin -Date: Thu Sep 12 22:03:31 2013 +0000 - - Convert a few more dissectors to wmem - - svn path=/trunk/; revision=51991 - -commit 2e9cd19 -Author: Jörg Mayer -Date: Thu Sep 12 21:53:53 2013 +0000 - - == has higher precedence than & - http://en.wikipedia.org/wiki/Operators_in_C_and_C++ - - svn path=/trunk/; revision=51990 - -commit 07c3d05 -Author: Gerald Combs -Date: Thu Sep 12 21:37:47 2013 +0000 - - Add previous/next stream navigation to the TCP stream graph dialog. - - Add get_tcp_stream_count() to the TCP dissector and modify - graph_segment_list_get() to allow matching based solely on a stream. - - Use text instead of icons for the mouse click behavior buttons. Remove - their PNG resources since we aren't using them any more. Fix setting the - cursor in the graph widget. - - svn path=/trunk/; revision=51989 - -commit 467f128 -Author: Jörg Mayer -Date: Thu Sep 12 21:34:58 2013 +0000 - - emem -> wmem - "tshark -v" tested - - svn path=/trunk/; revision=51988 - -commit fd50ee1 -Author: Martin Kaiser -Date: Thu Sep 12 21:29:50 2013 +0000 - - dissect OCSP nonce extension - some minor reformatting of the ASN.1 imports - - svn path=/trunk/; revision=51987 - -commit c7f22db -Author: Martin Kaiser -Date: Thu Sep 12 21:17:21 2013 +0000 - - mark unused parameters - - svn path=/trunk/; revision=51986 - -commit 71b9394 -Author: Anders Broman -Date: Thu Sep 12 20:53:51 2013 +0000 - - Try to make the STUN heuristic sligtly more efficient. - - svn path=/trunk/; revision=51985 - -commit 884b61f -Author: Jörg Mayer -Date: Thu Sep 12 20:38:07 2013 +0000 - - Add missing includes - Remove not needed include - emem -> wmem - - svn path=/trunk/; revision=51984 - -commit efe18f1 -Author: Pascal Quantin -Date: Thu Sep 12 20:37:30 2013 +0000 - - Convert a few dissectors from emem to wmem API - - svn path=/trunk/; revision=51983 - -commit ac7ecb1 -Author: Chris Maynard -Date: Thu Sep 12 20:34:19 2013 +0000 - - More dissector table name related changes (a continuation of r51904). - - svn path=/trunk/; revision=51982 - -commit aa8fbf0 -Author: Guy Harris -Date: Thu Sep 12 20:31:31 2013 +0000 - - The secs field of an nstime_t is a time_t, so cast to that. - - svn path=/trunk/; revision=51981 - -commit 8d8c56d -Author: Guy Harris -Date: Thu Sep 12 20:30:55 2013 +0000 - - Note what the various ENC_TIME_ encodings are. - - svn path=/trunk/; revision=51980 - -commit 1965ab5 -Author: Jörg Mayer -Date: Thu Sep 12 20:25:51 2013 +0000 - - emem -> wmem ("tshark -v" tested) - - svn path=/trunk/; revision=51979 - -commit 934cc45 -Author: Jörg Mayer -Date: Thu Sep 12 20:07:48 2013 +0000 - - Make proto.c compile on my system (linux, 32 bit) - - [-Werror,-Wshorten-64-to-32] - time_stamp.secs = (todsecs / 1000000) - TOD_BASETIME; - ~ ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ - /home/jmayer/work/wireshark/svn/trunk/epan/proto.c:1613:44: error: implicit conversion - loses integer precision: 'unsigned long long' to 'time_t' (aka 'long') - [-Werror,-Wshorten-64-to-32] - time_stamp.secs = (todsecs / 1000000) - TOD_BASETIME; - ~ ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ - - svn path=/trunk/; revision=51978 - -commit 753afe5 -Author: Anders Broman -Date: Thu Sep 12 18:17:41 2013 +0000 - - Fix UDP port range. - - svn path=/trunk/; revision=51977 - -commit 1f3adea -Author: Evan Huus -Date: Thu Sep 12 17:32:49 2013 +0000 - - Revert the TPNCP changes in r51972 until we can figure out a better way to fix - it. - - svn path=/trunk/; revision=51976 - -commit 3d5ed04 -Author: Evan Huus -Date: Thu Sep 12 17:17:42 2013 +0000 - - Add casts to fix mac buildbots. - - svn path=/trunk/; revision=51975 - -commit f8693e3 -Author: Evan Huus -Date: Thu Sep 12 16:56:37 2013 +0000 - - From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9072 - - Add support for Time-of-Day timestamp format from z/OS. - - svn path=/trunk/; revision=51974 - -commit e5bac80 -Author: Evan Huus -Date: Thu Sep 12 16:31:30 2013 +0000 - - Use wmem_new to get the automatic casts to fix the buildbot. - - svn path=/trunk/; revision=51973 - -commit d1ee499 -Author: Jörg Mayer -Date: Thu Sep 12 16:15:54 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=51972 - -commit 95ae33c -Author: Jörg Mayer -Date: Thu Sep 12 15:29:55 2013 +0000 - - emem -> wmem - - svn path=/trunk/; revision=51971 - -commit fe5238e -Author: Jörg Mayer -Date: Thu Sep 12 15:07:22 2013 +0000 - - Convert from emem to wmem. - Trivial whitespace fix in packet-tftp.c while at it. - - svn path=/trunk/; revision=51970 - -commit a102540 -Author: Evan Huus -Date: Thu Sep 12 13:45:04 2013 +0000 - - When profiling we are more interested in real-world performance than memory - errors, so we want to use the "fast" allocators rather than the ones that are - friendly to memcheck. - - svn path=/trunk/; revision=51969 - -commit 58a9f5c -Author: Evan Huus -Date: Thu Sep 12 12:37:27 2013 +0000 - - More wmem. - - svn path=/trunk/; revision=51968 - -commit 343772c -Author: Evan Huus -Date: Thu Sep 12 12:25:17 2013 +0000 - - Convert a few more dissectors to wmem. - - svn path=/trunk/; revision=51967 - -commit 2d128b7 -Author: Evan Huus -Date: Thu Sep 12 12:16:15 2013 +0000 - - Use epan-scope memory for OIDs, cleaning up another ~100KB of valgrind - complaints. - - svn path=/trunk/; revision=51966 - -commit c0d7a95 -Author: Stig Bjørlykke -Date: Thu Sep 12 11:34:13 2013 +0000 - - From Robert G. Jakabosky via bug 5575: - Fix module registration. Must use lua_call() when calling luaopen_*() - - svn path=/trunk/; revision=51965 - -commit dc7d611 -Author: Guy Harris -Date: Thu Sep 12 04:10:47 2013 +0000 - - Need to specify the particular FT_UINTn type. - - svn path=/trunk/; revision=51964 - -commit 0c11b6f -Author: Guy Harris -Date: Thu Sep 12 03:41:22 2013 +0000 - - Give various files RCS IDs. - - svn path=/trunk/; revision=51963 - -commit caf09bd -Author: Guy Harris -Date: Thu Sep 12 03:36:36 2013 +0000 - - Fix the types of some multi-bit bitfields - they're not Booleans. Give - some of them real names (presumably they were copied-and-pasted without - editing). - - Thanks and a tip of the Hatlo hat to checkAPI.pl for catching this. - - svn path=/trunk/; revision=51962 - -commit a1203de -Author: Gerald Combs -Date: Thu Sep 12 00:03:47 2013 +0000 - - Make sure qmake links with zlib on Windows. - - svn path=/trunk/; revision=51961 - -commit 5cd898c -Author: Chris Maynard -Date: Wed Sep 11 21:55:00 2013 +0000 - - Rename frame relay NLPID dissector table from "fr.ietf" to "fr.nlpid". - - svn path=/trunk/; revision=51960 - -commit 0b0cb31 -Author: Chris Maynard -Date: Wed Sep 11 21:44:13 2013 +0000 - - Test the return value of tvb_reported_length_remaining() as > 0 rather than != 0. While in these cases, I don't see any actual bugs due to other protections, I don't think it hurts to make this change and should help avoid others from copying/pasting this code elsewhere, where similar protections may not be in place. - - svn path=/trunk/; revision=51959 - -commit f2c276e -Author: Chris Maynard -Date: Wed Sep 11 21:37:58 2013 +0000 - - Change the name of the Cisco HDLC dissector table from chdlctype to chdlc.protocol and change the UI name to match. It is by far much more common to name the tables after the field than to pick another name. - - svn path=/trunk/; revision=51958 - -commit 2a276b3 -Author: Jeff Morriss -Date: Wed Sep 11 21:06:34 2013 +0000 - - Mark a couple of parameters as unused. - - Fix up indentation in many places while getting rid of tabs. - - svn path=/trunk/; revision=51957 - -commit d1c73ac -Author: Anders Broman -Date: Wed Sep 11 20:26:42 2013 +0000 - - - Introduce a dissector table for Vendor AVP:s - - Dissect some of Cable Labs AVP:s. - - svn path=/trunk/; revision=51956 - -commit 34e2a96 -Author: Gerald Combs -Date: Wed Sep 11 19:59:22 2013 +0000 - - Define NOMINMAX for the entire Qt build. - - svn path=/trunk/; revision=51955 - -commit 52bcaf6 -Author: Martin Kaiser -Date: Wed Sep 11 19:49:16 2013 +0000 - - remove unused variable, mark unused parameter - - svn path=/trunk/; revision=51954 - -commit e3cccd1 -Author: Anders Broman -Date: Wed Sep 11 19:22:24 2013 +0000 - - Get rid of some users the addrinfo_list. - - svn path=/trunk/; revision=51953 - -commit bf59c70 -Author: Chris Maynard -Date: Wed Sep 11 18:06:29 2013 +0000 - - Instead of prepending "LLC " to the UI table name, just modify the table name. - - svn path=/trunk/; revision=51952 - -commit 6986eb4 -Author: Gerald Combs -Date: Wed Sep 11 17:39:49 2013 +0000 - - Move a lot of includes from follow_stream_dialog.h to - follow_stream_dialog.cpp. Remove the ones that we don't use. Use - QMessageBox in place of simple_dialog. - - Move IP6OPT_HOME_ADDRESS and related definitions to packet-ipv6.c. It - looks like we only use it there and it conflicts with WinPcap. - - Mark some items unused. - - svn path=/trunk/; revision=51951 - -commit 2d132d3 -Author: Chris Maynard -Date: Wed Sep 11 17:31:24 2013 +0000 - - Add a link to IANA's Assigned Internet Protocol Numbers page. - - svn path=/trunk/; revision=51950 - -commit 8daede4 -Author: Gerald Combs -Date: Wed Sep 11 16:18:17 2013 +0000 - - Make sure we can link on Windows. - - svn path=/trunk/; revision=51949 - -commit 73d1162 -Author: Anders Broman -Date: Wed Sep 11 04:56:44 2013 +0000 - - From Tommy Wu: - Update-Reason should be an integer. - - svn path=/trunk/; revision=51948 - -commit eb6d67d -Author: Gerald Combs -Date: Tue Sep 10 22:25:41 2013 +0000 - - Use the correct GnuTLS include directory. - - svn path=/trunk/; revision=51947 - -commit d7cdca5 -Author: Pascal Quantin -Date: Tue Sep 10 22:19:24 2013 +0000 - - Update User Guide - - svn path=/trunk/; revision=51946 - -commit ef6ad28 -Author: Gerald Combs -Date: Tue Sep 10 22:01:42 2013 +0000 - - Add a hack to allow builds to succeed on 64-bit systems. - - svn path=/trunk/; revision=51945 - -commit 33beb26 -Author: Pascal Quantin -Date: Tue Sep 10 21:43:51 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9116 : - README.stats_tree shows the wrong function parameters for stats_tree_register - - svn path=/trunk/; revision=51944 - -commit 17678f9 -Author: Gerald Combs -Date: Tue Sep 10 21:24:52 2013 +0000 - - Homebrew installs gettext (including libintl, which GLib requires) in - /usr/local/opt/gettext. Tell CMake to update our include and library - paths accordingly. - - svn path=/trunk/; revision=51943 - -commit 84069ac -Author: Pascal Quantin -Date: Tue Sep 10 21:18:28 2013 +0000 - - From Philippe Rosenfeld via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9126 : - Fix the value of 'SEND_TO_UE' in the DIAMETER Gx dictionary for Packet-Filter-Usage AVP - - svn path=/trunk/; revision=51942 - -commit 10193e1 -Author: Pascal Quantin -Date: Tue Sep 10 19:37:13 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9128 : - ZigBee ZCL epoch is January 1, 2000 - - svn path=/trunk/; revision=51939 - -commit eee252d -Author: Martin Kaiser -Date: Tue Sep 10 17:55:31 2013 +0000 - - proto_tree -> proto_item - - svn path=/trunk/; revision=51936 - -commit 8a5db6b -Author: Gerald Combs -Date: Tue Sep 10 15:39:05 2013 +0000 - - Add newlines to the AsciiDoc output. - - svn path=/trunk/; revision=51930 - -commit 4b0a906 -Author: Martin Kaiser -Date: Tue Sep 10 15:01:52 2013 +0000 - - remove unnecessary if (tree) - no need for tvb_ensure_bytes_exist() - replace += 1;; with ++; - - svn path=/trunk/; revision=51929 - -commit db96634 -Author: Stig Bjørlykke -Date: Tue Sep 10 11:18:41 2013 +0000 - - Enable Lua ldap, smb and smb2 taps - - svn path=/trunk/; revision=51928 - -commit ed31ede -Author: Balint Reczey -Date: Tue Sep 10 11:10:00 2013 +0000 - - Make compare-abis.sh work with versions having multiple digits in version number - - svn path=/trunk/; revision=51927 - -commit 152a9c5 -Author: Stig Bjørlykke -Date: Tue Sep 10 10:35:30 2013 +0000 - - Added TreeItem prepend_text(). - - svn path=/trunk/; revision=51924 - -commit d5909d3 -Author: Guy Harris -Date: Tue Sep 10 10:28:30 2013 +0000 - - Use -m32, instead, as per Michael Tuexen's suggestion. - - svn path=/trunk/; revision=51923 - -commit 860856b -Author: Stig Bjørlykke -Date: Tue Sep 10 10:27:47 2013 +0000 - - Fixed some NSTime error texts. - - svn path=/trunk/; revision=51922 - -commit 2891a58 -Author: Guy Harris -Date: Tue Sep 10 10:24:00 2013 +0000 - - When building for 10.4 or 10.5, force 32-bit x86 on x86 and 32-bit PPC - on PPC. - - svn path=/trunk/; revision=51921 - -commit 8bde188 -Author: Stig Bjørlykke -Date: Tue Sep 10 10:07:40 2013 +0000 - - Fixed FieldInfo documentation. - - svn path=/trunk/; revision=51920 - -commit 9378661 -Author: Anders Broman -Date: Tue Sep 10 06:32:41 2013 +0000 - - From Selvamegala: - - GTS starting slot in the Beacon frame is not parsed correctly. As per the Spec, in the 3byte gts descriptor value bit 0- 15 refers Device Short address bit 16-19 – Starting slot bit 20-23 – GTS length. - - (I Dug out the onliner from the attached file) - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8946 - - svn path=/trunk/; revision=51919 - -commit 0bb9585 -Author: Anders Broman -Date: Tue Sep 10 06:06:55 2013 +0000 - - Freom Dennis: - - As I looked into the implementation in epan/dissectors/packet-ieee802a.c, there's a bug in the dissect_ieee802a(). After OUI and PID is parsed, it looks for the customized sub-dissector_table by - oui_info = (oui_info_t *)g_hash_table_lookup(oui_info_table, GUINT_TO_POINTER(oui)) - The problem is that the oui is defined as an array (guint8 oui[3]), whose value contains the 3-byte customized OUI. However, here GUINT_TO_POINTER(oui) converts the local array oui's address to the hash table key, instead of the value. That cause the search in the hash table to fail, because the ieee802_add_oui() use the OUI value as the key. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 - - svn path=/trunk/; revision=51918 - -commit 60aaa2d -Author: Anders Broman -Date: Tue Sep 10 05:47:28 2013 +0000 - - Change the default preference on how to dissect dunneled data to GTP_TPDU_AS_TPDU. - - svn path=/trunk/; revision=51917 - -commit b1e6fc8 -Author: Anders Broman -Date: Tue Sep 10 05:43:17 2013 +0000 - - From: Michal Labedzki - - Subject: [PATCH] NFC: PN532: Implement half of PN532 specification - - Implement TG_* and RF_* commands/responses. - Also decode "status" field in all commands. - Update USB CCID to decode "escaped" payload. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9119 - - svn path=/trunk/; revision=51916 - -commit 8646abf -Author: Guy Harris -Date: Tue Sep 10 01:18:09 2013 +0000 - - It's such fun to have four count 'em four different build systems - (autotools, CMake, nmake, qmake). Throw something at qmake in the hopes - of letting it use GnuTLS in the "follow SSL stream" code. - - svn path=/trunk/; revision=51915 - -commit fca3bb6 -Author: Evan Huus -Date: Tue Sep 10 01:08:07 2013 +0000 - - Restart the splash timer *after* the paint has completed, so that in situations - when the paint takes a long time (for very large windows, or on older machines) - that doesn't cause every single event to paint (which slows the whole thing to - a crawl). Drop the splash timer to 15ms, since we're no longer counting paints - this seems like a more appropriate value. The old value of 50ms would causing - the splash to only paint once or twice during startup. - - svn path=/trunk/; revision=51914 - -commit 6a06b06 -Author: Guy Harris -Date: Tue Sep 10 00:15:15 2013 +0000 - - Explicitly refer to ui/follow.h, as we do with other header files from - the ui directory, so see if that fixes the build issues. - - svn path=/trunk/; revision=51913 - -commit 0df1640 -Author: Guy Harris -Date: Mon Sep 9 23:33:51 2013 +0000 - - Get rid of a whole bunch of things that are supposed to be included by - source files rather than header files in most if not all cases. - - svn path=/trunk/; revision=51908 - -commit d3f277c -Author: Chris Maynard -Date: Mon Sep 9 22:30:40 2013 +0000 - - More dissector table UI name changes (a continuation of r51904). - - svn path=/trunk/; revision=51907 - -commit bc48d52 -Author: Guy Harris -Date: Mon Sep 9 22:21:36 2013 +0000 - - "uni", in "unistd.h", stands for "Unix". Only include it if we have it, - which we don't on Windows. - - svn path=/trunk/; revision=51905 - -commit 0c41507 -Author: Chris Maynard -Date: Mon Sep 9 21:55:57 2013 +0000 - - Change some internal dissector table UI names so it's clear which protocol they pertain to and it's easier to find in the list. - - svn path=/trunk/; revision=51904 - -commit 408b498 -Author: Stig Bjørlykke -Date: Mon Sep 9 21:42:49 2013 +0000 - - Return ByteArray as "value" for FieldInfo's with type FT_NONE (which has data). - - This fixes bug 5201. - - svn path=/trunk/; revision=51903 - -commit 8fbfb0f -Author: Pascal Quantin -Date: Mon Sep 9 21:32:45 2013 +0000 - - Add svn:mime-type property to follow_stream_dialog.ui - - svn path=/trunk/; revision=51902 - -commit 9d49aa7 -Author: Chris Maynard -Date: Mon Sep 9 21:32:03 2013 +0000 - - Replace the simpler chop example with a more detailed example. - - svn path=/trunk/; revision=51901 - -commit fb6d18f -Author: Jeff Morriss -Date: Mon Sep 9 21:24:54 2013 +0000 - - Set *.ts files' mime type to be XML; set svn properties on tools/pre-commit. - - svn path=/trunk/; revision=51900 - -commit f8624ce -Author: Stig Bjørlykke -Date: Mon Sep 9 21:20:26 2013 +0000 - - Initialize all tvb values in FieldInfo_get_range. - - This fixes bug 5200. - - svn path=/trunk/; revision=51899 - -commit fb621af -Author: Guy Harris -Date: Mon Sep 9 21:12:49 2013 +0000 - - But we *do* have to include here. - - svn path=/trunk/; revision=51898 - -commit 0f84971 -Author: Guy Harris -Date: Mon Sep 9 21:09:03 2013 +0000 - - Another "this depends on a ui_XXX.h" required to force the ui_XXX.h to - be built. - - svn path=/trunk/; revision=51897 - -commit c3fe87f -Author: Chris Maynard -Date: Mon Sep 9 21:09:00 2013 +0000 - - With the change from r51895, revert r51894. - - svn path=/trunk/; revision=51896 - -commit e5947cf -Author: Pascal Quantin -Date: Mon Sep 9 21:04:41 2013 +0000 - - Cleanup follow.h a bit: - - no need to include zlib.h - - sgetline() function is not used outside of follow.c - - svn path=/trunk/; revision=51895 - -commit 85cb27b -Author: Chris Maynard -Date: Mon Sep 9 21:02:07 2013 +0000 - - Add $(ZLIB_CFLAGS) to the GENERATED_CFLAGS list to fix compile error. - - svn path=/trunk/; revision=51894 - -commit 9ac9114 -Author: Pascal Quantin -Date: Mon Sep 9 20:43:31 2013 +0000 - - Add missing svn properties - - svn path=/trunk/; revision=51893 - -commit 18a8525 -Author: Jörg Mayer -Date: Mon Sep 9 20:37:50 2013 +0000 - - While the previous fix to this file added the ; at the end, - it shoud have added _; - - Was the original commit compile tested before committing? - - svn path=/trunk/; revision=51892 - -commit 0a20370 -Author: Jörg Mayer -Date: Mon Sep 9 20:33:09 2013 +0000 - - Make follow_stream_dialog.h compile. - - Question: Should all this stuff really be included in the .h file - or in the .cpp file(s)? - - svn path=/trunk/; revision=51891 - -commit 1d095d1 -Author: Jörg Mayer -Date: Mon Sep 9 20:25:59 2013 +0000 - - Add a missing ; - - svn path=/trunk/; revision=51890 - -commit f93f3e2 -Author: Jörg Mayer -Date: Mon Sep 9 20:25:26 2013 +0000 - - No need to include gtk/gtk.h - - svn path=/trunk/; revision=51889 - -commit cc39b08 -Author: Chris Maynard -Date: Mon Sep 9 19:46:02 2013 +0000 - - Remove a leftover #if 0 block. - - svn path=/trunk/; revision=51888 - -commit fe4fc3c -Author: Chris Maynard -Date: Mon Sep 9 19:43:37 2013 +0000 - - Fix typo. - - svn path=/trunk/; revision=51887 - -commit 51ccb61 -Author: Chris Maynard -Date: Mon Sep 9 19:39:45 2013 +0000 - - Fix the "crossed chopping region" problem. Also, move chopping to its own function for both clarity and correctness since we need to compute chop offsets and lengths on a per-packet basis whereas previously this was not being done. - - Lastly, try to improve the documentation a bit concerning chopping and provide another example depicting 2 separate chopping regions. *Maybe* this is clearer? - - One more example here for posterity: Given the following 75 byte packet, there - are 8 different ways to chop the 2 regions marked as 10 and 20 in a single pass: - - <--------------------------- 75 ----------------------------> - - +---+-------+-----------+---------------+-------------------+ - | 5 | 10 | 15 | 20 | 25 | - +---+-------+-----------+---------------+-------------------+ - - 1) editcap -C 5:10 -C -25:-20 in.pcap out.pcap - 2) editcap -C 5:10 -C 50:-20 in.pcap out.pcap - 3) editcap -C -70:10 -C -25:-20 in.pcap out.pcap - 4) editcap -C -70:10 -C 50:-20 in.pcap out.pcap - 5) editcap -C 30:20 -C -60:-10 in.pcap out.pcap - 6) editcap -C 30:20 -C 15:-10 in.pcap out.pcap - 7) editcap -C -45:20 -C -60:-10 in.pcap out.pcap - 8) editcap -C -45:20 -C 15:-10 in.pcap out.pcap - - - svn path=/trunk/; revision=51886 - -commit 2632e16 -Author: Alexis La Goutte -Date: Mon Sep 9 19:30:47 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51885 - -commit 45b9f59 -Author: Alexis La Goutte -Date: Mon Sep 9 19:30:39 2013 +0000 - - Add my pre-commit git script (with checkAPI/hf/encoding args...) Need to copy in .git/hooks folder and will be launch all check when make local commit (if there is some false-positive add --no-verify to disable check) - - Should be enhance to be better (check trailing/whitespace...) - - svn path=/trunk/; revision=51884 - -commit 80f9326 -Author: Alexis La Goutte -Date: Mon Sep 9 19:30:30 2013 +0000 - - From Thomas ERSFELD (GSoC13) - - Add TCP/UDP/SSL Follow feature to QtShark - - Known issue : - * Duplicate code with GTK (function need follow_info_t struct but in GTK there is some GWidget variable in struct) - * Sometimes TCP Follow fail... - - svn path=/trunk/; revision=51883 - -commit 41174fa -Author: Alexis La Goutte -Date: Mon Sep 9 19:30:19 2013 +0000 - - if display_filter is NULL, qtshark crash... - - svn path=/trunk/; revision=51882 - -commit fef8195 -Author: Alexis La Goutte -Date: Mon Sep 9 19:30:10 2013 +0000 - - add qtshark /path/mycap.pcapng support (from GTK code...) - - svn path=/trunk/; revision=51881 - -commit 37260a4 -Author: Alexis La Goutte -Date: Mon Sep 9 19:30:02 2013 +0000 - - Use the same variable name than GTK (cf_name) - - svn path=/trunk/; revision=51880 - -commit 346ff86 -Author: Alexis La Goutte -Date: Mon Sep 9 19:29:48 2013 +0000 - - Update README.qt after last change in QtShark translations (Add Preferences to select language) - - svn path=/trunk/; revision=51879 - -commit a34dd7e -Author: Jörg Mayer -Date: Mon Sep 9 19:23:17 2013 +0000 - - The previous commit contained some WIP: Check which files - still generate warnings. Finish that. - Only qcustomplot.cpp does. Move the rest to clean. - - - svn path=/trunk/; revision=51878 - -commit 8e5006a -Author: Jörg Mayer -Date: Mon Sep 9 19:16:40 2013 +0000 - - Commit 51871 did not update CMakeLists.txt - - svn path=/trunk/; revision=51877 - -commit 771668d -Author: Evan Huus -Date: Mon Sep 9 17:51:30 2013 +0000 - - Register a wmem callback to free the glib hash tables used in SMB2 conversation - structs. Fixes the most egregious of the memory leaks (around 300KB) from - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9120 - - svn path=/trunk/; revision=51873 - -commit f74bd06 -Author: Stig Bjørlykke -Date: Mon Sep 9 17:49:22 2013 +0000 - - Removed return value from ByteArray append and prepend, as this did push - the same ByteArray twice (and thus calling the GC twice). - This should fix bug 4461. - - Changed ByteArray concat to create a new array to be returned. - - svn path=/trunk/; revision=51872 - -commit f99f7bf -Author: Alexis La Goutte -Date: Mon Sep 9 17:49:15 2013 +0000 - - From Dean Lee via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8597 Qtshark: Chinese Simp translation - - From me : - Add to the (new) Qtshark Language selector - - svn path=/trunk/; revision=51871 - -commit fe4407e -Author: Alexis La Goutte -Date: Mon Sep 9 16:20:45 2013 +0000 - - Add Preference to change Language (in QtShark) - - Need restart application to change language - - svn path=/trunk/; revision=51869 - -commit aa0e020 -Author: Bill Meier -Date: Mon Sep 9 14:26:41 2013 +0000 - - Use a bunch of #includes only when needed. (2nd try; hat tip to Guy). - - - svn path=/trunk/; revision=51868 - -commit 955c898 -Author: Martin Kaiser -Date: Mon Sep 9 13:07:08 2013 +0000 - - coverity 996921: add missing break - - svn path=/trunk/; revision=51867 - -commit 9c023c0 -Author: Martin Kaiser -Date: Mon Sep 9 12:53:14 2013 +0000 - - we don't need brackets around SET_ADDRESS() any more - - svn path=/trunk/; revision=51866 - -commit e3eb345 -Author: Evan Huus -Date: Mon Sep 9 12:16:18 2013 +0000 - - In SMB2 dissector, make sure pinfo->private_data is pointing to an SMB struct - before calling an SMB helper function which expects it. Fixes the primary error - in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9120 - - svn path=/trunk/; revision=51865 - -commit a78abca -Author: Stig Bjørlykke -Date: Mon Sep 9 06:41:03 2013 +0000 - - Yet another cast fix. - - svn path=/trunk/; revision=51864 - -commit 4b4aaf3 -Author: Chris Maynard -Date: Mon Sep 9 06:26:42 2013 +0000 - - The file was a weird mix of 2 and 4 indent so use a consistent 4-space indent scheme and add modelines to match. Also, declare a few variables static. - - (A fix for crossed chopping regions should be coming in the near future ...) - - svn path=/trunk/; revision=51863 - -commit 6263037 -Author: Stig Bjørlykke -Date: Mon Sep 9 06:04:46 2013 +0000 - - One small step towards fixing the broken python support. - Support Python 3. - - svn path=/trunk/; revision=51862 - -commit 8175865 -Author: Stig Bjørlykke -Date: Mon Sep 9 05:51:35 2013 +0000 - - Added casts in dissector_delete_all_check(). - - svn path=/trunk/; revision=51861 - -commit 9c3487a -Author: Stig Bjørlykke -Date: Mon Sep 9 05:45:24 2013 +0000 - - Added DissectorTable_set and DissectorTable_remove_all to simplify changing - registered port numbers in PROTO.prefs_changed. - - Now we only need this code in Lua plugins having port numbers prefs: - - PROTO.prefs.ports = Pref.range ("Ports", 0, "Port numbers", 65535) - - PROTO.prefs_changed() - local udp_table = DissectorTable.get ("udp.port") - udp_table:set (PROTO.prefs.ports, PROTO) - end - - svn path=/trunk/; revision=51860 - -commit 2b698e5 -Author: Stig Bjørlykke -Date: Mon Sep 9 05:36:45 2013 +0000 - - Added dissector_delete_all() to remove all entries from a dissector table. - - svn path=/trunk/; revision=51859 - -commit e4025f4 -Author: Michael Mann -Date: Mon Sep 9 03:43:45 2013 +0000 - - Add an example of filterable expert info. - - Also cleanup references to README.developer that are now README.dissector. - - svn path=/trunk/; revision=51858 - -commit 25bb947 -Author: Michael Mann -Date: Mon Sep 9 02:19:27 2013 +0000 - - Have conversion tools use the "new" expert_add_info_format. - - svn path=/trunk/; revision=51857 - -commit 829c1ed -Author: Gerald Combs -Date: Mon Sep 9 01:40:06 2013 +0000 - - Add the TCP window scaling graph. Add zoom selections. - - Rename some methods. Add the ability to toggle time and sequence number - origins. Add more keyboard shortcuts. Comment out abs_secs abs_usecs in - the segment struct since it looks like we aren't using them. Make sure - we stay in the same TCP stream. - - svn path=/trunk/; revision=51856 - -commit 077d252 -Author: Bill Meier -Date: Mon Sep 9 01:23:06 2013 +0000 - - Revert #51843: Build fails on OSX-10.5-x8 - - svn path=/trunk/; revision=51855 - -commit eeba211 -Author: Chris Maynard -Date: Mon Sep 9 01:04:13 2013 +0000 - - OK, allow either positive or negative offsets no matter if we're chopping from the beginning or the end. - - Given the following example, it's now possible to chop the 10 bytes depicted from the 100 byte packet 4 different ways and achieve the exact same results: - - <-------- 100 --------> Methods: - 1) editcap -C 20:10 in.pcap out.pcap - +------+----+---------+ 2) editcap -C -80:10 in.pcap out.pcap - | 20 | 10 | 70 | 3) editcap -C -70:-10 in.pcap out.pcap - +------+----+---------+ 4) editcap -C 30:-10 in.pcap out.pcap - - - svn path=/trunk/; revision=51854 - -commit bffe25f -Author: Michael Mann -Date: Mon Sep 9 01:02:44 2013 +0000 - - Complete the conversion of expert_add_info_format_text -> expert_add_info_format. - - svn path=/trunk/; revision=51853 - -commit 9e3f9b4 -Author: Michael Mann -Date: Mon Sep 9 00:44:09 2013 +0000 - - expert_add_info_format_text -> expert_add_info_format - - svn path=/trunk/; revision=51852 - -commit 00dd0ad -Author: Michael Mann -Date: Mon Sep 9 00:28:48 2013 +0000 - - expert_add_info_format_text -> expert_add_info_format - - svn path=/trunk/; revision=51851 - -commit 7ec34a5 -Author: Michael Mann -Date: Mon Sep 9 00:11:19 2013 +0000 - - expert_add_info_format_text -> expert_add_info_format - - svn path=/trunk/; revision=51850 - -commit a50c428 -Author: Michael Mann -Date: Sun Sep 8 23:47:06 2013 +0000 - - expert_add_info_format_text -> expert_add_info_text - - svn path=/trunk/; revision=51849 - -commit ba3a77b -Author: Chris Maynard -Date: Sun Sep 8 21:35:24 2013 +0000 - - Specify the optional offset as a positive value, regardless of chopping from packet beginning or packet end. I *think* this will be easier syntax to remember. - - svn path=/trunk/; revision=51848 - -commit f54441c -Author: Pascal Quantin -Date: Sun Sep 8 21:22:11 2013 +0000 - - Add a chunk forgotten in r51846 - - svn path=/trunk/; revision=51847 - -commit a6ae13d -Author: Pascal Quantin -Date: Sun Sep 8 21:10:36 2013 +0000 - - Slightly different fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9117 : - Check that tvb returned by dissect_per_bit_string is not null before trying to use it - - svn path=/trunk/; revision=51846 - -commit 54adc0d -Author: Chris Maynard -Date: Sun Sep 8 20:29:26 2013 +0000 - - Allow an optional offset to be specified when chopping bytes from packets. - - svn path=/trunk/; revision=51845 - -commit 1b009df -Author: Michael Mann -Date: Sun Sep 8 19:32:10 2013 +0000 - - Couldn't quite figure out how to make the expert items in proto.c and the LUA API filterable (suggestions welcome!), but I wanted to start forcing dissectors to use the filterable expert API (nothing like compile errors to force change!). I created expert_add_info_format_internal (original expert_add_info_format) and used it as a placeholder for proto.c/LUA API until a solution is created. The "new" expert_add_info_format will be the "old" expert_add_info_format_text, and I'll slowly do the search/replace. - - For those with dissectors outside the source tree, please see tools/convert_expert_add_info_format.pl for help with the conversion. Please do not use expert_add_info_format_internal, as it's support time will be very short lived. - - svn path=/trunk/; revision=51844 - -commit fb75b68 -Author: Bill Meier -Date: Sun Sep 8 19:25:36 2013 +0000 - - Use a bunch of #includes only when apparently needed. - - svn path=/trunk/; revision=51843 - -commit 15f1dd9 -Author: Michael Mann -Date: Sun Sep 8 18:35:36 2013 +0000 - - Convert malformed ("protocol") expert infos into something filterable. Not sure if "malformed.expert" is more confusing than helpful, but I didn't want it to share with the "malformed" display filter because their underlying types are different (FT_PROTOCOL vs FT_NONE). The ".expert" has been my convention when a condition already has a well-named hf_ display filter, but also has expert info associated with it. - - Also removed the commented out calls to expert_add_info_format to avoid confusion, but left the comments noting the reason it's absent. - - svn path=/trunk/; revision=51842 - -commit f746c09 -Author: Michael Mann -Date: Sun Sep 8 16:23:33 2013 +0000 - - Convert profinet dissector to use filterable expert info. - - NOTE: Some of the expert group values may need to be checked, PI_UNDECODED doesn't always seem like the right choice. I thought PI_PROTOCOL should be used more. - - - This concludes the conversion expert_add_info_format for all dissectors (where the function isn't commented or #defined out). Onto the "internal" (epan/lua) uses of the call. - - svn path=/trunk/; revision=51841 - -commit 5f7187c -Author: Evan Huus -Date: Sun Sep 8 15:18:55 2013 +0000 - - Cycle the recycler in realloc() and free() as well, reducing memory usage of the - stress-test by another ~10%. - - svn path=/trunk/; revision=51840 - -commit 720935c -Author: Evan Huus -Date: Sun Sep 8 15:05:08 2013 +0000 - - Fix "seq_base could be used unitialized" warning. We should probably enable - -Werror for the qt code... - - svn path=/trunk/; revision=51839 - -commit 2210020 -Author: Evan Huus -Date: Sun Sep 8 14:55:36 2013 +0000 - - Restore some format arguments that were accidentally dropped. - - svn path=/trunk/; revision=51838 - -commit ea42ade -Author: Gerald Combs -Date: Sun Sep 8 14:03:41 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-09-08] - - svn path=/trunk/; revision=51835 - -commit da96b71 -Author: Michael Mann -Date: Sun Sep 8 13:54:07 2013 +0000 - - Add filterable expert info to generated X11 dissector. I didn't regenerate the dissector files, but did manually update the source (tools/process-x11-xcb.pl) so any future regeneration won't lose the changes. - - svn path=/trunk/; revision=51834 - -commit 306a110 -Author: Michael Mann -Date: Sun Sep 8 13:35:57 2013 +0000 - - Add filterable expert info to NCP dissector. - - svn path=/trunk/; revision=51833 - -commit abdac5b -Author: Gerald Combs -Date: Sun Sep 8 01:25:27 2013 +0000 - - Add the TCP RTT graph. - - Show the time values in ms instead of s. Add a button and keyboard - shortcut to switch the connection direction. Move more code to - tap-tcp-stream.c. Update our axis labels. - - svn path=/trunk/; revision=51832 - -commit cc26962 -Author: Michael Mann -Date: Sun Sep 8 00:47:15 2013 +0000 - - Batch of filterable expert info - - svn path=/trunk/; revision=51831 - -commit 57c28ae -Author: Evan Huus -Date: Sat Sep 7 22:12:24 2013 +0000 - - Fix the FSF address in the license header for the new ASN.1 dissectors. - - svn path=/trunk/; revision=51830 - -commit 2fd0b97 -Author: Evan Huus -Date: Sat Sep 7 22:06:19 2013 +0000 - - Ignore licensing in the macosx packaging - it's all copied from Inkscape (GPL) - as far as I can tell, so it doesn't have our headers. - - svn path=/trunk/; revision=51829 - -commit 9507f56 -Author: Evan Huus -Date: Sat Sep 7 22:00:02 2013 +0000 - - Fix lua docstring causing the buildbot's documentation step to fail. - - svn path=/trunk/; revision=51828 - -commit 9fd46c3 -Author: Evan Huus -Date: Sat Sep 7 18:20:52 2013 +0000 - - - no need for a doubly-linked list of TVBs, single is simpler - - support merging chains in tvb_add_to_chain - - when we have an old reassembled TVB, just merge the chains rather than - freeing it (we may still need it as it may already be a data source) - - modelines - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9027 - - #BACKPORT, but it's gonna be messy... - - svn path=/trunk/; revision=51825 - -commit 6a4364b -Author: Stig Bjørlykke -Date: Sat Sep 7 18:04:35 2013 +0000 - - Added pinfo.can_desegment to lua script. - - This fixes bug 5205. - - svn path=/trunk/; revision=51824 - -commit 17fbd90 -Author: Michael Mann -Date: Sat Sep 7 16:07:02 2013 +0000 - - Batch of filterable expert info - - svn path=/trunk/; revision=51823 - -commit e746a01 -Author: Evan Huus -Date: Sat Sep 7 13:56:25 2013 +0000 - - Display GTPv2 Area Code fields (which show up in some DIAMETER AVPs) as - BASE_HEX_DEC instead of just BASE_DEC. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9118 - - svn path=/trunk/; revision=51822 - -commit e69ec10 -Author: Evan Huus -Date: Sat Sep 7 13:48:13 2013 +0000 - - Callers of tvb_per_bit_string expect that the returned value_tvb is non-NULL. - Ensure that is the case even in certain peculiar error conditions, by filling it - with a 0-length subset TVB. Fixes - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9117 - - Also add modelines. - - svn path=/trunk/; revision=51821 - -commit a1d88c4 -Author: Evan Huus -Date: Sat Sep 7 13:22:58 2013 +0000 - - Fix a few more places that didn't have a semicolon after the address-macro use. - - svn path=/trunk/; revision=51820 - -commit 2e299ec -Author: Evan Huus -Date: Sat Sep 7 12:51:29 2013 +0000 - - Add modelines, use consistent indentation in address.h - - Use the "do { } while (0)" trick to make the macros behave like regular function - calls syntatically. - - Fix one dissector that wasn't using semicolons after the macro calls. - - svn path=/trunk/; revision=51819 - -commit 7d3d674 -Author: Stig Bjørlykke -Date: Sat Sep 7 11:27:38 2013 +0000 - - Added support for a "prefs_change" function in Lua scripts, which is called - when the preferences for the dissector are changed. - - This is not a 100% correct implementation at the time because the - prefs_changed function in all Lua plugins will be called whenever - a preference in a single Lua plugin is changed. - - svn path=/trunk/; revision=51818 - -commit a8638ee -Author: Stig Bjørlykke -Date: Sat Sep 7 11:07:18 2013 +0000 - - Added support for integer range in DissectorTable_add and DissectorTable_remove. - - This was requested in bug 6762. - - svn path=/trunk/; revision=51817 - -commit 452bfe4 -Author: Stig Bjørlykke -Date: Sat Sep 7 11:01:52 2013 +0000 - - A small documentation fix for DissectorTable_remove. - - svn path=/trunk/; revision=51816 - -commit 6b93b0e -Author: Stig Bjørlykke -Date: Sat Sep 7 10:56:52 2013 +0000 - - Added syntax and range checks for Lua Prefs.range default values. - Fixed some small memory leakages. - - svn path=/trunk/; revision=51815 - -commit 071f89e -Author: Martin Kaiser -Date: Sat Sep 7 10:02:46 2013 +0000 - - coverity 1047692: check return value of inet_pton() - - svn path=/trunk/; revision=51814 - -commit c4f5a94 -Author: Martin Kaiser -Date: Sat Sep 7 09:03:21 2013 +0000 - - trivial: fix a typo - - svn path=/trunk/; revision=51813 - -commit f974c74 -Author: Pascal Quantin -Date: Sat Sep 7 08:03:32 2013 +0000 - - From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9105 : - Add additional PN532 opcodes, and update USB CCID dissector to skip status word in PN532 responses - - svn path=/trunk/; revision=51812 - -commit 2dca89e -Author: Gerald Combs -Date: Sat Sep 7 03:51:27 2013 +0000 - - Only add data points to the throughput graph if our time window has - advanced. Add a reset button. - - svn path=/trunk/; revision=51811 - -commit f9a9753 -Author: Gerald Combs -Date: Sat Sep 7 00:33:41 2013 +0000 - - Fix PacketList::goToPacket work correctly. Minor screen graph - improvements. - - svn path=/trunk/; revision=51808 - -commit ac93afc -Author: Gerald Combs -Date: Sat Sep 7 00:18:10 2013 +0000 - - Use "recode" to convert HTML entities to UTF-8 if it's available. - - svn path=/trunk/; revision=51806 - -commit f9f29d0 -Author: Stig Bjørlykke -Date: Fri Sep 6 22:22:27 2013 +0000 - - Make the Lua dissector "init" routine work again. - - svn path=/trunk/; revision=51805 - -commit 51b613e -Author: Chris Maynard -Date: Fri Sep 6 21:57:04 2013 +0000 - - Whitespace cleanup, sort options, add modelines. - - svn path=/trunk/; revision=51804 - -commit faad753 -Author: Chris Maynard -Date: Fri Sep 6 20:40:54 2013 +0000 - - The 'a' option doesn't take an argument. Fix bug introduced by r49964. - - svn path=/trunk/; revision=51803 - -commit 297d199 -Author: Gerald Combs -Date: Fri Sep 6 19:07:57 2013 +0000 - - Switch from a 20 segment moving average to a 1 second MA. Add a #define - to allow switching back to the old behavior. - - Note that goToPacket can jump to the wrong packet if we have a display - filter applied. - - svn path=/trunk/; revision=51801 - -commit 52c9e57 -Author: Gerald Combs -Date: Fri Sep 6 17:39:03 2013 +0000 - - Deduplicate some type and field names. - - svn path=/trunk/; revision=51800 - -commit 1c46818 -Author: Evan Huus -Date: Fri Sep 6 15:59:45 2013 +0000 - - Convert to wmem, and as per Michael's suggestion in - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9107, use zeroed memory for - ntlmssp_info structs. - - svn path=/trunk/; revision=51799 - -commit 0e885e8 -Author: Evan Huus -Date: Fri Sep 6 15:29:18 2013 +0000 - - Set length and contents to 0/NULL if the blob is empty. Fixes - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9107 - - svn path=/trunk/; revision=51798 - -commit df6f341 -Author: Gerald Combs -Date: Fri Sep 6 02:00:14 2013 +0000 - - Adjust titles and labels. - - svn path=/trunk/; revision=51797 - -commit 29e03fe -Author: Gerald Combs -Date: Fri Sep 6 00:48:21 2013 +0000 - - Make graph movement pixel-based to match the GTK+ version. - - svn path=/trunk/; revision=51796 - -commit 6003d3b -Author: Gerald Combs -Date: Fri Sep 6 00:41:07 2013 +0000 - - Throughput graph usability updates. - - Make the stream graph dialog modeless and let the user open multiple - instances. The dangling dialog behaves similar to the GTK+ version. Add - a setDissectedCaptureFile signal to MainWindow (currently unused). - Properly transform yAxis2 and simplify resetAxes while we're at it. - Other bug fixes. - - svn path=/trunk/; revision=51795 - -commit 96d29a5 -Author: Anders Broman -Date: Thu Sep 5 20:55:59 2013 +0000 - - Get rid of a duplicated filter name. - - svn path=/trunk/; revision=51792 - -commit 0cf459a -Author: Pascal Quantin -Date: Thu Sep 5 20:35:03 2013 +0000 - - Try to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9106 : - Intialize phdr structure to avoid an invalid access to phdr->opt_comment - - svn path=/trunk/; revision=51791 - -commit 2d1b7d1 -Author: Martin Kaiser -Date: Thu Sep 5 20:18:13 2013 +0000 - - add casts to make my compiler (gcc 4.6.3) happy - - svn path=/trunk/; revision=51790 - -commit f6eb619 -Author: Chris Maynard -Date: Thu Sep 5 18:51:46 2013 +0000 - - Display "TEID/GRE Key" field consistently as hexadecimal since 3GPP TS 36.444 says this field is of type, "octet string". - - Ref: http://ask.wireshark.org/questions/24221/decode-gtpv2-teid-as-decimal-or-hex - - #BACKPORT(1.10,1.8) - - svn path=/trunk/; revision=51789 - -commit f13c30d -Author: Chris Maynard -Date: Thu Sep 5 17:51:17 2013 +0000 - - Per http://nsis.sourceforge.net/Docs/Chapter4.html#4.2.4, we need to use $\n for a newline in strings. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9103. - - #BACKPORT(1.10,1.8) - - svn path=/trunk/; revision=51788 - -commit b3f4084 -Author: Michael Mann -Date: Thu Sep 5 16:29:08 2013 +0000 - - Make "content blob" dynamically sized so it doesn't take up 20k of memory per conversation. - - Add filterable expert info while we're at it. - - svn path=/trunk/; revision=51787 - -commit 808d594 -Author: Evan Huus -Date: Thu Sep 5 16:05:32 2013 +0000 - - Add an expert info if we see content-length header and chunked encoding - together. - - The other part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9101 - - Also fix modelines. - - svn path=/trunk/; revision=51786 - -commit 40a83d1 -Author: Evan Huus -Date: Thu Sep 5 15:48:50 2013 +0000 - - As per the HTTP spec, prefer chunked transfer-encoding to content-length if we - get both. Fixes reassembly for - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9101 - - svn path=/trunk/; revision=51785 - -commit 8552f0d -Author: Evan Huus -Date: Thu Sep 5 13:15:04 2013 +0000 - - The length field is retrieved from the packet in bytes, not bits, so stop - adjusting it by 8 everywhere. - - Seems to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9087 though - someone more familiar with the protocol will have to verify it's actually - correct now. - - svn path=/trunk/; revision=51784 - -commit e67292f -Author: Martin Mathieson -Date: Thu Sep 5 13:11:54 2013 +0000 - - Move where timing reference for DRX timers will be set - - svn path=/trunk/; revision=51783 - -commit 47e241f -Author: Evan Huus -Date: Thu Sep 5 12:50:24 2013 +0000 - - Make checkAPI notify (warnings only, for now) about deprecated emem functions. - - svn path=/trunk/; revision=51782 - -commit 3b6f55c -Author: Evan Huus -Date: Thu Sep 5 12:13:00 2013 +0000 - - Convert atn-* dissectors to wmem. No emem in new code please! - - svn path=/trunk/; revision=51780 - -commit c248e3c -Author: Jörg Mayer -Date: Thu Sep 5 09:23:50 2013 +0000 - - Add modelines to avoid using tabs in the code - - svn path=/trunk/; revision=51779 - -commit a5e2a30 -Author: Jörg Mayer -Date: Thu Sep 5 08:55:09 2013 +0000 - - Change the regexp syntax a bit. - - svn path=/trunk/; revision=51778 - -commit 06c27f8 -Author: Stig Bjørlykke -Date: Thu Sep 5 08:32:00 2013 +0000 - - Use intended regex modification for absolute paths. - - svn path=/trunk/; revision=51777 - -commit fadd2ae -Author: Stig Bjørlykke -Date: Thu Sep 5 08:22:44 2013 +0000 - - Removed TAB as indent. - Fixed regex for modifying absolute paths in header. - - svn path=/trunk/; revision=51776 - -commit 8b842ae -Author: Jörg Mayer -Date: Thu Sep 5 07:38:32 2013 +0000 - - Adapt generated output to always print paths relative to - the asn1// subdir. This makes cmake generated builds - look identical to autotools generated builds. - - svn path=/trunk/; revision=51775 - -commit 8543636 -Author: Jörg Mayer -Date: Thu Sep 5 07:36:16 2013 +0000 - - Generated file differs in whitespace output - - svn path=/trunk/; revision=51774 - -commit 39bff32 -Author: Jörg Mayer -Date: Thu Sep 5 07:33:05 2013 +0000 - - Missed 50% of the updates in last commit - - svn path=/trunk/; revision=51773 - -commit d4f2865 -Author: Jörg Mayer -Date: Thu Sep 5 07:28:47 2013 +0000 - - CMakeLists was no longer in sync with Makefile.common - - svn path=/trunk/; revision=51772 - -commit 0227067 -Author: Jörg Mayer -Date: Thu Sep 5 06:05:15 2013 +0000 - - Add missing CMakeLists.txt files - - svn path=/trunk/; revision=51771 - -commit 02a61b0 -Author: Jörg Mayer -Date: Thu Sep 5 05:48:22 2013 +0000 - - Fix cmake syntax - so now it "only" warns about missing - CMakeLists.txt in the subdirectories. - - svn path=/trunk/; revision=51770 - -commit 7e2efe9 -Author: Anders Broman -Date: Thu Sep 5 05:39:15 2013 +0000 - - From Christoph Viethen: - Typo in the name of a PPPoE tag name. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9102 - - svn path=/trunk/; revision=51769 - -commit dd12400 -Author: Anders Broman -Date: Thu Sep 5 05:34:40 2013 +0000 - - From Chris Bontje: - Changes include: - - Detect previously-unknown object types. No dissection is attempted of response messages, but at least the types are documented and labelled. As Graham notes, if some examples are provided we can attempt a little more here. - - Change up info_column object label handling to add some of the new objects. Also added in a few that would be present in 'write' messages. - - Add expert info field for abnormal IIN bits. This will help me in my job of detecting unknown objects and unsupported function codes and will easily flag to the user that 'something is up' due to the color changes. - - Only detect Application Layer if we are on the Final Transport Layer frame. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9056 - - svn path=/trunk/; revision=51768 - -commit 436a6d2 -Author: Anders Broman -Date: Thu Sep 5 05:26:34 2013 +0000 - - From Mathias Guettler: - - New dissector for Air/Ground Datalink ICAO doc 9705 Ed2: ULCS, CM, CPDLC. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8903 - - svn path=/trunk/; revision=51767 - -commit 80cd0dc -Author: Anders Broman -Date: Thu Sep 5 05:26:04 2013 +0000 - - From Mathias Guettler: - - New dissector for Air/Ground Datalink ICAO doc 9705 Ed2: ULCS, CM, CPDLC. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8903 - - svn path=/trunk/; revision=51766 - -commit edbade8 -Author: Anders Broman -Date: Thu Sep 5 05:03:42 2013 +0000 - - 3GPP-MS-TimeZone value is not decoded in RADIUS and DIAMETER messages. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9099 - - svn path=/trunk/; revision=51765 - -commit b422c48 -Author: Anders Broman -Date: Thu Sep 5 04:57:33 2013 +0000 - - From Dirk: - fix NTLMSSP Target Info Attribute dissection - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9098 - - svn path=/trunk/; revision=51764 - -commit 239971e -Author: Michael Mann -Date: Thu Sep 5 02:52:08 2013 +0000 - - Fix some expert filter field names (one of which was illegal) - - svn path=/trunk/; revision=51763 - -commit dd4b035 -Author: Michael Mann -Date: Thu Sep 5 01:42:11 2013 +0000 - - Remove commented out expert_add_info_format - - svn path=/trunk/; revision=51762 - -commit 0c49b4d -Author: Michael Mann -Date: Thu Sep 5 01:39:35 2013 +0000 - - Add filterable expert info to dissect_802_3() and clean up the shrapnel. - - svn path=/trunk/; revision=51761 - -commit e65df7f -Author: Michael Mann -Date: Thu Sep 5 01:05:16 2013 +0000 - - Batch of filterable expert info. - - Some of the FT_NONE hf_ variables were removed in favor of proto_tree_add_expert. It may also be possible to remove some of the booleans surrounding the expert info. - - New expert display filters may need to be double-checked to make sure they make sense. - - svn path=/trunk/; revision=51760 - -commit 03fd39d -Author: Gerald Combs -Date: Wed Sep 4 23:15:59 2013 +0000 - - Throughput graph updates. - - GTK+: Fix what appears to be an off-by-one error in the MA period (21 - segments instead of 20). Throw away our initial segment length instead - of subtracting it from the moving sum, which skews the sum. - - Qt: Add the througput graph. Use bits/s for the throughput y axis. Let - the user switch between graph types. The dialog hangs when doing this. I - haven't been able to track down the cause. Remove some unused code. - - Both: Tell the user that we're using a 20 segment moving average. Move - more routines to tap-tcp-stream.[ch]. - - svn path=/trunk/; revision=51759 - -commit 1abd5a5 -Author: Martin Kaiser -Date: Wed Sep 4 22:00:41 2013 +0000 - - dissect some more items of the smart card descriptor - - svn path=/trunk/; revision=51758 - -commit 14d589a -Author: Evan Huus -Date: Wed Sep 4 21:24:51 2013 +0000 - - Remove some emem functions that have now been completely replaced by wmem. - Finally... - - svn path=/trunk/; revision=51757 - -commit cad5014 -Author: Evan Huus -Date: Wed Sep 4 21:14:55 2013 +0000 - - Remove what appear to be the last two instances of pe_tree. Could this be the - first emem API to die? - - svn path=/trunk/; revision=51756 - -commit 90ac3f1 -Author: Michael Tüxen -Date: Wed Sep 4 21:07:09 2013 +0000 - - Improve the display of AUTH related parameters. - Only use IANA registered values for HMAC ids. - - svn path=/trunk/; revision=51755 - -commit 48089ba -Author: Evan Huus -Date: Wed Sep 4 21:06:56 2013 +0000 - - Use epan-scoped memory for building more of the diameter table stuff. - - svn path=/trunk/; revision=51754 - -commit 4fade3b -Author: Evan Huus -Date: Wed Sep 4 20:42:12 2013 +0000 - - Convert GCP to wmem. It is only called from dissectors in the proper scope - already (yay!). - - svn path=/trunk/; revision=51753 - -commit f5b85d8 -Author: Anders Broman -Date: Wed Sep 4 18:11:21 2013 +0000 - - From Katrina Zhang: - Fix QoS dissection. - - svn path=/trunk/; revision=51752 - -commit 3813c0b -Author: Anders Broman -Date: Wed Sep 4 18:10:33 2013 +0000 - - From Katrina Zhang: - Add Grouped AVP:s - - svn path=/trunk/; revision=51751 - -commit a53b483 -Author: Anders Broman -Date: Wed Sep 4 18:10:00 2013 +0000 - - From Katrina Zhang: - Change to tfs_enabled_disabled. - - svn path=/trunk/; revision=51750 - -commit 10f7f95 -Author: Anders Broman -Date: Wed Sep 4 18:08:08 2013 +0000 - - From Katrina Zhang: - 637 UAR-Flags dissection. - - svn path=/trunk/; revision=51749 - -commit 86656b3 -Author: Martin Mathieson -Date: Wed Sep 4 16:56:37 2013 +0000 - - Another small step towards modelling and reporting upon DRX state in - MAC. - - svn path=/trunk/; revision=51748 - -commit 8eb0bfd -Author: Evan Huus -Date: Wed Sep 4 12:01:09 2013 +0000 - - Fix one small memory leak. - - svn path=/trunk/; revision=51747 - -commit d11c7d5 -Author: Evan Huus -Date: Wed Sep 4 11:46:01 2013 +0000 - - Always initialize the hash when dissecting nfsv3 file handle. Fixes the recent - valgrind fuzz failure. - - svn path=/trunk/; revision=51746 - -commit 55f7519 -Author: Anders Broman -Date: Wed Sep 4 04:47:38 2013 +0000 - - From Tyson Key: - Update the InListPassiveTarget Response handler to dissect the ISO 14443-A ATQA, and UID values from InnoVision/Broadcom Topaz cards/tags. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9096 - - svn path=/trunk/; revision=51745 - -commit a59b538 -Author: Pascal Quantin -Date: Tue Sep 3 22:05:22 2013 +0000 - - From Andreas Urke via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9091 : - Add support for CFM R-APS/G.8032 version 2 - - From me: convert a few value_string to true_false_string - - svn path=/trunk/; revision=51744 - -commit 69dfcff -Author: Pascal Quantin -Date: Tue Sep 3 21:25:16 2013 +0000 - - Remove obsolete code - - svn path=/trunk/; revision=51743 - -commit 6fc009b -Author: Chris Maynard -Date: Tue Sep 3 21:20:59 2013 +0000 - - Similar to the IPv4 dissector's hf_ip_dst_host, hf_ip_src_host and hf_ip_host fields, add to the Ethernet dissector: - - hf_eth_dst_resolved - hf_eth_src_resolved - hf_eth_addr_resolved - - and add to the IEEE802.11 dissector: - - hf_ieee80211_addr_da_resolved - hf_ieee80211_addr_sa_resolved - hf_ieee80211_addr_ra_resolved - hf_ieee80211_addr_ta_resolved - hf_ieee80211_addr_bssid_resolved - hf_ieee80211_addr_resolved - - Change motivated by: - http://ask.wireshark.org/questions/24314/possible-to-use-the-mac-info-in-the-wireshark-manuf-file-as-part-of-display-filter - - svn path=/trunk/; revision=51742 - -commit a65045e -Author: Pascal Quantin -Date: Tue Sep 3 21:10:05 2013 +0000 - - Code cleanup: - - remove some useless trees - - prettify the dissection of a few IEs - - use ELEM_MAND_VV_SHORT macro where applicable - - svn path=/trunk/; revision=51741 - -commit 7935291 -Author: Anders Broman -Date: Tue Sep 3 19:04:13 2013 +0000 - - Fix "malformed packet" and tidy up a bit. - - svn path=/trunk/; revision=51740 - -commit b5e4fd5 -Author: Gerald Combs -Date: Tue Sep 3 18:50:17 2013 +0000 - - Document the current state of naming in ui/qt. Say it's OK to use C++ - comments in C++ code. - - svn path=/trunk/; revision=51739 - -commit 4a22691 -Author: Anders Broman -Date: Tue Sep 3 18:47:44 2013 +0000 - - Protect agains infinite loop. - - svn path=/trunk/; revision=51738 - -commit dc1477b -Author: Alexis La Goutte -Date: Tue Sep 3 18:44:42 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51737 - -commit 5098965 -Author: Alexis La Goutte -Date: Tue Sep 3 18:44:16 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51736 - -commit 6ac93da -Author: Alexis La Goutte -Date: Tue Sep 3 18:43:50 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51735 - -commit b4a4a76 -Author: Alexis La Goutte -Date: Tue Sep 3 18:43:29 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51734 - -commit 154d793 -Author: Alexis La Goutte -Date: Tue Sep 3 18:43:11 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51733 - -commit 6934553 -Author: Alexis La Goutte -Date: Tue Sep 3 18:42:49 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51732 - -commit 7ecb6b1 -Author: Alexis La Goutte -Date: Tue Sep 3 18:42:01 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51731 - -commit 637d599 -Author: Pascal Quantin -Date: Tue Sep 3 18:35:49 2013 +0000 - - Add missing svn properties - - svn path=/trunk/; revision=51730 - -commit 9de7a12 -Author: Pascal Quantin -Date: Tue Sep 3 18:29:34 2013 +0000 - - Fix "Tones off" value typo introduced in r51613 - - svn path=/trunk/; revision=51729 - -commit cc96a45 -Author: Michael Tüxen -Date: Tue Sep 3 17:54:23 2013 +0000 - - Fix a syntax error in a FreeBSD specific code part. - - svn path=/trunk/; revision=51728 - -commit 2022703 -Author: Michael Mann -Date: Tue Sep 3 17:35:00 2013 +0000 - - Add MACSEC dissector - - From Allan W. Nielsen, bug 9094 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9094) - - svn path=/trunk/; revision=51727 - -commit feb3970 -Author: Evan Huus -Date: Tue Sep 3 16:43:08 2013 +0000 - - Decompress gzipped Kafka messages. - - svn path=/trunk/; revision=51726 - -commit dc002f2 -Author: Gerald Combs -Date: Tue Sep 3 16:30:38 2013 +0000 - - Add a note about making the behavior more native on Windows and OS X. - - svn path=/trunk/; revision=51725 - -commit 3331d6d -Author: Gerald Combs -Date: Tue Sep 3 16:14:38 2013 +0000 - - Use more consistent naming. - - svn path=/trunk/; revision=51724 - -commit 259ebc5 -Author: Evan Huus -Date: Tue Sep 3 16:06:20 2013 +0000 - - Respect the other layout preference in qtshark: which pane goes in which spot. - - svn path=/trunk/; revision=51723 - -commit 7cd3ff3 -Author: Jörg Mayer -Date: Tue Sep 3 15:35:32 2013 +0000 - - Fix for - QWidget::setWindowModified: The window title does not contain a '[*]' placeholder - - a) Add [*] to the window title. - b) Also set the window title before calling setWindowModified - - Not really understanding what I'm doing here, just following the hints - given in http://qt-project.org/forums/viewthread/2108 - - Original logmessages when closing Wireshark while running a capture. - - 17:23:39.652 Capture Msg Capture stopped! - 17:23:39.653 Main Dbg Callback: capture update finished - QWidget::setWindowModified: The window title does not contain a '[*]' placeholder - FIX: packet list heading menu sensitivity - 17:23:39.653 Dbg FIX: capture_info_ui_destroy - 17:23:39.653 Main Dbg Callback: Closing - FIX: packet list heading menu sensitivity - 17:23:39.655 Main Dbg Callback: Closed - - - svn path=/trunk/; revision=51722 - -commit ee8719e -Author: Jörg Mayer -Date: Tue Sep 3 13:49:48 2013 +0000 - - Fix typo: =+ ---> += - - svn path=/trunk/; revision=51721 - -commit a795048 -Author: Evan Huus -Date: Tue Sep 3 13:29:09 2013 +0000 - - Correctly update the pane layout whenever the preferences are changed, you no - longer need to restart for that to take effect. Hopefully I got all the slot - ordering right. - - svn path=/trunk/; revision=51720 - -commit 78529b2 -Author: Evan Huus -Date: Tue Sep 3 12:53:32 2013 +0000 - - Separate window creation from the laying out of the list/tree/byte panes. This - more-or-less restores the correct splash behaviour on startup. - - svn path=/trunk/; revision=51719 - -commit 16cbf7d -Author: Evan Huus -Date: Tue Sep 3 12:21:14 2013 +0000 - - Parent the list, tree and byte panes from the main UI rather than the - splitters they're actually layed out in. This should let us reorganize the - splitters at will (when the prefs change) without reconstructing the panes. - - svn path=/trunk/; revision=51718 - -commit 3c08741 -Author: Alexis La Goutte -Date: Tue Sep 3 06:36:43 2013 +0000 - - Enhance DNS Dissector Remove bad_rr goto ! - - Code is fuzzed (9 Pass with more of 400 DNS files) - - svn path=/trunk/; revision=51717 - -commit 6f4225a -Author: Alexis La Goutte -Date: Tue Sep 3 06:36:33 2013 +0000 - - Enhance NSEC3,NSEC3PARAM TLSA type visibility - - svn path=/trunk/; revision=51716 - -commit 29d0726 -Author: Alexis La Goutte -Date: Tue Sep 3 06:36:23 2013 +0000 - - Add dissection of EUI Family (draft-jabley-dnsext-eui48-eui64-rrtypes) DNS Rcode (EUI48, EUI64) - - svn path=/trunk/; revision=51715 - -commit 3f3a394 -Author: Alexis La Goutte -Date: Tue Sep 3 06:36:12 2013 +0000 - - Add Dissection of ILNP (RFC6742) DNS Rcode (NID, L32, L64, LP) - - svn path=/trunk/; revision=51714 - -commit 3658cbf -Author: Alexis La Goutte -Date: Tue Sep 3 06:36:01 2013 +0000 - - Update DNS Rcode to last IANA Parameters (2013-07-24) * Add ILNP (RFC6742) Rcode (NID, L32, L64, LP) * Add EUI Family (draft-jabley-dnsext-eui48-eui64-rrtypes) Rcode (EUI48, EUI64) * Add URI Rcode (256) * Add TA (DNSSEC Trust Authorities) Rcode (32768) - - svn path=/trunk/; revision=51713 - -commit cbb1820 -Author: Alexis La Goutte -Date: Tue Sep 3 06:35:51 2013 +0000 - - Enhance DNS reorder case of big switch dns_type - - svn path=/trunk/; revision=51712 - -commit 02f17d0 -Author: Alexis La Goutte -Date: Tue Sep 3 06:35:41 2013 +0000 - - Enhance DNS dissector Remove ugly dns_type_description function and use value_string(_ext) - - svn path=/trunk/; revision=51711 - -commit bfeb147 -Author: Alexis La Goutte -Date: Tue Sep 3 06:35:30 2013 +0000 - - Enhance DNS dissector visibility (Rename some hf and display field) - - svn path=/trunk/; revision=51710 - -commit 53e87bd -Author: Alexis La Goutte -Date: Tue Sep 3 06:35:13 2013 +0000 - - Enhance DNS dissector visibility (Add comments) - - svn path=/trunk/; revision=51709 - -commit 800359d -Author: Alexis La Goutte -Date: Tue Sep 3 06:35:01 2013 +0000 - - Enhance default DNS type... (and expert info) - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51708 - -commit 7f64348 -Author: Alexis La Goutte -Date: Tue Sep 3 06:34:52 2013 +0000 - - Enhance NULL type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51707 - -commit de8247f -Author: Alexis La Goutte -Date: Tue Sep 3 06:34:41 2013 +0000 - - Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51706 - -commit 4a51170 -Author: Alexis La Goutte -Date: Tue Sep 3 06:34:31 2013 +0000 - - Enhance NSAP and NSAP PTR type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51705 - -commit 340ff87 -Author: Alexis La Goutte -Date: Tue Sep 3 06:34:21 2013 +0000 - - Enhance PX type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51704 - -commit a6f7037 -Author: Alexis La Goutte -Date: Tue Sep 3 06:34:10 2013 +0000 - - Enhance X25 and ISDN type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51703 - -commit b7e78c7 -Author: Alexis La Goutte -Date: Tue Sep 3 06:34:00 2013 +0000 - - Enhance AFSDB and RT type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51702 - -commit 8e237ac -Author: Alexis La Goutte -Date: Tue Sep 3 06:33:48 2013 +0000 - - Enhance RP type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51701 - -commit 7668baf -Author: Alexis La Goutte -Date: Tue Sep 3 06:33:38 2013 +0000 - - Enhance GPOS type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51700 - -commit 7b012cf -Author: Alexis La Goutte -Date: Tue Sep 3 06:33:28 2013 +0000 - - Enhance APL (and DHCID) type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51699 - -commit d37a4ea -Author: Alexis La Goutte -Date: Tue Sep 3 06:33:18 2013 +0000 - - Enhance HIP type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51698 - -commit 7de1545 -Author: Alexis La Goutte -Date: Tue Sep 3 06:33:07 2013 +0000 - - Enhance SSHFP type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51697 - -commit f38fb1a -Author: Alexis La Goutte -Date: Tue Sep 3 06:32:57 2013 +0000 - - Enhance NAPTR type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51696 - -commit 2b63d4f -Author: Alexis La Goutte -Date: Tue Sep 3 06:32:47 2013 +0000 - - Enhance TSIG and TKIP DNS type - - Update rrcode list - Convert proto_tree_add_text calls to proto_tree_add_item - Use expert info when no found dissector for TSIG algo - - Enhance TKEY (BETA) - - svn path=/trunk/; revision=51695 - -commit b36e366 -Author: Alexis La Goutte -Date: Tue Sep 3 06:32:36 2013 +0000 - - Enhance SRV DNS type - - svn path=/trunk/; revision=51694 - -commit e748993 -Author: Alexis La Goutte -Date: Tue Sep 3 06:32:26 2013 +0000 - - Enhance WINS and WINS-R DNS type - - Convert proto_tree_add_text calls to proto_tree_add_item - - svn path=/trunk/; revision=51693 - -commit dfec5ef -Author: Alexis La Goutte -Date: Tue Sep 3 06:31:53 2013 +0000 - - Make test.sh from buildbot Happy - - svn path=/trunk/; revision=51692 - -commit 0550cb5 -Author: Alexis La Goutte -Date: Tue Sep 3 06:09:21 2013 +0000 - - Make Ubuntu buildbot happy - - packet-kerberos.c: In function 'proto_register_kerberos': - packet-kerberos.c:5406:29: error: unused variable 'ei' [-Werror=unused-variable] - - svn path=/trunk/; revision=51691 - -commit 8f7c877 -Author: Michael Mann -Date: Tue Sep 3 02:35:48 2013 +0000 - - forgotten cleanup - - svn path=/trunk/; revision=51690 - -commit a72fc72 -Author: Michael Mann -Date: Tue Sep 3 02:26:50 2013 +0000 - - Batch of filterable expert info. - - svn path=/trunk/; revision=51689 - -commit 5405b34 -Author: Michael Mann -Date: Mon Sep 2 23:32:31 2013 +0000 - - Batch of filterable expert info. - - svn path=/trunk/; revision=51688 - -commit ea6e5b7 -Author: Alexis La Goutte -Date: Mon Sep 2 23:16:39 2013 +0000 - - Fix Function call argument is an uninitialized value Warning found by Clang - - packet-dcerpc-pn-io.c:9101:29: warning: Function call argument is an uninitialized value - tvbuff_t *new_tvb = tvb_new_subset(tvb, offset, u32RecDataLen, u32RecDataLen); - ^ ~~~~~~~~~~~~~ - - svn path=/trunk/; revision=51687 - -commit 5e7d5b9 -Author: Alexis La Goutte -Date: Mon Sep 2 23:16:29 2013 +0000 - - Fix indent (Mix of tab and space...) => use tab - - svn path=/trunk/; revision=51686 - -commit 1a76dd7 -Author: Alexis La Goutte -Date: Mon Sep 2 23:16:19 2013 +0000 - - Fix warning found by fix-encoding-args tools - - svn path=/trunk/; revision=51685 - -commit 1d1a482 -Author: Alexis La Goutte -Date: Mon Sep 2 23:16:10 2013 +0000 - - Fix warning found by fix-encoding-args tools - - svn path=/trunk/; revision=51684 - -commit 7ac4759 -Author: Alexis La Goutte -Date: Mon Sep 2 23:15:59 2013 +0000 - - Fix warning found by fix-encoding-args tools - - svn path=/trunk/; revision=51683 - -commit 53c2e68 -Author: Alexis La Goutte -Date: Mon Sep 2 23:15:50 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51682 - -commit 68ceffe -Author: Alexis La Goutte -Date: Mon Sep 2 23:15:40 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51681 - -commit f1ef082 -Author: Alexis La Goutte -Date: Mon Sep 2 23:15:29 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51680 - -commit 21436ab -Author: Alexis La Goutte -Date: Mon Sep 2 23:15:17 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51679 - -commit b92f4ec -Author: Alexis La Goutte -Date: Mon Sep 2 23:15:07 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51678 - -commit 1a4e261 -Author: Alexis La Goutte -Date: Mon Sep 2 23:14:57 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51677 - -commit b59244d -Author: Alexis La Goutte -Date: Mon Sep 2 23:14:46 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51676 - -commit 1c28ae3 -Author: Alexis La Goutte -Date: Mon Sep 2 23:14:35 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51675 - -commit a8b720b -Author: Alexis La Goutte -Date: Mon Sep 2 23:14:25 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51674 - -commit b7d50ac -Author: Alexis La Goutte -Date: Mon Sep 2 23:14:15 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51673 - -commit c35cc80 -Author: Alexis La Goutte -Date: Mon Sep 2 23:13:58 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51672 - -commit b897a61 -Author: Alexis La Goutte -Date: Mon Sep 2 23:13:47 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51671 - -commit f16b33e -Author: Alexis La Goutte -Date: Mon Sep 2 23:13:36 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51670 - -commit f54d687 -Author: Alexis La Goutte -Date: Mon Sep 2 23:13:22 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51669 - -commit 9c43ccd -Author: Alexis La Goutte -Date: Mon Sep 2 23:13:12 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51668 - -commit 4e02b8d -Author: Alexis La Goutte -Date: Mon Sep 2 23:13:02 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51667 - -commit 890d656 -Author: Alexis La Goutte -Date: Mon Sep 2 23:12:52 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51666 - -commit aaa8f4a -Author: Alexis La Goutte -Date: Mon Sep 2 23:12:42 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51665 - -commit 9bf5e05 -Author: Alexis La Goutte -Date: Mon Sep 2 23:12:31 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51664 - -commit 6a23fa0 -Author: Alexis La Goutte -Date: Mon Sep 2 23:12:21 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51663 - -commit a1d2587 -Author: Alexis La Goutte -Date: Mon Sep 2 23:12:11 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51662 - -commit b631b0c -Author: Alexis La Goutte -Date: Mon Sep 2 23:12:00 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51661 - -commit ca31e9d -Author: Alexis La Goutte -Date: Mon Sep 2 23:11:50 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51660 - -commit f015ca3 -Author: Alexis La Goutte -Date: Mon Sep 2 23:11:41 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51659 - -commit a635df5 -Author: Alexis La Goutte -Date: Mon Sep 2 23:11:30 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51658 - -commit e4e084c -Author: Alexis La Goutte -Date: Mon Sep 2 23:11:20 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51657 - -commit fd7658c -Author: Alexis La Goutte -Date: Mon Sep 2 23:11:10 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51656 - -commit b717a54 -Author: Alexis La Goutte -Date: Mon Sep 2 23:11:00 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51655 - -commit 010c633 -Author: Alexis La Goutte -Date: Mon Sep 2 23:10:51 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51654 - -commit b920999 -Author: Alexis La Goutte -Date: Mon Sep 2 23:10:41 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51653 - -commit 01af8f0 -Author: Alexis La Goutte -Date: Mon Sep 2 23:10:31 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51652 - -commit e070841 -Author: Alexis La Goutte -Date: Mon Sep 2 23:04:16 2013 +0000 - - Fix compilation with Linux packet-openflow.c: In function 'dissect_openflow_pkt_out': packet-openflow.c:663:13: error: variable 'actions_len' set but not used [-Werror=unused-but-set-variable] - - And make fix-encoding-args happy - - svn path=/trunk/; revision=51651 - -commit 2cddd61 -Author: Anders Broman -Date: Mon Sep 2 21:45:09 2013 +0000 - - Fix - packet-openflow.c:318: warning: return type defaults to 'int' - packet-openflow.c: In function 'dissect_openflow_ofp_match_v_1_0': - packet-openflow.c:350: warning: control reaches end of non-void function - - svn path=/trunk/; revision=51650 - -commit a768180 -Author: Anders Broman -Date: Mon Sep 2 20:02:49 2013 +0000 - - Dissect more of openflow. - - svn path=/trunk/; revision=51649 - -commit acfbd6d -Author: Evan Huus -Date: Mon Sep 2 17:46:47 2013 +0000 - - Dissect all the fields in kafka produce request/response pairs. All of the - helpers should be in place for the other message types now. - - svn path=/trunk/; revision=51648 - -commit 785c1a5 -Author: Evan Huus -Date: Mon Sep 2 16:03:13 2013 +0000 - - Respect the layout preference (just the horizontal/vertical splitting of the - panes, not yet which data goes in which pane). - - You currently have to restart for the change to take effect. I also had to move - the preferences-reading (and thus the epan_init) call to before the main window - instantiation so that the preference was actually available for use. This means - that the progress-bar doesn't show up for very long any more, since most of the - work is already done by the time it appears. - - I'm sure there is a way to delay just the layout setup until later, but I kept - getting slot errors I couldn't figure out... - - svn path=/trunk/; revision=51647 - -commit c5488ab -Author: Martin Kaiser -Date: Mon Sep 2 15:39:16 2013 +0000 - - dissect len and type for audio class descriptors - - svn path=/trunk/; revision=51646 - -commit 6585c8e -Author: Martin Kaiser -Date: Mon Sep 2 15:34:37 2013 +0000 - - register a dissector for ccid class specific descriptors - start dissecting the smart card descriptor - --This line, and those below, will be ignored-e - - M epan/dissectors/packet-usb-ccid.c - - svn path=/trunk/; revision=51645 - -commit 8506a52 -Author: Martin Kaiser -Date: Mon Sep 2 14:35:07 2013 +0000 - - descriptor type value string for the video class - - svn path=/trunk/; revision=51644 - -commit 8ac76c0 -Author: Martin Kaiser -Date: Mon Sep 2 14:33:16 2013 +0000 - - descriptor type value string for HID - - svn path=/trunk/; revision=51643 - -commit 97985b6 -Author: Martin Kaiser -Date: Mon Sep 2 14:31:22 2013 +0000 - - dissect_usb_descriptor_header() takes an additional value_string - parameter to intrepret the descriptor type depending on the class - - per default, the list of standard descriptor types is used - - svn path=/trunk/; revision=51642 - -commit 2643a24 -Author: Martin Kaiser -Date: Mon Sep 2 14:27:48 2013 +0000 - - remove class specific descriptor types from the global list - - rename the value string to std_descriptor_type_vals_ext in order to - clarify that this is for the standard descriptors only - - svn path=/trunk/; revision=51641 - -commit ae17626 -Author: Evan Huus -Date: Mon Sep 2 14:15:23 2013 +0000 - - Add long-opts support to qtshark. Take -r or --read-file to open a capture file - immediately from the CLI. Get rid of the comment concerning multi-pass parsing - of the options, it only applied to the GTK version. - - svn path=/trunk/; revision=51640 - -commit 72b18b1 -Author: Evan Huus -Date: Mon Sep 2 13:59:05 2013 +0000 - - Remove a bunch of commented code copied from the GTK version. We don't need it - (yet) and it is getting in the way while I try and add some argument parsing. - It's still in the GTK version if we want it. - - svn path=/trunk/; revision=51639 - -commit 68e48ee -Author: Martin Kaiser -Date: Mon Sep 2 13:02:26 2013 +0000 - - register a dissector for audio class specific descriptors - recognize audio control interface and endpoint descriptors - - svn path=/trunk/; revision=51638 - -commit c41e8e1 -Author: Martin Kaiser -Date: Mon Sep 2 12:56:45 2013 +0000 - - display usb descriptor type as hex value - this is what all the class specs do - - svn path=/trunk/; revision=51637 - -commit bda2a2a -Author: Martin Kaiser -Date: Mon Sep 2 10:57:16 2013 +0000 - - clean up dissect_ssl3_hnd_cert_req() - - proper indentation - - remove unnecessary subtree checks - - no need for tvb_ensure_bytes_exist() - - svn path=/trunk/; revision=51636 - -commit 1a92451 -Author: Martin Kaiser -Date: Mon Sep 2 10:55:21 2013 +0000 - - use dissect_ssl_hash_alg_list() for TLS1.2 certificate request - - svn path=/trunk/; revision=51635 - -commit e249c25 -Author: Martin Kaiser -Date: Mon Sep 2 08:16:44 2013 +0000 - - From Michael Reschly - dissect TLS/signature_algorithms extension - - from me - separate function for dissecting the algorithm list - remove some unnecessary checks and variables - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9092 - - svn path=/trunk/; revision=51634 - -commit aca2dd2 -Author: Anders Broman -Date: Sun Sep 1 19:59:48 2013 +0000 - - dissect OFPT_PACKET_IN. - - svn path=/trunk/; revision=51633 - -commit 1f4f0d5 -Author: Michael Mann -Date: Sun Sep 1 16:41:29 2013 +0000 - - Remove expert_add_undecoded_item in favor of proto_tree_add_expert. - - svn path=/trunk/; revision=51632 - -commit 2bda155 -Author: Gerald Combs -Date: Sun Sep 1 14:03:43 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-09-01] - - svn path=/trunk/; revision=51629 - -commit 6c9fd6e -Author: Evan Huus -Date: Sun Sep 1 13:43:26 2013 +0000 - - Fix two expert calls on the wrong proto_item. - - svn path=/trunk/; revision=51628 - -commit 3c1e67c -Author: Evan Huus -Date: Sun Sep 1 13:37:38 2013 +0000 - - Send all alloc and free calls within wmem through wmem_alloc and wmem_free with - a NULL allocator. This gives us a single, central place to handle out-of-memory - errors (by, for example, throwing an exception) for basically all of epan. - - The only remaining glib memory that is directly allocated is for the hash tables - used by the simple and strict allocators. - - svn path=/trunk/; revision=51627 - -commit d939a6d -Author: Evan Huus -Date: Sun Sep 1 13:07:22 2013 +0000 - - Do our list manipulation entirely after the realloc, so that if the realloc - doesn't return (do to, for example, throwing an exception) the allocator is - left in a consistent state. - - svn path=/trunk/; revision=51626 - -commit e597acd -Author: Michael Mann -Date: Sun Sep 1 13:05:27 2013 +0000 - - Batch of filterable expert info. - - svn path=/trunk/; revision=51625 - -commit 7dbc052 -Author: Evan Huus -Date: Sun Sep 1 01:00:11 2013 +0000 - - More dissectors to wmem. There are no more dissectors using se_tree now, just a - few other places. - - svn path=/trunk/; revision=51622 - -commit 74b205b -Author: Gerald Combs -Date: Sat Aug 31 16:53:24 2013 +0000 - - Set our connection capture filter in main() similar to the GTK+ version. - - svn path=/trunk/; revision=51621 - -commit f875bf8 -Author: Evan Huus -Date: Sat Aug 31 16:36:37 2013 +0000 - - In the strict allocator, do canaries in units of guint32 instead of guint8. This - makes canary checking about 20% faster, which should speed up fuzz-testing now - that more and more dissectors use wmem. - - svn path=/trunk/; revision=51620 - -commit c0763b0 -Author: Evan Huus -Date: Sat Aug 31 16:17:31 2013 +0000 - - More wmem. - - svn path=/trunk/; revision=51619 - -commit 35e20fb -Author: Gerald Combs -Date: Sat Aug 31 16:16:36 2013 +0000 - - Try to set a sensible capture filter at startup. - - svn path=/trunk/; revision=51618 - -commit 44c91cb -Author: Evan Huus -Date: Sat Aug 31 15:58:15 2013 +0000 - - More wmem. - - svn path=/trunk/; revision=51617 - -commit 83a7fed -Author: Evan Huus -Date: Sat Aug 31 15:47:04 2013 +0000 - - A few more dissectors to wmem. - - svn path=/trunk/; revision=51616 - -commit 50815e0 -Author: Pascal Quantin -Date: Sat Aug 31 15:30:07 2013 +0000 - - Update a comment with the correct memory allocator type - - svn path=/trunk/; revision=51615 - -commit 446bf40 -Author: Pascal Quantin -Date: Sat Aug 31 15:21:39 2013 +0000 - - According to X.S0059 specification, when using FemtoInterfaceMsg Body the Information Elements for the Complete Layer 3 Information message shall not be included - - svn path=/trunk/; revision=51614 - -commit 8711038 -Author: Pascal Quantin -Date: Sat Aug 31 14:44:50 2013 +0000 - - Fix (for real) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9068 : - Add dissection of Signal and Call Waiting Indicator IEs when present in MS Information Records IE - - svn path=/trunk/; revision=51613 - -commit 58804a6 -Author: Evan Huus -Date: Sat Aug 31 14:32:01 2013 +0000 - - Convert another 10 dissectors to wmem. - - svn path=/trunk/; revision=51612 - -commit dba0cef -Author: Pascal Quantin -Date: Sat Aug 31 10:06:33 2013 +0000 - - From Jon Carmicheal via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9068 : - BSMAP: add dissection of Signal IE when present in MS Information Records IE - - svn path=/trunk/; revision=51611 - -commit dffff25 -Author: Pascal Quantin -Date: Sat Aug 31 09:42:11 2013 +0000 - - From Andreas Urke via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9088 : - STP: fix dissection of MSTI Root Identifiers for all MSTIs - - svn path=/trunk/; revision=51610 - -commit 789a406 -Author: Gerald Combs -Date: Sat Aug 31 04:18:42 2013 +0000 - - Qt5 on Windows needs platforms/qwindows.dll as well. - - svn path=/trunk/; revision=51609 - -commit a8f4327 -Author: Evan Huus -Date: Sat Aug 31 02:50:32 2013 +0000 - - Convert m3ua to wmem and use the pinfo pool for a variable that might be used - for an address. Fixes the recent valgrind fuzz failure. - - svn path=/trunk/; revision=51608 - -commit 01f7a04 -Author: Gerald Combs -Date: Fri Aug 30 23:01:03 2013 +0000 - - Implement "Save As..." in the TCP stream graph dialog. We currently - support PDF, PNG, BMP, and JPEG. - - svn path=/trunk/; revision=51607 - -commit 17cbb2c -Author: Jakub Zawadzki -Date: Fri Aug 30 21:31:42 2013 +0000 - - bitcoin, gif: pass header_field_info to proto_tree_*. - - svn path=/trunk/; revision=51606 - -commit f871fa0 -Author: Gerald Combs -Date: Fri Aug 30 21:28:51 2013 +0000 - - Fix an include. - - svn path=/trunk/; revision=51605 - -commit 1d27c70 -Author: Gerald Combs -Date: Fri Aug 30 21:15:24 2013 +0000 - - Add an item tracer to the TCP stream graph. Enable packet selection. - - QCustomPlot data sets are made up of keys (x axis by default) and values - (y axis). It looks like we can have multiple values for a given key - (i.e. we can show multiple sequence numbers for a given timestamp) but - QCPItemTracers can only be positioned by a key and not a key+value pair. - This makes our graph selection behavior a bit different compared to the - GTK+ version. We can only select one segment for a give timestamp but - our selection targets are much larger (the height of the graph). - - Add a map for segment data so we don't have to iterate to find them. Use - UTF8_RIGHTWARDS_ARROW where appropriate. Set a window title. Tell the - user what will happen if he or she clicks. Disable graph selection. - - svn path=/trunk/; revision=51604 - -commit 8445c81 -Author: Martin Kaiser -Date: Fri Aug 30 18:13:54 2013 +0000 - - (try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9079 - - don't enter the for loop if there are no components to dissect - - svn path=/trunk/; revision=51603 - -commit 777613f -Author: Pascal Quantin -Date: Fri Aug 30 17:55:07 2013 +0000 - - Remove useless tree - - svn path=/trunk/; revision=51602 - -commit c82839c -Author: Pascal Quantin -Date: Fri Aug 30 17:23:36 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9085 : - GSM A-I/F DTAP - Detach Request - Detach type is not displayed - - svn path=/trunk/; revision=51599 - -commit 36ff508 -Author: Gerald Combs -Date: Fri Aug 30 15:55:12 2013 +0000 - - Try to fix PortableApps packaging. Note that the Qt definitions should - be in config.nmake along with everything else. - - svn path=/trunk/; revision=51598 - -commit 84bf0ac -Author: Pascal Quantin -Date: Fri Aug 30 14:49:55 2013 +0000 - - Convert a few dissectors from EMEM to WMEM API - - svn path=/trunk/; revision=51597 - -commit ac56194 -Author: Pascal Quantin -Date: Fri Aug 30 12:31:14 2013 +0000 - - Deactivate debug code - - svn path=/trunk/; revision=51596 - -commit 256d290 -Author: Alexis La Goutte -Date: Fri Aug 30 11:47:58 2013 +0000 - - Try 2 to fix Portable App buildbot - - svn path=/trunk/; revision=51595 - -commit 84f2e7d -Author: Alexis La Goutte -Date: Fri Aug 30 11:18:06 2013 +0000 - - Try to fix Portable App buildbot - - svn path=/trunk/; revision=51594 - -commit 14d0a15 -Author: Alexis La Goutte -Date: Fri Aug 30 11:14:26 2013 +0000 - - Add HTTP2 to colorfilters - - svn path=/trunk/; revision=51593 - -commit b7d30a7 -Author: Alexis La Goutte -Date: Fri Aug 30 11:14:18 2013 +0000 - - HTTP2 Upgrade heuristic for HTTP (Work with HTTP-draft-XX/2.0 and HTTP/2.0) - - svn path=/trunk/; revision=51592 - -commit c42a4f7 -Author: Alexis La Goutte -Date: Fri Aug 30 11:14:09 2013 +0000 - - From me and Stephen Ludin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9042 Add HTTP2 Dissector Based on draft-ietf-httpbis-http2-06 - - TODO : - * Support HTTP Header Compression (draft-ietf-httpbis-header-compression) - * Enhance display of Data - * Reassembling of continuation frame (and other frame) - * Add same tap and ping/pong time response - - svn path=/trunk/; revision=51591 - -commit d89a3ba -Author: Pascal Quantin -Date: Fri Aug 30 09:36:10 2013 +0000 - - fragment_length has already been retrieved from TVB - - svn path=/trunk/; revision=51590 - -commit 3eb4d24 -Author: Pascal Quantin -Date: Fri Aug 30 09:18:21 2013 +0000 - - From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9081 : - DTLS: fix detection of encrypted handshake messages in case of fragment - - svn path=/trunk/; revision=51589 - -commit abd0838 -Author: Martin Mathieson -Date: Fri Aug 30 04:33:36 2013 +0000 - - Revert r51586. It works just fine for drb_mapping_t. - The real problem seems to be that I forgot to commit the generated - packet-lte-rrc.c. - - svn path=/trunk/; revision=51588 - -commit 201f3a3 -Author: Martin Mathieson -Date: Fri Aug 30 04:31:02 2013 +0000 - - Submit forgotten generated file. - - svn path=/trunk/; revision=51587 - -commit fa2c2e6 -Author: Martin Mathieson -Date: Fri Aug 30 04:26:22 2013 +0000 - - Try to fix build problem for some compilers that don't like - - typedef struct foo { - ... - } foo; - - - svn path=/trunk/; revision=51586 - -commit a09ee6a -Author: Martin Mathieson -Date: Fri Aug 30 04:08:57 2013 +0000 - - The first step towards tracking and showing DRX info in MAC: - - send release from RRC - - show current DRX config from each frame, including a link back to the - RRC config frame - - show simple DRX state for each frame (currently only offset into long - cycle and whether within long cycle 'on' period) - - TODO: - - simulate timers in response to new UL/DL transmissions or DL CRC - errors - - maintain whether in long or short cycle - - show state of all timers - - svn path=/trunk/; revision=51585 - -commit d9eb37b -Author: Evan Huus -Date: Fri Aug 30 01:29:46 2013 +0000 - - Add a preference for whether to use names found in DNS packets for address - resolution. - - svn path=/trunk/; revision=51584 - -commit 2e85795 -Author: Gerald Combs -Date: Fri Aug 30 00:43:51 2013 +0000 - - Fix NSIS packaging. - - svn path=/trunk/; revision=51583 - -commit 0764fca -Author: Gerald Combs -Date: Thu Aug 29 22:29:48 2013 +0000 - - Update for Qt 5.1.1. - - svn path=/trunk/; revision=51582 - -commit d0b80c8 -Author: Anders Broman -Date: Thu Aug 29 22:18:12 2013 +0000 - - Revert revision=51577. - - Ref https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9082 - Since this commit the IP (source and destination) address in the GUI will be - replaced with some date after I click on the entry, reverting this commit fixes - the problem. - - - This looks like a memory corruption. I imported an older pcap file. - - svn path=/trunk/; revision=51581 - -commit f1ceee4 -Author: Gerald Combs -Date: Thu Aug 29 22:15:40 2013 +0000 - - Add support for Qt5 (tested with 5.1.1). - - svn path=/trunk/; revision=51580 - -commit ae83d08 -Author: Anders Broman -Date: Thu Aug 29 22:08:23 2013 +0000 - - Revert revision=51577. - - Ref https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9082 - Since this commit the IP (source and destination) address in the GUI will be - replaced with some date after I click on the entry, reverting this commit fixes - the problem. - - - This looks like a memory corruption. I imported an older pcap file. - - svn path=/trunk/; revision=51579 - -commit aa99a6c -Author: Pascal Quantin -Date: Thu Aug 29 20:23:43 2013 +0000 - - From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9081 : - DTLS: improve detection of encrypted handshake messages - - svn path=/trunk/; revision=51578 - -commit 39a61a1 -Author: Anders Broman -Date: Thu Aug 29 18:59:49 2013 +0000 - - Don't store address in the hastable when name resolution is off. - - svn path=/trunk/; revision=51577 - -commit bc65487 -Author: Chris Maynard -Date: Thu Aug 29 18:15:13 2013 +0000 - - Handle the 2GiB boundary case of the max filesize autostop condition properly so that we avoid overflow conditions and so that we ensure we don't capture more than 2GiB. Also, document the max filesize autostop value of 2GIB as well as indicating that it's truly GiB and not GB. - - This fixes the problem reported on ask: http://ask.wireshark.org/questions/23891/wireshark-wont-run-with-multiple-capture-files - - #BACKPORT(1.10) ... not sure about 1.8? - - svn path=/trunk/; revision=51576 - -commit 894ca4e -Author: Anders Broman -Date: Thu Aug 29 17:09:14 2013 +0000 - - From Johan Wåhl: - Dissect 3GPP AVP 637 UAR-Flags. - - svn path=/trunk/; revision=51575 - -commit 951e010 -Author: Michael Mann -Date: Thu Aug 29 14:25:38 2013 +0000 - - From Hauke Mehrtens: - Break out Signature Hash Algorithm into hash and signature values - - From me: - Cleanup all "saved" trees throughout the dissector as well as removing a few unnecessary NULL tree checks. - Removed most of the tvb_ensure_bytes_exist checks because the line that follows will through an exception anyway if there isn't enough bytes in the tvb. - - - - - svn path=/trunk/; revision=51574 - -commit 3bd36d8 -Author: Bill Meier -Date: Thu Aug 29 02:20:49 2013 +0000 - - Minor reformatting; Also: remove some boilerplate comments. - - svn path=/trunk/; revision=51573 - -commit 92fe2aa -Author: Bill Meier -Date: Thu Aug 29 02:17:00 2013 +0000 - - Minor cleanup: - - proto_reg_handoff_...() & related; - - Remove unneeded #includes - - svn path=/trunk/; revision=51572 - -commit 3b9ecc4 -Author: Bill Meier -Date: Thu Aug 29 02:05:31 2013 +0000 - - Fix some indentation to match mode-lines; Do some other minor reformatting. - - svn path=/trunk/; revision=51571 - -commit ee9c47b -Author: Jörg Mayer -Date: Wed Aug 28 22:57:52 2013 +0000 - - Slightly improve the decoding of unknown Aironet IEs - - svn path=/trunk/; revision=51570 - -commit 821b3f2 -Author: Anders Broman -Date: Wed Aug 28 19:53:44 2013 +0000 - - Fix a copy-paste error. - - svn path=/trunk/; revision=51569 - -commit 87d4d48 -Author: Anders Broman -Date: Wed Aug 28 19:25:48 2013 +0000 - - packet-aruba-erm.c:136: warning: 'range_add_callback' defined but not used - - svn path=/trunk/; revision=51568 - -commit f6b9c18 -Author: Anders Broman -Date: Wed Aug 28 19:10:33 2013 +0000 - - Use dissector_delete_uint_range/dissector_add_uint_range - - svn path=/trunk/; revision=51567 - -commit 29f0303 -Author: Jörg Mayer -Date: Wed Aug 28 18:27:16 2013 +0000 - - svn version 1.7.11 no longer has local .svn directories, - just one at the top level. So on my system, /trunk no longer - contains a .svn directory. Check in parent directory as well. - - svn path=/trunk/; revision=51566 - -commit 35f284c -Author: Pascal Quantin -Date: Wed Aug 28 17:33:14 2013 +0000 - - Revert file committed by accident - - svn path=/trunk/; revision=51565 - -commit 519a777 -Author: Pascal Quantin -Date: Wed Aug 28 17:31:12 2013 +0000 - - Fix copy/paste error introduced in r51541 and spotted by Joerg - - svn path=/trunk/; revision=51564 - -commit 5c66701 -Author: Bill Meier -Date: Wed Aug 28 15:57:10 2013 +0000 - - Fix formatting again (so blank line before "and by:" in AUTHORS output) - - svn path=/trunk/; revision=51563 - -commit 2994791 -Author: Chris Maynard -Date: Wed Aug 28 14:59:32 2013 +0000 - - Credit Martin Pool for his natural order string comparison algorithm. - - svn path=/trunk/; revision=51562 - -commit b9a4e7a -Author: Jörg Mayer -Date: Wed Aug 28 14:09:32 2013 +0000 - - As reported by Ben Smith (thex1le@gmail.com) on #wireshark: - - Aironet IE 20 is ClientMFP - - svn path=/trunk/; revision=51561 - -commit 57b9b11 -Author: Jörg Mayer -Date: Wed Aug 28 10:47:23 2013 +0000 - - Comment out a line that seems to do nothing. - - ** CID 1068812: Unused pointer value (UNUSED_VALUE) - - svn path=/trunk/; revision=51560 - -commit 5d4782b -Author: Jörg Mayer -Date: Wed Aug 28 10:43:50 2013 +0000 - - There is no use in checking for (cf) if we have already unconditionally - used cf-> ... - - ** CID 1068811: Dereference before null check (REVERSE_INULL) - - svn path=/trunk/; revision=51559 - -commit c660aab -Author: Evan Huus -Date: Wed Aug 28 02:30:50 2013 +0000 - - Update the test suite for r51556. Use -Y in one place instead of -R where only - filtering is important. Use -2 and -R together in one place where the counting - functionality is important. - - svn path=/trunk/; revision=51558 - -commit c1c6545 -Author: Gerald Combs -Date: Wed Aug 28 01:38:23 2013 +0000 - - Comment out some unused variables. - - svn path=/trunk/; revision=51557 - -commit 5c85185 -Author: Evan Huus -Date: Wed Aug 28 00:56:19 2013 +0000 - - Fully deprecate read filter (-R) without two-pass (-2). It does exactly the same - thing as the display filter (-Y) in that case except with more confusing - semantics. - - This also lets us fix -c in the single-pass case to unconditionally count - packets. This isn't the old behaviour (which counted them only if they passed - the read filter) but is more consistent with two-pass mode where they are - counted even if they pass the display filter, since they are counted on the - first pass and the display filter is applied on the second pass. - - Anyone who wants to use -c to limit packet count conditionally on them passing a - filter should use it in tandem with -2 and -R: the read filter is applied on the - first pass before the count. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9048 - - svn path=/trunk/; revision=51556 - -commit 25392c7 -Author: Gerald Combs -Date: Wed Aug 28 00:23:01 2013 +0000 - - Let the QCustomPlot widget have focus. - - svn path=/trunk/; revision=51555 - -commit 66b8223 -Author: Gerald Combs -Date: Tue Aug 27 23:28:35 2013 +0000 - - Add initial mouse and keyboard controls. QCustomPlot uses different - mouse interactions than the GTK+ version, but they seem to match modern - UI conventions better. The keyboard shortcuts have been changed to match - modern UI conventions as well, but I'll try to support the old shortcuts - as much as possible. - - svn path=/trunk/; revision=51554 - -commit b862ff0 -Author: Guy Harris -Date: Tue Aug 27 22:10:35 2013 +0000 - - Make sure we initialize the array of file type extensions before we use - it. - - svn path=/trunk/; revision=51553 - -commit 574183b -Author: Alexis La Goutte -Date: Tue Aug 27 21:13:09 2013 +0000 - - Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang - - svn path=/trunk/; revision=51552 - -commit af7e3d0 -Author: Alexis La Goutte -Date: Tue Aug 27 21:13:00 2013 +0000 - - Fix indent (use 4 spaces) And add modelines info - - svn path=/trunk/; revision=51551 - -commit f079ce9 -Author: Alexis La Goutte -Date: Tue Aug 27 21:12:52 2013 +0000 - - Fix indent (use 4 spaces) And add modelines info - - svn path=/trunk/; revision=51550 - -commit 37e43e5 -Author: Alexis La Goutte -Date: Tue Aug 27 21:12:42 2013 +0000 - - Enhance TLS ALPN dissection (Add length of ALPN) - - svn path=/trunk/; revision=51549 - -commit 5be9038 -Author: Alexis La Goutte -Date: Tue Aug 27 21:12:32 2013 +0000 - - Enhance Profinet MRP (Merge LinkUp and LinkDown) - - svn path=/trunk/; revision=51548 - -commit a505518 -Author: Guy Harris -Date: Tue Aug 27 20:46:47 2013 +0000 - - Have a separate list of extension sets to use in the Open dialog; - include only extensions used mostly by capture files (i.e., not ".txt" - or ".xml"), and list each extension set only once (it's silly to have, - for example, separate entries for NetMon, Shomiti Surveyor, and - NetScaler with ".cap" when you get all those types no matter which entry - you choose). - - svn path=/trunk/; revision=51547 - -commit a84b44f -Author: Gerald Combs -Date: Tue Aug 27 20:42:54 2013 +0000 - - Credit Emanuel Eichhammer. - - svn path=/trunk/; revision=51546 - -commit 0ead8d9 -Author: Pascal Quantin -Date: Tue Aug 27 20:32:39 2013 +0000 - - Try to fix error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat] - - svn path=/trunk/; revision=51545 - -commit abfc95b -Author: Guy Harris -Date: Tue Aug 27 20:31:22 2013 +0000 - - QCustomPlot is C++, not C. - - Additional changes needed for the TCP stream UI code. - - svn path=/trunk/; revision=51544 - -commit 7cfcf70 -Author: Gerald Combs -Date: Tue Aug 27 20:26:43 2013 +0000 - - Fix some warnings. - - svn path=/trunk/; revision=51543 - -commit b30a098 -Author: Jörg Mayer -Date: Tue Aug 27 20:24:20 2013 +0000 - - Add qcustomplot.cpp to Makefile.common and CMakeLists.txt - a few whitespace fixes - - svn path=/trunk/; revision=51542 - -commit 22c5585 -Author: Pascal Quantin -Date: Tue Aug 27 19:38:35 2013 +0000 - - Add a DRX subtree to GTP dissector now that the subtree (useless for NAS and EPS NAS dissectors) was removed from de_gmm_drx_param in r51537 - - svn path=/trunk/; revision=51541 - -commit 7e3922c -Author: Anders Broman -Date: Tue Aug 27 19:21:20 2013 +0000 - - Use dissector_delete_uint_range/dissector_add_uint_range - - svn path=/trunk/; revision=51540 - -commit cbae911 -Author: Gerald Combs -Date: Tue Aug 27 18:37:13 2013 +0000 - - Remove an attempt to fix a qmake warning. - - svn path=/trunk/; revision=51539 - -commit 6d731a3 -Author: Gerald Combs -Date: Tue Aug 27 18:13:20 2013 +0000 - - Add TCP sequence number (Stevens-style) graphs. - - Add the QCustomPlot widget. Thanks to Emanuel Eichhammer for granting a - license change. Move some common code from ui/gtk/tcp_graph.c to - ui/tap-tcp-stream.[ch]. Get rid of tcp_graph_selected_packet_enabled(). - It was only used in the menu code and didn't match what we were doing - elsewhere. - - Still quite a bit of work to do but it's a promising start. - - svn path=/trunk/; revision=51538 - -commit 77f1ed0 -Author: Pascal Quantin -Date: Tue Aug 27 17:01:58 2013 +0000 - - Make SPLIT PG CYCLE CODE filterable - - svn path=/trunk/; revision=51537 - -commit 7dfc77a -Author: Pascal Quantin -Date: Tue Aug 27 14:56:00 2013 +0000 - - From Jiri Engelthaler via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849 : - IEC104: fix dissection of VTI Value and Normalised value - - svn path=/trunk/; revision=51536 - -commit 165caf0 -Author: Pascal Quantin -Date: Tue Aug 27 12:28:21 2013 +0000 - - From Hadar Shoham via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9076 : - MGCP: add support for option mp and fxr/fx - - svn path=/trunk/; revision=51535 - -commit ed8115e -Author: Alexis La Goutte -Date: Tue Aug 27 11:19:12 2013 +0000 - - Remove tab and fix order - - svn path=/trunk/; revision=51534 - -commit 6d97cc8 -Author: Martin Kaiser -Date: Tue Aug 27 11:10:36 2013 +0000 - - revert the last commit, the comment was correct already - - svn path=/trunk/; revision=51533 - -commit 285ab0a -Author: Martin Kaiser -Date: Tue Aug 27 11:04:12 2013 +0000 - - correct a comment: resource -> item - - svn path=/trunk/; revision=51532 - -commit 155ac2e -Author: Martin Kaiser -Date: Tue Aug 27 11:02:01 2013 +0000 - - set item len correctly - - svn path=/trunk/; revision=51531 - -commit 8911436 -Author: Martin Kaiser -Date: Tue Aug 27 10:44:16 2013 +0000 - - better function name, make it clear what we want to do - - svn path=/trunk/; revision=51530 - -commit 3f4cf67 -Author: Martin Kaiser -Date: Tue Aug 27 08:32:01 2013 +0000 - - dissect the components of the HID descriptor - - svn path=/trunk/; revision=51529 - -commit 75522d1 -Author: Martin Kaiser -Date: Tue Aug 27 07:40:50 2013 +0000 - - register a dissector for HID class specific descriptors - start dissecting the HID descriptor - - svn path=/trunk/; revision=51528 - -commit 0e81643 -Author: Anders Broman -Date: Tue Aug 27 05:08:34 2013 +0000 - - From Michal Labedzki: - Full dissection of EIR/AD and little improve filtering, cd - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050 - - svn path=/trunk/; revision=51527 - -commit 8ddf822 -Author: Anders Broman -Date: Tue Aug 27 04:57:27 2013 +0000 - - From Chun-Yeow: - Decode the Mesh Configuration Capabilities Info in Details. - With a change to use tfs_yes_no. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9070 - - svn path=/trunk/; revision=51526 - -commit 84a319f -Author: Anders Broman -Date: Tue Aug 27 04:44:05 2013 +0000 - - From Dmitry Dyachenko: - Add Vendor Ids - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9075 - - svn path=/trunk/; revision=51525 - -commit a913e57 -Author: Martin Kaiser -Date: Mon Aug 26 21:11:35 2013 +0000 - - TABs -> spaces - add modelines - - svn path=/trunk/; revision=51524 - -commit 5ff688f -Author: Gerald Combs -Date: Mon Aug 26 16:53:17 2013 +0000 - - Use oldiconutil (https://github.com/uliwitness/oldiconutil) to convert - our PNG-based icons to JPEG 2000. Hopefully fixes bug 8993. - - svn path=/trunk/; revision=51523 - -commit 304bbab -Author: Evan Huus -Date: Mon Aug 26 16:23:55 2013 +0000 - - From Jiri Engelthaler via - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9055 - - Add support for bitmask set for signed integer types. - - svn path=/trunk/; revision=51522 - -commit 2a0b65b -Author: Anders Broman -Date: Mon Aug 26 05:14:53 2013 +0000 - - Make the UDP port preference a range. - - svn path=/trunk/; revision=51521 - -commit b56ffc4 -Author: Michael Mann -Date: Mon Aug 26 00:54:48 2013 +0000 - - Make all expert info filterable. Display filter names may need review, but at least the filtering is in place. - - svn path=/trunk/; revision=51520 - -commit a75499a -Author: Gerald Combs -Date: Sun Aug 25 22:41:54 2013 +0000 - - Check our recently-added signal pipe in statistics mode. - - svn path=/trunk/; revision=51519 - -commit e5e4d35 -Author: Michael Mann -Date: Sun Aug 25 21:01:11 2013 +0000 - - Batch of filterable expert infos. - - svn path=/trunk/; revision=51518 - -commit d8e8f48 -Author: Anders Broman -Date: Sun Aug 25 18:48:26 2013 +0000 - - Simplify adding and deletetion of port ranges by adding new methods. - If no one has any objection I'll edit the deocumentation later. - - svn path=/trunk/; revision=51517 - -commit b5900e5 -Author: Evan Huus -Date: Sun Aug 25 17:31:15 2013 +0000 - - Make sure our ldap_call_response_t struct is always completely initialized, - fixing a "Conditional jump or move depends on uninitialised value" error found - by valgrind fuzzing. - - svn path=/trunk/; revision=51516 - -commit ccbaea5 -Author: Evan Huus -Date: Sun Aug 25 17:23:15 2013 +0000 - - Valgrind requires more resources than running normally. Bump limits to 1.5x - normal when fuzzing with valgrind, as otherwise half the menagerie runs out of - memory. - - svn path=/trunk/; revision=51515 - -commit 9d4df60 -Author: Evan Huus -Date: Sun Aug 25 14:38:06 2013 +0000 - - Convert XMPP dissector suite to wmem. - - svn path=/trunk/; revision=51514 - -commit 14e6ddd -Author: Evan Huus -Date: Sun Aug 25 14:23:13 2013 +0000 - - Replace some emem with wmem. - - svn path=/trunk/; revision=51512 - -commit fac9c21 -Author: Gerald Combs -Date: Sun Aug 25 14:03:39 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-08-25] - - svn path=/trunk/; revision=51510 - -commit 11dbf5d -Author: Evan Huus -Date: Sat Aug 24 16:26:49 2013 +0000 - - From Chris Pane via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9063 - - Fix unregistered hf assertion in 1722.1 entity descriptors. - - From me: #if0 out even more unused hfs, what is with this dissector? - - svn path=/trunk/; revision=51509 - -commit d763a69 -Author: Evan Huus -Date: Sat Aug 24 12:13:11 2013 +0000 - - Use the correct length field when tagging the SSID. Fixes the first valgrind - fuzz failure. - - svn path=/trunk/; revision=51508 - -commit ed2d4bc -Author: Anders Broman -Date: Sat Aug 24 07:50:46 2013 +0000 - - From Tommy Wu: - Handle ERROR-SPEC: mandatory object, with an empty value. - - svn path=/trunk/; revision=51507 - -commit df309c6 -Author: Michael Mann -Date: Sat Aug 24 01:42:43 2013 +0000 - - Tool to help convert current expert_add_info_format() calls into filterable expert info API. It's not as helpful as convert_proto_tree_add_text.pl because the expert string is usually too long to take the ei_ variable name or display filter string as is, but it does do the batch "search and replace" nicely and makes finding common expert info easier. - - svn path=/trunk/; revision=51506 - -commit e123d27 -Author: Michael Mann -Date: Sat Aug 24 01:38:43 2013 +0000 - - If the proto_tree_add_text string is just "%s", assume it won't be converted (it's usually a header that has the same field filterable in its subtree) - - svn path=/trunk/; revision=51505 - -commit 6614f28 -Author: Michael Mann -Date: Sat Aug 24 01:25:14 2013 +0000 - - From Simon Zhong: Convert several proto_tree_add_text into filterable expert info. - - From me: Make "Reserved" fields filterable. This was enough to pacify checkAPIs.pl, but part of the reason it was complaining in the first place is that many hf items are passed into info_to_display, which will end up calling a proto_tree_add_xxx function, rather than calling a proto_tree_add_xxx function directly. Cursory glance says info_to_display could probably just be replaced with direct proto_tree_add_xxx calls. - - svn path=/trunk/; revision=51504 - -commit e45f35d -Author: Guy Harris -Date: Sat Aug 24 01:01:04 2013 +0000 - - Can't use [ as an alias for "test" in configure scripts, as [ and ] are - quoting characters; use test instead. - - svn path=/trunk/; revision=51503 - -commit c06e10b -Author: Gerald Combs -Date: Sat Aug 24 00:12:27 2013 +0000 - - Add a routine to create a dummy signal pipe and pass it to dumpcap when - gathering interface statistics. This should help dumpcap exit properly - if its parent process crashes or is killed. - - svn path=/trunk/; revision=51502 - -commit 98db1ce -Author: Guy Harris -Date: Fri Aug 23 23:57:09 2013 +0000 - - To handle the hypothetical case of an OS X release offering a choice of - installing command-line developer tools with no SDKs but with a standard - UN*Xy /usr/include or of installing Full Frontal Xcode, if the user - didn't specify building against an SDK, check to see whether we *have* - any SDKs and, if not, don't set the deployment target. - - svn path=/trunk/; revision=51501 - -commit 0675ed7 -Author: Guy Harris -Date: Fri Aug 23 23:51:52 2013 +0000 - - Clang, clang, clang went the warning.... - - Fix a memset (drb_mapping is a pointer, so its size is the size of a - pointer; we want the size of what it points to). - - svn path=/trunk/; revision=51500 - -commit 9becffe -Author: Guy Harris -Date: Fri Aug 23 23:27:07 2013 +0000 - - To handle the hypothetical case of an OS X release offering a choice of - installing command-line developer tools with no SDKs but with a standard - UN*Xy /usr/include or of installing Full Frontal Xcode, check to see - whether we *have* any SDKs and, if not, don't try to find the - appropriate SDK for the release and use it. - - svn path=/trunk/; revision=51499 - -commit 1e9a678 -Author: Guy Harris -Date: Fri Aug 23 22:59:16 2013 +0000 - - Put back missing space between --disable-cups and --without-libtiff. - Should fix bug 9073. - - svn path=/trunk/; revision=51498 - -commit dc87fa2 -Author: Gerald Combs -Date: Fri Aug 23 22:18:49 2013 +0000 - - Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try - to locate makensis automatically, similar to the way we locate Python. - - svn path=/trunk/; revision=51497 - -commit fe0b284 -Author: Gerald Combs -Date: Fri Aug 23 21:17:56 2013 +0000 - - Assume we always have GNU diff and that we can use --strip-trailing-cr. - - svn path=/trunk/; revision=51496 - -commit c3d2917 -Author: Gerald Combs -Date: Fri Aug 23 20:47:33 2013 +0000 - - Correctly reference EXTRA_LIBFILES. Make sure QMAKE_EXTENSION_SHLIB - is set. Adjust some wildcards. - - svn path=/trunk/; revision=51495 - -commit a8c7285 -Author: Gerald Combs -Date: Fri Aug 23 18:54:22 2013 +0000 - - Add a test for rawshark. - - svn path=/trunk/; revision=51494 - -commit a4a6af3 -Author: Gerald Combs -Date: Fri Aug 23 18:42:51 2013 +0000 - - Initialize our wtap_pkthdr struct so that we don't try to dereference an - invalid opt_comment pointer down the line. - - svn path=/trunk/; revision=51493 - -commit baaa0eb -Author: Balint Reczey -Date: Fri Aug 23 18:11:47 2013 +0000 - - Mention BPF JIT in User Guide - - svn path=/trunk/; revision=51492 - -commit c431ae3 -Author: Gerald Combs -Date: Fri Aug 23 17:10:32 2013 +0000 - - Make sure we call epan_free() before epan_cleanup() similar to r51342. - - svn path=/trunk/; revision=51491 - -commit ae4f556 -Author: Pascal Quantin -Date: Fri Aug 23 12:51:07 2013 +0000 - - Simplify logic a bit now that we do not use anymore GUINT_TO_POINTER macro - - svn path=/trunk/; revision=51490 - -commit 483ee31 -Author: Pascal Quantin -Date: Fri Aug 23 10:42:11 2013 +0000 - - From Martin Mathieson: - Follow-up of r51429 that - - uses accessors to lazily allocate a private_data struct and returns the different parts based upon their use - - includes the v1130 DRX Config - - svn path=/trunk/; revision=51489 - -commit 71f7093 -Author: Anders Broman -Date: Fri Aug 23 05:25:30 2013 +0000 - - Output a warning about kernel BPF JIT compiler beeing activated. - - svn path=/trunk/; revision=51488 - -commit f9aaaeb -Author: Anders Broman -Date: Fri Aug 23 05:21:25 2013 +0000 - - Output a warning about kernel BPF JIT compiler beeing activated. - - svn path=/trunk/; revision=51487 - -commit 6880359 -Author: Michael Mann -Date: Fri Aug 23 03:17:34 2013 +0000 - - Batch of filterable expert infos. - - svn path=/trunk/; revision=51486 - -commit 186babc -Author: Gerald Combs -Date: Fri Aug 23 02:34:51 2013 +0000 - - When we close a main window, delete the welcome screen, which in turn - deletes the interface list, which in turn kills off the dumpcap process - it may be running. This should hopefully keep us from leaving dumpcap - processes running in the background on Windows. (Am I the only one - running QtShark on that platform?) - - svn path=/trunk/; revision=51485 - -commit 4daaf4f -Author: Evan Huus -Date: Fri Aug 23 00:51:04 2013 +0000 - - Purge some emem. - - In kingfisher it wasn't even needed, just use a variable on the stack. - - In SDP convert to wmem. Use auto-resetting trees to avoid the need for an init - routine and somewhat simplify that whole thing. - - svn path=/trunk/; revision=51484 - -commit 32e1523 -Author: Guy Harris -Date: Fri Aug 23 00:06:26 2013 +0000 - - For the Windows Open dialog for capture files, get rid of the "(*.*)" in - the "All Files" entry (the current UI guidelines from Microsoft say to - do so, and that's what Paint does, at least), and add an "All Capture - Files" entry with all the file extensions for the file types we support - (it'll pick up all text files, but there's not much we can do about - that, and it won't pick up files with *no* extension or weird - extensions, such as you might get from UN*X systems or from WinDump - commands, but at least it'll filter out some other crud). - - Fix what appear to be memory leaks; that should be backported unless - I've missed something and they aren't leaks. - - Fix an out-of-date comment, and add an additional comment. - - svn path=/trunk/; revision=51481 - -commit 7130121 -Author: Gerald Combs -Date: Thu Aug 22 22:33:19 2013 +0000 - - Split EXTRA_LIBFILES into EXTRA_LIBFILES and EXTRA_BINFILES. Try using - macdeployqt to build our OS X bundle. - - svn path=/trunk/; revision=51480 - -commit 850f80f -Author: Jakub Zawadzki -Date: Thu Aug 22 21:20:50 2013 +0000 - - proto: simplify proto_tree_add_pi() remove out pointer to field_info * - - field_info can be already get using PNODE_FINFO(return_value) - - svn path=/trunk/; revision=51479 - -commit 401cdb0 -Author: Jakub Zawadzki -Date: Thu Aug 22 20:54:50 2013 +0000 - - Convert more dissectors to use hfinfo instead of hfindex. - - svn path=/trunk/; revision=51478 - -commit 75f4fa5 -Author: Pascal Quantin -Date: Thu Aug 22 19:55:25 2013 +0000 - - Remove tree check when dissecting PCCH message so as to avoid filtering expert info on first pass - - svn path=/trunk/; revision=51477 - -commit 9e7ce8b -Author: Martin Kaiser -Date: Thu Aug 22 18:49:31 2013 +0000 - - fix compiler warning on Debian wheezy (gcc 4.7.2) - - dumpcap.c:193:10: error: ignoring return value of ‘write’, declared with - attribute warn_unused_result [-Werror=unused-result] - - for some reason, using (void)write(fd, ...) did not do the trick - - svn path=/trunk/; revision=51476 - -commit 347ea71 -Author: Guy Harris -Date: Thu Aug 22 17:36:30 2013 +0000 - - Only enable the Linux kernel BPF JIT compiler if we're on Linux. - - Unless we're going to do something if that fails, there's no point in - having enable_kernel_bpf_jit_compiler() return a success/failure - indication. - - Fix indentation. - - svn path=/trunk/; revision=51475 - -commit 4409bc2 -Author: Stig Bjørlykke -Date: Thu Aug 22 17:22:25 2013 +0000 - - Fixed building documentation for Lua classes and functions containing digits. - - svn path=/trunk/; revision=51474 - -commit ba1bee9 -Author: Anders Broman -Date: Thu Aug 22 17:21:20 2013 +0000 - - On request from Tommy Wu: - Enable Diameter over UDP dissection as there is an application using it. - - svn path=/trunk/; revision=51473 - -commit 5928ded -Author: Anders Broman -Date: Thu Aug 22 17:20:09 2013 +0000 - - Enable Kernel BPF JIT compiler from dumpcap. - - svn path=/trunk/; revision=51472 - -commit cc2a6a4 -Author: Chris Maynard -Date: Thu Aug 22 17:03:19 2013 +0000 - - Fix clang warning: comma at end of enumerator list - - svn path=/trunk/; revision=51471 - -commit 5f35d91 -Author: Stig Bjørlykke -Date: Thu Aug 22 11:58:32 2013 +0000 - - Added TvbRange strsize(). - - svn path=/trunk/; revision=51470 - -commit d6e80b4 -Author: Guy Harris -Date: Thu Aug 22 03:43:39 2013 +0000 - - From Stephen Donnelly : - - Move the check for vwr files *after* the check for ERF files, as it - sometimes thinks ERF files are VWR files. - - svn path=/trunk/; revision=51467 - -commit 0c550e9 -Author: Guy Harris -Date: Thu Aug 22 03:42:15 2013 +0000 - - Back out the previous change, so I can check it in again with the - *correct* checkin message. Sigh.... - - svn path=/trunk/; revision=51466 - -commit a460926 -Author: Guy Harris -Date: Thu Aug 22 03:40:30 2013 +0000 - - Copy over r51462 from trunk: - - ------------------------------------------------------------------------ - r51462 | guy | 2013-08-21 20:21:47 -0700 (Wed, 21 Aug 2013) | 8 lines - - What was I thinking? ".caz" is used for compressed *Windows* Sniffer - files (which are just gzipped uncompressed Windows Sniffer files, albeit - with the checksum computed differently in some fashion, or perhaps just - being computed incorrectly), not compressed *DOS* Sniffer files (which - use their own form of compression, which doesn't compress the entire - file, just most of it, and which use the same extensions as uncompressed - DOS Sniffer files). - - svn path=/trunk/; revision=51465 - -commit 7a1fdce -Author: Guy Harris -Date: Thu Aug 22 03:21:47 2013 +0000 - - What was I thinking? ".caz" is used for compressed *Windows* Sniffer - files (which are just gzipped uncompressed Windows Sniffer files, albeit - with the checksum computed differently in some fashion, or perhaps just - being computed incorrectly), not compressed *DOS* Sniffer files (which - use their own form of compression, which doesn't compress the entire - file, just most of it, and which use the same extensions as uncompressed - DOS Sniffer files). - - svn path=/trunk/; revision=51462 - -commit 7e59f1f -Author: Evan Huus -Date: Thu Aug 22 02:29:32 2013 +0000 - - Move a brace outside an #ifdef, it was confusing vim's folding. - - svn path=/trunk/; revision=51461 - -commit 2161550 -Author: Evan Huus -Date: Thu Aug 22 02:19:22 2013 +0000 - - Don't look at packet or byte limits during the second pass of two-pass analysis. - The limits are enforced during the first pass, and frames that get dropped from - the first pass for this reason aren't available to the second pass at all, so - checking again is redundant. - - svn path=/trunk/; revision=51460 - -commit 8c484c0 -Author: Martin Kaiser -Date: Wed Aug 21 21:44:48 2013 +0000 - - The export PDU mechanism creates a new capture which contains only the - exported PDUs. The currently opened capture file is closed. - - Make sure that this does not discard any unsaved data. Ask the user for - confirmation and save the changes before running the export. - - svn path=/trunk/; revision=51459 - -commit ac73f00 -Author: Martin Kaiser -Date: Wed Aug 21 20:24:39 2013 +0000 - - From Michael Reschly - Support dissection of TLS Application Layer Protocol Negotiation - - from me: - fix indentation, add check for minimum ext_len, encoding for string hf - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9051 - - svn path=/trunk/; revision=51458 - -commit 61d2e64 -Author: Anders Broman -Date: Wed Aug 21 19:53:57 2013 +0000 - - Make it possible to add custom Diameter AVP .xml files and distribute them by adding the file name to separate files and leave the "normal" makefiles untouched. - - svn path=/trunk/; revision=51457 - -commit d9ebff0 -Author: Guy Harris -Date: Wed Aug 21 18:39:39 2013 +0000 - - Arrange that "make distcheck" use the GUI configure flags used to - configure Wireshark, so we don't, for example, do "make distcheck" with - no options, and thus default to GTK+ 3, on a system without GTK+ 3 where - Wireshark was configured with --with-gtk2. (This also means that if - we're configuring only with Qt, or with GTK+ *and* Qt, "make distcheck" - will check with those.) - - svn path=/trunk/; revision=51456 - -commit 438f2f4 -Author: Pascal Quantin -Date: Wed Aug 21 17:58:16 2013 +0000 - - Fix typo errors - - svn path=/trunk/; revision=51455 - -commit 19edfe8 -Author: Chris Maynard -Date: Wed Aug 21 17:26:49 2013 +0000 - - Fully parenthesize the isprint() macro. - - svn path=/trunk/; revision=51454 - -commit 67131fc -Author: Alexis La Goutte -Date: Wed Aug 21 17:05:20 2013 +0000 - - FromChun-Yeow via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9059 - Add Support of Decoding 802.11s Mesh Channel Switch Parameter Element - - From me: - Remove some trailing whitespace - Add subtree for flag - Change typo of display filter - - svn path=/trunk/; revision=51453 - -commit a6409fd -Author: Alexis La Goutte -Date: Wed Aug 21 17:04:51 2013 +0000 - - From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9061 Added expert info to DNS dissector for negative TTL values - - According to RFC, TTL valid values are the positive values of a 32 bit signed field. This means that, despite the negative values can be put in a packet, they should be ignored. Wireshark prints them correctly, but a warning expert info could be useful. - - svn path=/trunk/; revision=51452 - -commit 0b4c57e -Author: Jakub Zawadzki -Date: Wed Aug 21 17:01:05 2013 +0000 - - small fix for r51448 isprint() is locale aware, we want just ascii - - svn path=/trunk/; revision=51451 - -commit b3dc1ee -Author: Chris Maynard -Date: Wed Aug 21 14:08:42 2013 +0000 - - Fix Coverity CID's 1063706-1063710: Out-of-bounds read (OVERRUN_STATIC) - - svn path=/trunk/; revision=51450 - -commit 121d02e -Author: Chris Maynard -Date: Tue Aug 20 22:53:26 2013 +0000 - - No need to initialize length_remaining to 0. - - svn path=/trunk/; revision=51449 - -commit 3accefd -Author: Chris Maynard -Date: Tue Aug 20 22:42:46 2013 +0000 - - Simplify find_delimiter() by making use of tvb_find_guint8(). - In sss_string(): - -> Protect against tvb_length_remaining() possibly returning -1. - -> Fix off-by-1 potential buffer overflow condition. - -> Use isprint() rather than "do-it-yourself" code. - -> Remove the extra unnecessary "length_remaining" checks in the for() loop. - - #BACKPORT(1.10, 1.8) - - svn path=/trunk/; revision=51448 - -commit 21ad5c1 -Author: Evan Huus -Date: Tue Aug 20 22:41:49 2013 +0000 - - Clean-up ipxnet hash table in host_name_lookup_cleanup. Should fix the buildbot - test suite failures. - - svn path=/trunk/; revision=51447 - -commit 2cfb8df -Author: Chris Maynard -Date: Tue Aug 20 21:21:10 2013 +0000 - - Whitespace changes. Add modelines. - - svn path=/trunk/; revision=51446 - -commit c27481b -Author: Jakub Zawadzki -Date: Tue Aug 20 19:56:57 2013 +0000 - - Fix for bug #9034: Composite TVBs aren't supported by tvb_find_guint8() - - Add generic tvb_find_guint8, tvb_pbrk_guint8 - - svn path=/trunk/; revision=51445 - -commit 8ade8c4 -Author: Jakub Zawadzki -Date: Tue Aug 20 19:54:42 2013 +0000 - - Composite tvb (tvb_memcpy/tvb_get_ptr): don't assert with offset == tvb->length, and 0 length - - svn path=/trunk/; revision=51444 - -commit 39122c4 -Author: Jakub Zawadzki -Date: Tue Aug 20 19:53:24 2013 +0000 - - If packet was modified fallback to generic clone - - svn path=/trunk/; revision=51443 - -commit b0adfae -Author: Chris Maynard -Date: Tue Aug 20 18:50:40 2013 +0000 - - Fix clang warnings: Value stored to '[offset|length]' is never read. - - svn path=/trunk/; revision=51442 - -commit 2cb6529 -Author: Chris Maynard -Date: Tue Aug 20 18:46:46 2013 +0000 - - Fix clang warnings: Value stored to '[decrypted_]offset' is never read. - - svn path=/trunk/; revision=51441 - -commit e37aa2a -Author: Chris Maynard -Date: Tue Aug 20 18:30:46 2013 +0000 - - Fix clang warning: Value stored to 'netl' is never read. - Other misc. whitespace changes. - - svn path=/trunk/; revision=51440 - -commit e7242f0 -Author: Chris Maynard -Date: Tue Aug 20 17:25:17 2013 +0000 - - Fix several instances of clang warnings: Value stored to 'length' is never read - Also, whitespace changes (tabs ->spaces, indentation) and add modelines. - - svn path=/trunk/; revision=51439 - -commit 0f74dff -Author: Jörg Mayer -Date: Tue Aug 20 06:35:45 2013 +0000 - - Fix for - [ 6%] Building C object epan/CMakeFiles/epan.dir/addr_resolv.c.o - /home/jmayer/work/wireshark/svn/trunk/epan/addr_resolv.c:1927:1: error: unused function - 'get_ipxnetbyname' [-Werror,-Wunused-function] - get_ipxnetbyname(const gchar *name) - ^ - /home/jmayer/work/wireshark/svn/trunk/epan/addr_resolv.c:2009:1: error: unused function - 'add_ipxnet_name' [-Werror,-Wunused-function] - - by #if 0/#endif the functions. If they really are not needed any more - they should be removed. - - svn path=/trunk/; revision=51438 - -commit cb1bd18 -Author: Anders Broman -Date: Tue Aug 20 05:27:48 2013 +0000 - - Mark an unused parameter. - - svn path=/trunk/; revision=51437 - -commit 4e63bb5 -Author: Anders Broman -Date: Tue Aug 20 05:06:26 2013 +0000 - - Use g_hash_table() for ipxnet name resolution. - - svn path=/trunk/; revision=51436 - -commit ce6a604 -Author: Anders Broman -Date: Tue Aug 20 05:04:45 2013 +0000 - - From Tommy Wu: - Update Octet 7 of Indication IE. - - svn path=/trunk/; revision=51435 - -commit 1a884bf -Author: Evan Huus -Date: Tue Aug 20 03:21:06 2013 +0000 - - Add a valgrind suppressions file set to suppress the zlib error which otherwise - pops up immediately on the fuzzbot. Hopefully there won't be too many more of - these. - - svn path=/trunk/; revision=51434 - -commit f0a66b2 -Author: Chris Maynard -Date: Mon Aug 19 22:06:48 2013 +0000 - - Another acknowledgment number tweak: If the ACK flag wasn't set such that the base_seq wasn't subtracted from it, then if we need to recover absolute values later on, don't add the base_seq value back either. - - svn path=/trunk/; revision=51433 - -commit d0722af -Author: Chris Maynard -Date: Mon Aug 19 21:41:49 2013 +0000 - - When using relative sequence numbers, don't scale acknowledgment numbers unless the ACK bit is actually set; otherwise doing so results in many erroneous packets matching a filter such as, "(tcp.ack > 0) && (tcp.flags.ack == 0)". With this change, the number of expert infos noting non-zero acknowledgment numbers when the ACK bit is not set is the same as the number of packets that are displayed when applying the above display filter regardless of whether using relative or absolute sequence numbers. (Tested using the menagerie's mond.pcap file) - - svn path=/trunk/; revision=51432 - -commit e20e338 -Author: Chris Maynard -Date: Mon Aug 19 21:17:04 2013 +0000 - - Someone is bound to miss these expert info items, so add back expert info items for ack and urgent pointer when their respective flags are not set; however, don't indicate "Broken TCP" and only add them as Notes rather than as Warnings as was previously the case prior to r51356 since nowhere does it indicate these fields must be zero when their respective bits aren't set. - - Speaking of r51356, a clarification to its commit message is in order: Initially my intention was to only add the urgent pointer field when the URG bit was set; however, I then noticed that the acknowledgment number field was always being added irrespective of the ACK bit. Had I made the change as I originally intended, it would have introduced an inconsistency. After some deliberation, I opted for consistency, but botched the commit message. - - svn path=/trunk/; revision=51431 - -commit 5dee89a -Author: Chris Maynard -Date: Mon Aug 19 19:59:52 2013 +0000 - - Fix Coverity CID 1063335: Unused pointer value. - - svn path=/trunk/; revision=51430 - -commit 641032e -Author: Martin Mathieson -Date: Mon Aug 19 17:06:42 2013 +0000 - - Gather together dedicated DRX configuration, and make sure that it - is internally consistent. - - TODO: include r11 sequence that can overwrite some of these values. - TODO: actx->private_data gets reused for several purposes, need to - separate these uses out and avoid possible conflicts... - - svn path=/trunk/; revision=51429 - -commit 8566744 -Author: Pascal Quantin -Date: Mon Aug 19 16:56:05 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9053 : - Update DDS RTPS Vendor and Product Ids based on http://portals.omg.org/dds/content/page/dds-rtps-vendor-and-product-ids - - svn path=/trunk/; revision=51428 - -commit b46f9be -Author: Pascal Quantin -Date: Mon Aug 19 14:55:41 2013 +0000 - - Change some dissectors to use pinfo memory pool instead of malloc if it can trigger an exception between between buffer allocation and tvb_set_free_cb call - - svn path=/trunk/; revision=51427 - -commit 02cae55 -Author: Pascal Quantin -Date: Mon Aug 19 11:11:11 2013 +0000 - - Do not use ephemeral memory when adding a new data source - - svn path=/trunk/; revision=51424 - -commit 81b6d6a -Author: Pascal Quantin -Date: Mon Aug 19 10:39:43 2013 +0000 - - Do not use ephemeral memory when adding a new data source - - svn path=/trunk/; revision=51423 - -commit b38ec03 -Author: Michael Mann -Date: Mon Aug 19 00:11:50 2013 +0000 - - Bugfix SGI Nsym disambiguation is unconditionally displayed when dissecting VHT, bug 8989 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8989) - - From Karl Beldan - - BACKPORT(1.8,1.10) - - svn path=/trunk/; revision=51422 - -commit bf9d434 -Author: Evan Huus -Date: Sun Aug 18 21:31:07 2013 +0000 - - One more 64/32-conversion fix for rtpproxy - - svn path=/trunk/; revision=51421 - -commit 4dfcdcf -Author: Evan Huus -Date: Sun Aug 18 20:09:05 2013 +0000 - - Take another stab at - packet-rtpproxy.c:226: warning: implicit conversion shortens 64-bit value into a - 32-bit value - - svn path=/trunk/; revision=51420 - -commit 8d7d5fb -Author: Evan Huus -Date: Sun Aug 18 20:04:52 2013 +0000 - - Add a cast to try and fix - packet-rtpproxy.c:226: warning: implicit conversion shortens 64-bit value into - a 32-bit value - - I'm not quite sure what's going on here, all the values in use are either gint - or guint so they should all be the same size? - - svn path=/trunk/; revision=51419 - -commit 6dd6ed8 -Author: Evan Huus -Date: Sun Aug 18 19:59:28 2013 +0000 - - Use epan scope for one XML DTD string to fix a small leak. - - svn path=/trunk/; revision=51418 - -commit 0a23ac4 -Author: Evan Huus -Date: Sun Aug 18 19:49:08 2013 +0000 - - From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8326 - - Dissector for the Sippy RTPproxy controlling protocol. RTPproxy is a well-known - (among SIP-engineers) application and it operates using its own simple - text-based protocol. There are several competing products but all of them - implements it (sometimes slightly extending). - - svn path=/trunk/; revision=51417 - -commit 4fd2487 -Author: Anders Broman -Date: Sun Aug 18 19:18:20 2013 +0000 - - addr_resolution_dlg.c: In function 'ipv6_hash_table_to_texbuff': - addr_resolution_dlg.c:185: warning: unused parameter 'key' - - svn path=/trunk/; revision=51416 - -commit ccb96fd -Author: Anders Broman -Date: Sun Aug 18 19:02:48 2013 +0000 - - Use g_hastable() for IPv6 name reslution. - - svn path=/trunk/; revision=51415 - -commit 2cbe777 -Author: Gerald Combs -Date: Sun Aug 18 14:03:49 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-08-18] - - svn path=/trunk/; revision=51412 - -commit edf1436 -Author: Michael Mann -Date: Sun Aug 18 02:32:23 2013 +0000 - - Bluetooth: HCI: Synchronize and update Voice command. Bug 9050 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050) - - From Michal Labedzki. - - svn path=/trunk/; revision=51411 - -commit 3ffb8e2 -Author: Michael Mann -Date: Sun Aug 18 02:11:36 2013 +0000 - - HCI: Full dissection of EIR/AD and little improve filtering, bug 9050 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050) - - From Michal Labedzki. - - From me: - 1. Have boolean filters use tfs_true_false instead of NULL (because it appears previous functionality had "TRUE" and "FALSE"). Perhaps other tfs_ values could be used, but tfs_true_false makes a good placeholder. - 2. Add FT_ETHER field as a proto_tree_add_item. - - svn path=/trunk/; revision=51410 - -commit 4619288 -Author: Michael Mann -Date: Sun Aug 18 01:36:26 2013 +0000 - - Create individual filters for HCI LMP features. Bug 9050 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050) - - From Michal Labedzki - - svn path=/trunk/; revision=51409 - -commit 9eeeb6d -Author: Michael Mann -Date: Sat Aug 17 23:18:41 2013 +0000 - - Various fixes for dissection bugs from bug 9045 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9045) - - - Expert info for CRC 0x5935 got wrongly attached to Slim SSDO packages - - SPDO Data Requests that fit in the last bytes of a frame got missed - - Slim SSDOs got detected, that actually are not Slim SSDOs, to prevent this in the future, two checks have been added - - The reported length of a Slim SSDO must be larger than 0 (correct - Slim SSDOs always have at least 1 byte) - - Both crc's must differ from another. There is a very unlikely - possibility, that they may collide, but in such a case openSAFETY - in itself would be flawed by design. - - svn path=/trunk/; revision=51408 - -commit 0c0e568 -Author: Jakub Zawadzki -Date: Sat Aug 17 19:35:00 2013 +0000 - - Commit far from being perfect conversation tool from hfindex to hfinfo. - - svn path=/trunk/; revision=51407 - -commit 8fc0c28 -Author: Guy Harris -Date: Sat Aug 17 18:27:23 2013 +0000 - - Another tv_buff reference. - - svn path=/trunk/; revision=51406 - -commit ae50596 -Author: Guy Harris -Date: Sat Aug 17 18:22:50 2013 +0000 - - Just call it a tvbuff, with no underscore. - - svn path=/trunk/; revision=51405 - -commit a8766fb -Author: Martin Mathieson -Date: Sat Aug 17 17:52:13 2013 +0000 - - Squelch a (bogus) warning about next_tvb being unused initialised. - - svn path=/trunk/; revision=51404 - -commit 88eaeba -Author: Jakub Zawadzki -Date: Sat Aug 17 08:59:19 2013 +0000 - - Convert few more dissectors to new proto API. - - svn path=/trunk/; revision=51403 - -commit 74972b2 -Author: Jakub Zawadzki -Date: Sat Aug 17 08:18:59 2013 +0000 - - Fix subtree ett value. - - svn path=/trunk/; revision=51402 - -commit 4e870dd -Author: Jakub Zawadzki -Date: Sat Aug 17 07:16:12 2013 +0000 - - Fix few concept of new api tree: - - - (for now) keep ABI, restore prototype of old proto_tree_add_item, add new proto_tree_add_item_new - - add few helpers for boolean, time, string which will do ->id - - don't use HFI_INIT directly, use it by another macro (MSVC has very small limit for section name) - - svn path=/trunk/; revision=51401 - -commit 68f9abd -Author: Guy Harris -Date: Sat Aug 17 06:30:02 2013 +0000 - - Move "aggregate" fields containing bit subfields before the bit - subfields. Rename some of their hf_ variable names to match the hf_ - variable names of the subfields, and rename one field to be a prefix of - its subfields. - - For the 64-bit UNIX capabilities, use proto_tree_add_item() for the - flags. - - Get rid of a #if 0'ed out field that is duplicated by one of the - newly-added fields. - - svn path=/trunk/; revision=51400 - -commit 36c6e86 -Author: Guy Harris -Date: Sat Aug 17 00:38:54 2013 +0000 - - Get rid of an unused variable. - - For some routines, instead of having them check for -1 as the hf_index - and using a default hf_index in that case, just pass them the default - hf_index instead of -1 and just use the hf_index unconditionally. - - svn path=/trunk/; revision=51399 - -commit f0fc3c2 -Author: Guy Harris -Date: Fri Aug 16 22:22:36 2013 +0000 - - Fix typo (failure to remove a %). - - _U_ify some no-longer-used arguments. - - Rename all the hf_pipe variables to hf_smb_pipe, and rename the field - names and protocol name to be "smb_pipe.", for consistency. (Ceci n'est - pas une pipe.) - - Treat and label 1-byte parameters as "byte parameters" and multi-byte - opaque parameters as "bytes parameters". - - Format machine-added hf[] entries to match other hf[] entries. - - Fix indentation. - - svn path=/trunk/; revision=51398 - -commit 1356d07 -Author: Jakub Zawadzki -Date: Fri Aug 16 21:52:35 2013 +0000 - - Convert my dissectors to new proto API. - - svn path=/trunk/; revision=51397 - -commit 9d79b32 -Author: Jakub Zawadzki -Date: Fri Aug 16 21:21:52 2013 +0000 - - Introduce new proto_tree API required for hf_ variables removal. - - svn path=/trunk/; revision=51396 - -commit 67f1d07 -Author: Chris Maynard -Date: Fri Aug 16 20:46:45 2013 +0000 - - Initialize val_len to avoid Clang warning: The right operand of '-' is a garbage value. While in there, add some protection against tvb_length_remaining() possibly returning -1, or possibly being less than val_len. - - #BACKPORT(1.10) - - svn path=/trunk/; revision=51395 - -commit 9e92781 -Author: Michael Mann -Date: Fri Aug 16 20:38:21 2013 +0000 - - Make more filterable items courtesy of convert_proto_tree_add_text.pl. - - Also converted proto_tree_add_xxx_format into proto_tree_add_xxx_format_value so that label doesn't get out of sync with hf. - - svn path=/trunk/; revision=51394 - -commit dc105bb -Author: Chris Maynard -Date: Fri Aug 16 20:07:25 2013 +0000 - - Fix 5 warnings: Value stored to 'offset' is never read. Also: misc. whitespace changes, add modelines. - - svn path=/trunk/; revision=51393 - -commit 365d223 -Author: Chris Maynard -Date: Fri Aug 16 19:28:24 2013 +0000 - - Trivial. Fix warning: Value stored to 'str_index' is never read. - - svn path=/trunk/; revision=51392 - -commit 0ea379e -Author: Evan Huus -Date: Fri Aug 16 13:45:00 2013 +0000 - - Be sure to forward BIN_DIR to the valgrind script, probably also needed on the - fuzz-but. - - svn path=/trunk/; revision=51391 - -commit c5ae1bb -Author: Anders Broman -Date: Fri Aug 16 05:24:09 2013 +0000 - - packet-dcerpc-pn-io.c: In function 'dissect_PNIO_C_SDU': - packet-dcerpc-pn-io.c:9220: warning: unused parameter 'drep' - - svn path=/trunk/; revision=51390 - -commit 3e69184 -Author: Anders Broman -Date: Fri Aug 16 04:57:48 2013 +0000 - - From Wido Kelling: - wrong interpretation of first byte in userdata of profinet data. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9039 - - svn path=/trunk/; revision=51389 - -commit 1e8f7d9 -Author: Anders Broman -Date: Fri Aug 16 04:49:13 2013 +0000 - - From Chris Pane: - More bug fixes and feature additions to IEEE1722.1 dissector. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9043 - - svn path=/trunk/; revision=51388 - -commit 5d8b79c -Author: Evan Huus -Date: Fri Aug 16 01:52:51 2013 +0000 - - Try to use smarter path resolution and detection in order to work in - environments that are not the build tree (namely the fuzz-bot, but this might - make normal out-of-tree builds easier too). - - svn path=/trunk/; revision=51387 - -commit 6538787 -Author: Evan Huus -Date: Fri Aug 16 01:35:56 2013 +0000 - - Add one 'volatile' keyword to fix a -Wclobbered and change the tree used in one - proto_tree call to fix a -Wunused-but-set-variable, both of which show up in GCC - 4.8. - - svn path=/trunk/; revision=51386 - -commit e2bf819 -Author: Michael Mann -Date: Fri Aug 16 00:08:25 2013 +0000 - - Use convert_proto_tree_add_text.pl to make many filterable items. - Also some cleanup since the filterable items remove the need for tvb_memcpy of static structures. - - svn path=/trunk/; revision=51385 - -commit 618c6ee -Author: Chris Maynard -Date: Thu Aug 15 17:37:14 2013 +0000 - - Fix Coverity CID 1062616: Unused pointer value. - - svn path=/trunk/; revision=51384 - -commit 543e05b -Author: Chris Maynard -Date: Thu Aug 15 15:26:12 2013 +0000 - - Group all "Seconds elapsed appears to be encoded as little-endian" expert info messages together, regardless of the computed value of the seconds field. This adds a single expandable entry instead of multiple entries (up to 255 potentially) and makes the expert info generally nicer to view (IMO). - - svn path=/trunk/; revision=51383 - -commit ba0edfe -Author: Jakub Zawadzki -Date: Thu Aug 15 10:44:19 2013 +0000 - - Original ERF file format documentation is still 404, link to bugzilla. - - svn path=/trunk/; revision=51382 - -commit 68d8cad -Author: Jakub Zawadzki -Date: Thu Aug 15 09:33:52 2013 +0000 - - [trivial] Use g_stpcpy() - - svn path=/trunk/; revision=51381 - -commit e4c4c6f -Author: Guy Harris -Date: Thu Aug 15 09:09:49 2013 +0000 - - Get rid of set-but-not-used variable. Link to the tools.ietf.org HTML - version of RFC 5050. - - svn path=/trunk/; revision=51380 - -commit 456d1f1 -Author: Guy Harris -Date: Thu Aug 15 04:09:18 2013 +0000 - - Add $Id$, arrange that it's expanded, use native line endings. - - svn path=/trunk/; revision=51379 - -commit ad0fbb4 -Author: Guy Harris -Date: Thu Aug 15 04:05:49 2013 +0000 - - Add $Id$, arrange that it's expanded, use native line endings. - - svn path=/trunk/; revision=51378 - -commit 778e736 -Author: Guy Harris -Date: Thu Aug 15 04:01:23 2013 +0000 - - Add $Id$. - - svn path=/trunk/; revision=51376 - -commit 64f0794 -Author: Guy Harris -Date: Thu Aug 15 03:55:09 2013 +0000 - - Fix $Id$. - - svn path=/trunk/; revision=51373 - -commit 76d8682 -Author: Guy Harris -Date: Thu Aug 15 03:54:23 2013 +0000 - - Fix $Id$ - - svn path=/trunk/; revision=51372 - -commit 7a3791c -Author: Guy Harris -Date: Thu Aug 15 03:50:36 2013 +0000 - - Expand $Id$, use native line endings. - - svn path=/trunk/; revision=51369 - -commit 63fb123 -Author: Guy Harris -Date: Thu Aug 15 03:47:37 2013 +0000 - - Expand $Id$, use native line endings, get rid of CRs (they belong on - Windows, but not on UN*X). - - svn path=/trunk/; revision=51368 - -commit b6b0269 -Author: Guy Harris -Date: Thu Aug 15 03:37:51 2013 +0000 - - Add SVN properties to expand $Id$ and use native line endings. - - svn path=/trunk/; revision=51366 - -commit 7eb98fe -Author: Michael Mann -Date: Thu Aug 15 03:05:51 2013 +0000 - - A few more improvements: - 1. Make a "dissect_dictionary" function for the common dissection of the different primary header versions. - 2. Remove some of the "dissection aborts" if sdnv values are bad. Detecting malformed packets can be a good thing. - 3. Make fields that use a sdnv value filterable, with expert info if the value is bad. - - - svn path=/trunk/; revision=51365 - -commit 2048ac8 -Author: Evan Huus -Date: Thu Aug 15 02:45:58 2013 +0000 - - Split the code to convert an ethernet address into an int64 into a function - since it's used in several places. Don't allocate a key just to do a hash-table - lookup, we only need to do that if we're actually inserting. Fixes another ~1KB - of leaks. - - svn path=/trunk/; revision=51364 - -commit 4577d39 -Author: Evan Huus -Date: Thu Aug 15 02:38:00 2013 +0000 - - Free the old name before we add the new one in case the services file has - duplicates (it does). Fixes about 2KB of leaks. - - svn path=/trunk/; revision=51363 - -commit 21d9e01 -Author: Evan Huus -Date: Thu Aug 15 02:23:53 2013 +0000 - - From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9040 - - Small fixes and enhancements to SCSI INQUIRY results. - - svn path=/trunk/; revision=51362 - -commit bef6373 -Author: Evan Huus -Date: Thu Aug 15 02:17:51 2013 +0000 - - From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9037 - - Update the heuristics for detecting ISO 14443-A payloads with 4 byte UIDs, and - ATS values to support MTCOS-based cards/tokens (e.g. passports) in PN532 - InListPassiveTarget responses. - - svn path=/trunk/; revision=51361 - -commit 80ea68a -Author: Evan Huus -Date: Thu Aug 15 02:06:49 2013 +0000 - - As suggested by Volcke Mario, fixing - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9036 - - Don't change the length *and* the offset when adjusting for the ethercat header, - just the offset is enough (the length is then right). - - svn path=/trunk/; revision=51360 - -commit d9fd5d6 -Author: Martin Kaiser -Date: Wed Aug 14 21:14:21 2013 +0000 - - use the correct length for the tvbuff of an unknown usb descriptor - - svn path=/trunk/; revision=51359 - -commit 6503e92 -Author: Jakub Zawadzki -Date: Wed Aug 14 20:14:38 2013 +0000 - - Add some XXX comment. - - svn path=/trunk/; revision=51358 - -commit 6730531 -Author: Chris Maynard -Date: Wed Aug 14 18:35:36 2013 +0000 - - Nowhere in the RFC's (793 or otherwise) does it indicate that if the URG bit is not set that the urgent pointer field must be zero. - - References: - http://tools.ietf.org/html/rfc793, http://tools.ietf.org/html/rfc1122, ... - http://www.wireshark.org/lists/ethereal-dev/200307/msg00297.html - - Similarly, nowhere does it say that the acknowledgment number field must be zero if the ACK bit is not set. - - This patch effectively reverts r37721. If non-zero urgent pointers are of interest to you when the URG bit is not set, then a filter such as follows can be used: - - (tcp.flags.urg == 0) && !(tcp[18:2] == 00:00) - - Similarly, if non-zero acknowledgment numbers are of interest to you when the ACK bit is not set, then use this filter: - - (tcp.flags.ack == 0) && !(tcp.ack == 0) - - For consistency, should we avoid adding the ack field in this case as well? The above filter would then change to: - - (tcp.flags.ack == 0) && !(tcp[8:4] == 00:00:00:00) - - This change was prompted by the following question on ask.wireshark.org: - http://ask.wireshark.org/questions/23753/tcp-urgent-pointer-value-not-displayed - - svn path=/trunk/; revision=51356 - -commit 0da22d4 -Author: Evan Huus -Date: Wed Aug 14 17:36:47 2013 +0000 - - Pre-emptively create the other two hash tables in packet.c for simplicity's - sake. - - svn path=/trunk/; revision=51355 - -commit cbda96d -Author: Guy Harris -Date: Wed Aug 14 04:14:36 2013 +0000 - - Global variables considered harmful. - - svn path=/trunk/; revision=51352 - -commit da7c920 -Author: Guy Harris -Date: Wed Aug 14 01:21:13 2013 +0000 - - I guess Solaris's getopt_long() "struct option" declaration doesn't have - enough cowbell^wconst; throw in a comment to squelch warnings. - - svn path=/trunk/; revision=51351 - -commit ab3aeb6 -Author: Guy Harris -Date: Wed Aug 14 01:18:58 2013 +0000 - - Get rid of -Wshadow warning - I guess we're including something that - gets , so we get the optarg global. - - svn path=/trunk/; revision=51350 - -commit 9e47411 -Author: Guy Harris -Date: Wed Aug 14 01:15:59 2013 +0000 - - Include config.h first; it defines _FILE_OFFSET_BITS, and if some system - header later causes it to be redefined - as happens on my Solaris 11 - virtual machine - we get a redefinition warning, which gets treated as - an error. - - svn path=/trunk/; revision=51349 - -commit 34108ed -Author: Guy Harris -Date: Wed Aug 14 00:41:02 2013 +0000 - - Get rid of -Wshadow warning - I guess we're including something that - gets , so we get the optarg global. - - svn path=/trunk/; revision=51348 - -commit b65e9e9 -Author: Guy Harris -Date: Wed Aug 14 00:37:14 2013 +0000 - - UN*X pathnames + PL/I's comment syntax = surprises. Yay C++ (and C99). - - svn path=/trunk/; revision=51347 - -commit 5dcd6da -Author: Guy Harris -Date: Wed Aug 14 00:35:27 2013 +0000 - - Get rid of -Wshadow warning - I guess we're including something that - gets , so we get the optarg global. - - svn path=/trunk/; revision=51346 - -commit 14fe895 -Author: Guy Harris -Date: Wed Aug 14 00:33:36 2013 +0000 - - Use 4-space indentation consistently. - - svn path=/trunk/; revision=51345 - -commit e8f42c6 -Author: Guy Harris -Date: Wed Aug 14 00:31:14 2013 +0000 - - Include config.h first; it defines _FILE_OFFSET_BITS, and if some system - header later causes it to be redefined - as happens on my Solaris 11 - virtual machine - we get a redefinition warning, which gets treated as - an error. - - svn path=/trunk/; revision=51344 - -commit cfa2dc5 -Author: Guy Harris -Date: Tue Aug 13 23:37:32 2013 +0000 - - Add in more comments on the whole "get the path of the executable from - the kernel" thing, and add the NetBSD and DragonFly BSD /proc links (if - they don't mount /proc, that doesn't work, but it doesn't get in the - way). - - On Solaris, check for getexecname, just in case somebody tries to build - on an old Solaris that doesn't support it (that could well end up being - the least of their problems, but at least they won't ask us to diagnose - that one). - - svn path=/trunk/; revision=51343 - -commit d8f00e2 -Author: Evan Huus -Date: Tue Aug 13 22:41:34 2013 +0000 - - As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9033 - - Make epan_free a no-op if the pointer is NULL. This fixes 99% of the cases - causing problems for wmem_leave_file_scope() - remove that XXX comment and add - back the assertion. - - Remove the cleanup_dissection call from epan_cleanup, it doesn't make sense - there. init_dissection is only called from epan_new, so cleanup_dissection - should only be called from epan_free. - - Add one missing epan_free call to tshark revealed by the above changes. - - svn path=/trunk/; revision=51342 - -commit 1eab806 -Author: Evan Huus -Date: Tue Aug 13 22:24:59 2013 +0000 - - Make what appear to be the intended changes so that all variables are used or - removed and it compiles. - - svn path=/trunk/; revision=51341 - -commit 4771fdb -Author: Guy Harris -Date: Tue Aug 13 18:03:17 2013 +0000 - - Fix intended proto_tree_add_item() call that mistakenly called - proto_tree_add_uint(); caught by the checkAPI script run in a Windows - build. - - svn path=/trunk/; revision=51340 - -commit 02462c7 -Author: Alexis La Goutte -Date: Tue Aug 13 17:50:22 2013 +0000 - - From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9038 - 802.11 HT Extended Capabilities B10 decode incorrect - - #Backport 1.10 and 1.8 - - Within the 802.11 HT Capabilities IE the "HT Extended Capabilities" B10's name is incorrect. - - It is currently titled "High Throughput". This is incorrect/missleading. It should be something like "High Throughput Control (+HTC)". The field indicates if the "High Throughput Control (HTC)" field is supported - not if HT itself is supported. - - svn path=/trunk/; revision=51339 - -commit 69e9d50 -Author: Evan Huus -Date: Tue Aug 13 13:28:14 2013 +0000 - - Use start_offset to set the item length in the usual pattern (assuming this was - intended). Fixes the unused variable warning on start_offset. - - svn path=/trunk/; revision=51338 - -commit 0776754 -Author: Michael Mann -Date: Tue Aug 13 11:37:27 2013 +0000 - - Some improvements to the bundle protocol: - 1. Cleanly break out Convergence Layer Protocol (TCPCL) into its own (new-style) pure dissector. - 2. Make Bundle dissection into a new style dissector and clean so that it can be called using call_disssector. - 3. Use tcp_dissect_pdus for TCPCL protocol instead of "manual" while loop. This allows contact header to benefit from TCP fragmentation. - 4. Make time fields use time field types so they can be filterable. - 5. A few functions were move to remove need for static declaration at top of file. - 6. Remove pri_hdr_procflags global variable. - - Next up - making more fields filterable. - - svn path=/trunk/; revision=51337 - -commit ab8f63d -Author: Martin Mathieson -Date: Tue Aug 13 10:40:06 2013 +0000 - - Add missing return (reported as missing break by coverity) - - svn path=/trunk/; revision=51336 - -commit a31a88b -Author: Stig Bjørlykke -Date: Tue Aug 13 10:38:30 2013 +0000 - - Show the Lua plugin being loaded in the splash screen. - - svn path=/trunk/; revision=51335 - -commit bae2eee -Author: Jörg Mayer -Date: Tue Aug 13 09:58:09 2013 +0000 - - Implement in cmake: - - http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322 - - > User: guy - > Date: 2013/08/12 01:01 PM - > - > Log: - > Just check whether dladdr() is available; we check in the code whether - > it succeeds, so there's no point in checking whether it succeeds in a - > sample program. - - svn path=/trunk/; revision=51334 - -commit 9ef54f5 -Author: Pascal Quantin -Date: Tue Aug 13 08:19:41 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9035 : - Indicate the right direction in info column - - svn path=/trunk/; revision=51333 - -commit 890093e -Author: Guy Harris -Date: Tue Aug 13 07:58:06 2013 +0000 - - Wrap in "extern "C"" for the benefit of C++ code including it. - - svn path=/trunk/; revision=51332 - -commit 1e9644c -Author: Anders Broman -Date: Tue Aug 13 05:29:04 2013 +0000 - - From Javier Godoy: - Dissect additional OSD-2 service actions (CREATE/REMOVE PARTITION, GET/SET ATTRIBUTES, QUERY). - - This patch adds support for some OSD-2 service actions, following the approach described in bug 8832. - - The implemented service actions are: - - CREATE PARTITION - - REMOVE PARTITION - - REMOVE COLLECTION - - GET ATTRIBUTES - - SET ATTRIBUTES - - QUERY - - The following service action codes was #defined - - OSD_2_REMOVE_PARTITION 0x888c - - The following trees were added - - ett_osd2_query_criteria_entry - - The following fields were added: - - hf_scsi_osd2_remove_scope (REMOVE PARTITION) - - hf_scsi_osd2_immed_tr (QUERY) - - hf_scsi_osd2_matches_collection_object_id (QUERY) - - hf_scsi_osd2_query_type (query list CDB continuation descriptor) - - hf_scsi_osd2_query_entry_length (query list CDB continuation descriptor) - - hf_scsi_osd2_query_attributes_page (query list CDB continuation descriptor) - - hf_scsi_osd2_query_attribute_number (query list CDB continuation descriptor) - - hf_scsi_osd2_query_minimum_attribute_value_length (query list CDB continuation descriptor)* - - hf_scsi_osd2_query_maximum_attribute_value_length (query list CDB continuation descriptor)* - * (dissection of the attribute value in query descriptors is not implemented yet) - - The following value_string arrays were added: - - scsi_osd2_remove_scope_val (OSD2r4 Table 143) - - scsi_osd2_query_type_vals (OSD2r4 Table 75) - - The following value_string arrays were updated: - - scsi_osd_svcaction_vals - - scsi_osd2_object_descriptor_format_val - - The following functions were added: - - dissect_osd2_query - - dissect_osd2_query_list_descriptor (dissect CDB continuation descriptor type 0x0002) - - The following expert_info fields were added: - - ei_osd2_query_values_equal (PI_PROTOCOL,PI_NOTE) - the minimum and maximum attribute values are equal in a query descriptor entry - - Changes in dissect_osd2_cdb_continuation: - - Dissect case 0x0002 - - Changes in dissect_osd_* - - Initialize extra_data->osd2 - - Dissect OSD-2 specific fields - - Call dissect_osd_cdb_continuation_length / dissect_osd_cdb_continuation (if osd2) - - Version-specific increment of offset after dissecting capability/security_parameters - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9029 - - svn path=/trunk/; revision=51331 - -commit 4daf984 -Author: Anders Broman -Date: Tue Aug 13 05:19:48 2013 +0000 - - From Yaniv Kaul: - small addition to SCSI dissection (media rotation speed analysis) - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9030 - - svn path=/trunk/; revision=51330 - -commit a2b2885 -Author: Evan Huus -Date: Tue Aug 13 03:11:28 2013 +0000 - - Create the dissector hash table in only one place, and specify that its values - should be freed when it is destroyed. This requires splitting packet_init in - two: the hash table which must be created before protocol registration, and the - caching of common protocol handles, which must happen after registration. - - svn path=/trunk/; revision=51329 - -commit 14b098b -Author: Evan Huus -Date: Tue Aug 13 02:56:55 2013 +0000 - - When freeing the preferences of a module, also free the preferences of its - submodule. - - svn path=/trunk/; revision=51328 - -commit f528d4e -Author: Evan Huus -Date: Tue Aug 13 02:18:04 2013 +0000 - - Only rescan packets if we have packets to rescan. Fixes at least the surface - problem in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9033 - - The underlying scoping issues may not be fully resolved yet. - - svn path=/trunk/; revision=51327 - -commit 7292140 -Author: Evan Huus -Date: Tue Aug 13 01:41:51 2013 +0000 - - Fix name resolution tests: - - if we find a name during lookup, return it even if it's not a dummy - - read personal hosts after global hosts so that they take precedence - - Neither of these problems appear to be new - the recent work did not change this - logic, so I have no idea how come name resolution wasn't failing before, but I - guess the old hash table was weirder than I thought... - - svn path=/trunk/; revision=51326 - -commit 616324c -Author: Evan Huus -Date: Mon Aug 12 23:35:35 2013 +0000 - - Be sure to initialize the jumbo flag when creating a new chunk header by - splitting an existing chunk. Thanks to Jeff for catching this one. - - svn path=/trunk/; revision=51325 - -commit 3b5aaef -Author: Jörg Mayer -Date: Mon Aug 12 22:17:06 2013 +0000 - - - Extract variables from Makefile.common. - - Apply this to asn1/c1222/ - - svn path=/trunk/; revision=51324 - -commit 50eb826 -Author: Guy Harris -Date: Mon Aug 12 20:24:59 2013 +0000 - - If we're looking for some version of GTK+, and don't find it, fail. - That way, if somebody specifies --with-gtk[23] and that version of GTK+ - isn't found, we fail with an indication that the version of GTK+ they - asked for isn't there, and if no GUI toolkit was specified, and they - didn't explicitly say "don't build Wireshark", we look for GTK+ 3 and, - if it's not found, let the user know explicitly. - - svn path=/trunk/; revision=51323 - -commit bebe120 -Author: Guy Harris -Date: Mon Aug 12 20:01:30 2013 +0000 - - Just check whether dladdr() is available; we check in the code whether - it succeeds, so there's no point in checking whether it succeeds in a - sample program. - - svn path=/trunk/; revision=51322 - -commit 4b64101 -Author: Pascal Quantin -Date: Mon Aug 12 19:23:08 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9031 : - SIP contact-param parsing should be stopped when finding a comma separator - - svn path=/trunk/; revision=51321 - -commit 57b8c51 -Author: Guy Harris -Date: Mon Aug 12 18:51:06 2013 +0000 - - Tell a bit more of the story of dladdr()'s ability, or lack of same, to - return a path for the executable image not based on argv[0]. - - svn path=/trunk/; revision=51320 - -commit 1ef4ba5 -Author: Anders Broman -Date: Mon Aug 12 18:33:08 2013 +0000 - - Move initalisation of IPv4 hastable to the host_name_lookup_init() rotine. - - svn path=/trunk/; revision=51319 - -commit af49292 -Author: Anders Broman -Date: Mon Aug 12 18:29:42 2013 +0000 - - From Tommy Wu: - - AppId is unsigned. - - Add Relay application. - - svn path=/trunk/; revision=51318 - -commit 25a8c57 -Author: Alexis La Goutte -Date: Mon Aug 12 17:46:04 2013 +0000 - - Fix error when enable "debug" in wiretap/pcapng.c file - - With gcc : - pcapng.c: In function 'pcapng_read_packet_block': - pcapng.c:1147:9: error: request for member 'pseudo_header' in something not a structure or union - - With clang : - pcapng.c:1150:86: error: member reference type 'struct wtap_pkthdr *' is a pointer; maybe you meant to use '->'? - pcap_get_phdr_size(int_data.wtap_encap, &wblock->packet_header.pseudo_header)); - ~~~~~~~~~~~~~~~~~~~~~^ - -> - (Error message from clang is better...) - - svn path=/trunk/; revision=51317 - -commit f9da854 -Author: Alexis La Goutte -Date: Mon Aug 12 17:45:54 2013 +0000 - - Fix shorten-64-to-32 error when build with clang 3.4 - - mcast_stream.c:393:29: error: implicit conversion loses integer precision: 'long' to 'gint32' (aka 'int') - [-Werror,-Wshorten-64-to-32] - usec = buffer[cur].tv_usec - buffer[prev].tv_usec; - ~ ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~ - - svn path=/trunk/; revision=51316 - -commit 95785b9 -Author: Guy Harris -Date: Mon Aug 12 17:16:08 2013 +0000 - - Use "command -v", required by recent POSIX, rather than "which"; I seem - to remember this being suggested relatively recently on some mailing list - (either one of the Wireshark lists or tcpdump-workers, I think). - - Handle systems where /usr/X11R6/bin is a symlink to /usr/bin and where - the user running autogen.sh has /usr/X11R6/bin before /usr/bin in their - $PATH. - - svn path=/trunk/; revision=51315 - -commit 1cf28c3 -Author: Stig Bjørlykke -Date: Mon Aug 12 12:59:21 2013 +0000 - - Double click Lua scripts in About Plugins list to open in an editor. - - svn path=/trunk/; revision=51314 - -commit f76303c -Author: Martin Kaiser -Date: Mon Aug 12 10:15:01 2013 +0000 - - coverity 280403 (logically dead code) - - set first to FALSE after the first block was dissected - - svn path=/trunk/; revision=51313 - -commit 40607cb -Author: Pascal Quantin -Date: Mon Aug 12 09:56:30 2013 +0000 - - Check presence of PagingRecordList before trying to fetch the number of Paging Ids - - svn path=/trunk/; revision=51312 - -commit 24e7b8a -Author: Pascal Quantin -Date: Mon Aug 12 09:26:24 2013 +0000 - - Fix copy paste error and reinitialize actx->private_data to NULL once used - - svn path=/trunk/; revision=51311 - -commit 9ff0016 -Author: Guy Harris -Date: Mon Aug 12 09:18:54 2013 +0000 - - Fix a comment. - - Fix calls checking the Linux version number. - - svn path=/trunk/; revision=51310 - -commit 70523b5 -Author: Guy Harris -Date: Mon Aug 12 09:09:32 2013 +0000 - - On some platforms, to get dladdr() you need to link with -ldl. First - try it without -ldl (in case the OS doesn't have it - not a good idea, - as it complicates the build process for cross-platform tools that might - require it on other platforms, but "not a good idea" never stopped UN*X - vendors in the past) and, if that fails, try it with -ldl. - - svn path=/trunk/; revision=51309 - -commit f568d56 -Author: Guy Harris -Date: Mon Aug 12 08:28:34 2013 +0000 - - Add in a bunch of UNIX-platform-specific ways of getting executable path - information supplied by the kernel; sadly, we can't trust dladdr() to - use those mechanisms, so we try this first. - - Expand the comment about finding the application bundle path given the - executable image path. - - svn path=/trunk/; revision=51308 - -commit 829a4f2 -Author: Guy Harris -Date: Mon Aug 12 01:20:20 2013 +0000 - - Add a comment discussing the layout of application bundles and the - directories we should - and perhaps should *not* - set up. - - svn path=/trunk/; revision=51307 - -commit 237c5a7 -Author: Guy Harris -Date: Mon Aug 12 00:59:34 2013 +0000 - - If we weren't started with special privileges, try to figure out if - we're running from inside an OS X app bundle and, if we are, save the - pathname of the top-level bundle directory and use it to get the - pathnames of global data files, plugins, and Python modules. - - This obviates the need to set special environment variables for them in - the launcher scripts, so get rid of the commands to do that. - - The @rpathification of binaries also obviates the need for the - commented-out setting of DYLD_LIBRARY_PATH, so get rid of that as well. - - svn path=/trunk/; revision=51306 - -commit bf0f0ec -Author: Evan Huus -Date: Sun Aug 11 23:49:56 2013 +0000 - - Reorder and group chunk header flags. Reduces the bit-twiddling needed by the - compiler and provides a surprising (if fairly small) performance win. - - svn path=/trunk/; revision=51305 - -commit dc46cb0 -Author: Evan Huus -Date: Sun Aug 11 22:32:46 2013 +0000 - - Split jumbo_free and jumbo_realloc into their own functions for readability and - consistency (they are called just once and will be inlined by any reasonable - compiler). - - Also add some comments, fix some spacing etc. No functional changes. - - svn path=/trunk/; revision=51304 - -commit 6eef00a -Author: Evan Huus -Date: Sun Aug 11 22:20:35 2013 +0000 - - Move the null check outside the function call. Simpler, and more efficient for - compilers that decide not to inline. - - svn path=/trunk/; revision=51303 - -commit 497e53e -Author: Evan Huus -Date: Sun Aug 11 19:33:30 2013 +0000 - - Little optimization: move two statements inside an if block. - - svn path=/trunk/; revision=51302 - -commit 93c9c4b -Author: Anders Broman -Date: Sun Aug 11 19:02:26 2013 +0000 - - Use g_hashtable for IPv4 name resolution. - - svn path=/trunk/; revision=51301 - -commit f983419 -Author: Evan Huus -Date: Sun Aug 11 17:48:49 2013 +0000 - - Don't let a valgrind-output-parsing error hide the fact that it was an error of - some sort: if we don't recognize valgrind's output then something somewhere went - wrong and we should be informed. - - svn path=/trunk/; revision=51300 - -commit 36ff6f2 -Author: Evan Huus -Date: Sun Aug 11 17:18:19 2013 +0000 - - Add support for allocating more than will fit in a single block, through the use - of a jumbo flag in the chunk header. - - svn path=/trunk/; revision=51299 - -commit 959ee8f -Author: Evan Huus -Date: Sun Aug 11 16:06:07 2013 +0000 - - Instead of using a glib slist to track the list of blocks, embed a short - doubly-linked list at the head of each block. This was intended as a step - towards supporting allocations bigger than the usual block size, but also shows - up as a 2% performance improvement in the speed test, so win-win. - - svn path=/trunk/; revision=51298 - -commit 3bac7e8 -Author: Evan Huus -Date: Sun Aug 11 14:20:00 2013 +0000 - - Small optimization: the master-list and recycler cases are different enough that - doing all the safety checks was unnecessarily slow. Do only the appropriate - checks for each case. - - svn path=/trunk/; revision=51296 - -commit f2b6745 -Author: Gerald Combs -Date: Sun Aug 11 14:03:40 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-08-11] - - svn path=/trunk/; revision=51294 - -commit 9fdf6f2 -Author: Evan Huus -Date: Sun Aug 11 13:44:11 2013 +0000 - - Split some asserts so it is more clear what the problem is when they are - triggered. - - svn path=/trunk/; revision=51293 - -commit 83d3162 -Author: Evan Huus -Date: Sun Aug 11 13:42:12 2013 +0000 - - Free a few hash tables in packet.c when we shutdown. - - svn path=/trunk/; revision=51292 - -commit 1176e2f -Author: Evan Huus -Date: Sun Aug 11 00:50:51 2013 +0000 - - Modelines and consistent indentation. - - Also tweak some ifdefs of function signatures. The multiple braces were - confusing my folder and my indenter, so ifdef *only* the changed parameters and - leave the bracing alone. This has the benefit of being a bit clearer too, I - think. - - svn path=/trunk/; revision=51291 - -commit f753028 -Author: Evan Huus -Date: Sun Aug 11 00:35:22 2013 +0000 - - Fix 130KB of leaked memory exposed (or caused?) by the conversion to glib hash - tables. - - svn path=/trunk/; revision=51290 - -commit 84239c0 -Author: Guy Harris -Date: Sat Aug 10 21:34:15 2013 +0000 - - Initialize float variables with float constants, not double constants, - and assign float constants, not double constants, to float variables. - Floating-point constants are double by default; you have to add "f" to - the end to make them float. - - This squelches 64-bit-to-32-bit warnings. - - svn path=/trunk/; revision=51289 - -commit 05739c8 -Author: Alexis La Goutte -Date: Sat Aug 10 21:32:48 2013 +0000 - - RPKI-RTR is not a asn1 dissector... - - svn path=/trunk/; revision=51288 - -commit f12a5fb -Author: Alexis La Goutte -Date: Sat Aug 10 21:32:40 2013 +0000 - - Update .gitignore - - Add : - packaging/macosx/Wireshark_package.pmdoc/index.xml - and lib(wireshark/wiretap/wsutil).so.* - - svn path=/trunk/; revision=51287 - -commit 7db2d35 -Author: Alexis La Goutte -Date: Sat Aug 10 21:32:32 2013 +0000 - - Fix (-W)header-guard error found by clang 3.4 - - ./frame_tvbuff.h:25:9: error: '__FRAME_TVBUFF__' is used as a header guard here, - followed by #define of a different macro [-Werror,-Wheader-guard] - #ifndef __FRAME_TVBUFF__ - ^~~~~~~~~~~~~~~~ - ./frame_tvbuff.h:26:9: note: '__FRAME_TVBUFF_H__' is defined here; did you mean - '__FRAME_TVBUFF__'? - #define __FRAME_TVBUFF_H__ - ^~~~~~~~~~~~~~~~~~ - __FRAME_TVBUFF__ - - svn path=/trunk/; revision=51286 - -commit d2c0e56 -Author: Alexis La Goutte -Date: Sat Aug 10 21:32:24 2013 +0000 - - Fix (-W)header-guard error found by clang 3.4 - - ./packet-ldp.h:26:9: error: '__PACKET_LDP_H_' is used as a header guard here, - followed by #define of a different macro [-Werror,-Wheader-guard] - #ifndef __PACKET_LDP_H_ - ^~~~~~~~~~~~~~~ - ./packet-ldp.h:27:9: note: '__PACKET_LDP_H__' is defined here; did you mean - '__PACKET_LDP_H_'? - #define __PACKET_LDP_H__ - ^~~~~~~~~~~~~~~~ - __PACKET_LDP_H_ - - svn path=/trunk/; revision=51285 - -commit d5fed8b -Author: Alexis La Goutte -Date: Sat Aug 10 21:32:16 2013 +0000 - - Fix (-W)header-guard error found by clang 3.4 - - ./packet-idp.h:25:9: error: '__PACKET_IDP_H__' is used as a header guard here, - followed by #define of a different macro [-Werror,-Wheader-guard] - #ifndef __PACKET_IDP_H__ - ^~~~~~~~~~~~~~~~ - ./packet-idp.h:26:9: note: '__PACKET_IPX_H__' is defined here; did you mean - '__PACKET_IDP_H__'? - #define __PACKET_IPX_H__ - ^~~~~~~~~~~~~~~~ - __PACKET_IDP_H__ - - svn path=/trunk/; revision=51284 - -commit 857f89a -Author: Alexis La Goutte -Date: Sat Aug 10 21:32:08 2013 +0000 - - Fix (-W)header-guard error found by clang 3.4 - - ../../epan/dissectors/packet-mpeg-sect.h:26:9: error: '__PACKET_MPEG_SECT_H_' is - used as a header guard here, followed by #define of a different macro - [-Werror,-Wheader-guard] - #ifndef __PACKET_MPEG_SECT_H_ - ^~~~~~~~~~~~~~~~~~~~~ - ../../epan/dissectors/packet-mpeg-sect.h:27:9: note: '__PACKET_MPEG_SECT_H__' is - defined here; did you mean '__PACKET_MPEG_SECT_H_'? - #define __PACKET_MPEG_SECT_H__ - ^~~~~~~~~~~~~~~~~~~~~~ - __PACKET_MPEG_SECT_H_ - - svn path=/trunk/; revision=51283 - -commit 4398ffa -Author: Alexis La Goutte -Date: Sat Aug 10 21:31:59 2013 +0000 - - Fix (-W)header-guard error found by clang 3.4 - - ./packet-osi-options.h:26:9: error: '_PACKET_OSI_OPTION_H' is used as a header - guard here, followed by #define of a different macro - [-Werror,-Wheader-guard] - #ifndef _PACKET_OSI_OPTION_H - ^~~~~~~~~~~~~~~~~~~~ - ./packet-osi-options.h:27:9: note: '_PACKET_OSI_OPTIONS_H' is defined here; did - you mean '_PACKET_OSI_OPTION_H'? - #define _PACKET_OSI_OPTIONS_H - ^~~~~~~~~~~~~~~~~~~~~ - _PACKET_OSI_OPTION_H - - svn path=/trunk/; revision=51282 - -commit 178bc22 -Author: Alexis La Goutte -Date: Sat Aug 10 21:31:51 2013 +0000 - - Fix (-W)header-guard error found by clang 3.4 - - ./packet-bluetooth-hci.h:24:9: error: '__PACKET_BLUETOOTH_HCI_H__' is used as a - header guard here, followed by #define of a different macro - [-Werror,-Wheader-guard] - #ifndef __PACKET_BLUETOOTH_HCI_H__ - ^~~~~~~~~~~~~~~~~~~~~~~~~~ - ./packet-bluetooth-hci.h:25:9: note: '__PACKET_BLUETOOTH_HCI__H__' is defined - here; did you mean '__PACKET_BLUETOOTH_HCI_H__'? - #define __PACKET_BLUETOOTH_HCI__H__ - ^~~~~~~~~~~~~~~~~~~~~~~~~~~ - __PACKET_BLUETOOTH_HCI_H__ - - svn path=/trunk/; revision=51281 - -commit 9033f21 -Author: Alexis La Goutte -Date: Sat Aug 10 21:31:43 2013 +0000 - - Fix (-W)documentation error found by Clang - - rawshark.c:889:11: error: parameter 'fd' not found in the function declaration - [-Werror,-Wdocumentation] - * @param fd [IN] A POSIX file descriptor. Because that's _exactly_ the sort - ^~ - rawshark.c:889:11: note: did you mean 'pd'? - * @param fd [IN] A POSIX file descriptor. Because that's _exactly_ the sort - ^~ - pd - - svn path=/trunk/; revision=51280 - -commit 3ac11c0 -Author: Alexis La Goutte -Date: Sat Aug 10 21:31:35 2013 +0000 - - Fix (-W)documentation error found by Clang - - In file included from main_menubar.c:110: - ../../ui/gtk/proto_help.h:39:5: error: '@return' command used in a comment that - is attached to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - ../../ui/gtk/proto_help.h:47:5: error: '@return' command used in a comment that - is attached to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - - svn path=/trunk/; revision=51279 - -commit c67d8f4 -Author: Alexis La Goutte -Date: Sat Aug 10 21:31:27 2013 +0000 - - Fix (-W)documentation error found by Clang - - ../../epan/ftypes/../emem.h:34:3: error: empty paragraph passed to '@details' - command [-Werror,-Wdocumentation] - */ - ^ - - svn path=/trunk/; revision=51278 - -commit eb49ab7 -Author: Alexis La Goutte -Date: Sat Aug 10 21:31:19 2013 +0000 - - Fix (-W)documentation error found by Clang - - ../../ui/gtk/gui_stat_menu.h:47:11: error: parameter 'group' not found in the - function declaration [-Werror,-Wdocumentation] - * @param group the menu group this stat should be registered to - ^~~~~ - - svn path=/trunk/; revision=51277 - -commit 0724542 -Author: Alexis La Goutte -Date: Sat Aug 10 21:31:10 2013 +0000 - - Fix (-W)documentation error found by Clang - - ../../ui/gtk/filter_autocomplete.h:41:15: error: empty paragraph passed to - '@param' command [-Werror,-Wdocumentation] - * @param event - ~~~~~~~~~~~^ - ../../ui/gtk/filter_autocomplete.h:49:15: error: empty paragraph passed to - '@param' command [-Werror,-Wdocumentation] - * @param event - ~~~~~~~~~~~^ - - svn path=/trunk/; revision=51276 - -commit 1ec429a -Author: Alexis La Goutte -Date: Sat Aug 10 21:31:02 2013 +0000 - - Fix (-W)documentation error found by Clang - - ../ui/preference_utils.h:40:11: error: parameter 'pref:' not found in the - function declaration [-Werror,-Wdocumentation] - * @param pref: A preference. - ^~~~~ - ../ui/preference_utils.h:40:11: note: did you mean 'pref'? - * @param pref: A preference. - ^~~~~ - pref - ../ui/preference_utils.h:41:11: error: parameter 'unused:' not found in the - function declaration [-Werror,-Wdocumentation] - * @param unused: unused - ^~~~~~~ - ../ui/preference_utils.h:41:11: note: did you mean 'unused'? - * @param unused: unused - ^~~~~~~ - unused - ../ui/preference_utils.h:48:11: error: parameter 'pref:' not found in the - function declaration [-Werror,-Wdocumentation] - * @param pref: A preference. - ^~~~~ - ../ui/preference_utils.h:48:11: note: did you mean 'pref'? - * @param pref: A preference. - ^~~~~ - pref - ../ui/preference_utils.h:49:11: error: parameter 'changed_p:' not found in the - function declaration [-Werror,-Wdocumentation] - * @param changed_p: A pointer to a gboolean. Set to TRUE if the prefere... - ^~~~~~~~~~ - ../ui/preference_utils.h:49:11: note: did you mean 'changed_p'? - * @param changed_p: A pointer to a gboolean. Set to TRUE if the prefere... - ^~~~~~~~~~ - changed_p - ../ui/preference_utils.h:60:11: error: parameter 'unused:' not found in the - function declaration [-Werror,-Wdocumentation] - * @param unused: unused - ^~~~~~~ - ../ui/preference_utils.h:60:11: note: did you mean 'unused'? - * @param unused: unused - ^~~~~~~ - unused - - svn path=/trunk/; revision=51275 - -commit b2b32ef -Author: Alexis La Goutte -Date: Sat Aug 10 21:30:54 2013 +0000 - - Fix (-W)documentation error found by Clang - - ../ui/preference_utils.h:40:11: error: parameter 'pref:' not found in the - function declaration [-Werror,-Wdocumentation] - * @param pref: A preference. - ^~~~~ - ../ui/preference_utils.h:40:11: note: did you mean 'pref'? - * @param pref: A preference. - ^~~~~ - pref - ../ui/preference_utils.h:41:11: error: parameter 'unused:' not found in the - function declaration [-Werror,-Wdocumentation] - * @param unused: unused - ^~~~~~~ - ../ui/preference_utils.h:41:11: note: did you mean 'unused'? - * @param unused: unused - ^~~~~~~ - unused - ../ui/preference_utils.h:48:11: error: parameter 'pref:' not found in the - function declaration [-Werror,-Wdocumentation] - * @param pref: A preference. - ^~~~~ - ../ui/preference_utils.h:48:11: note: did you mean 'pref'? - * @param pref: A preference. - ^~~~~ - pref - ../ui/preference_utils.h:49:11: error: parameter 'changed_p:' not found in the - function declaration [-Werror,-Wdocumentation] - * @param changed_p: A pointer to a gboolean. Set to TRUE if the prefere... - ^~~~~~~~~~ - ../ui/preference_utils.h:49:11: note: did you mean 'changed_p'? - * @param changed_p: A pointer to a gboolean. Set to TRUE if the prefere... - ^~~~~~~~~~ - changed_p - ../ui/preference_utils.h:60:11: error: parameter 'unused:' not found in the - function declaration [-Werror,-Wdocumentation] - * @param unused: unused - ^~~~~~~ - ../ui/preference_utils.h:60:11: note: did you mean 'unused'? - * @param unused: unused - ^~~~~~~ - unused - - svn path=/trunk/; revision=51274 - -commit 8c15ddf -Author: Alexis La Goutte -Date: Sat Aug 10 21:30:46 2013 +0000 - - Fix (-W)documentation error found by Clang - - ./packet_list_utils.h:37:11: error: parameter 'col[IN]' not found in the - function declaration [-Werror,-Wdocumentation] - * @param col[IN] The column number. - ^~~~~~~ - ./packet_list_utils.h:38:11: error: parameter 'cf[IN]' not found in the function - declaration [-Werror,-Wdocumentation] - * @param cf[IN] The capture file containing the packet data. - ^~~~~~ - ./packet_list_utils.h:47:11: error: parameter 'col[IN]' not found in the - function declaration [-Werror,-Wdocumentation] - * @param col[IN] The column number. - ^~~~~~~ - ./packet_list_utils.h:48:11: error: parameter 'cf[IN]' not found in the function - declaration [-Werror,-Wdocumentation] - * @param cf[IN] The capture file containing the packet data. - ^~~~~~ - - svn path=/trunk/; revision=51273 - -commit 467ece4 -Author: Alexis La Goutte -Date: Sat Aug 10 21:30:38 2013 +0000 - - Fix (-W)documentation error found by Clang - - ../../asn1/c1222/packet-c1222-template.c:348:15: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param pinfo - ~~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:349:14: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param tree - ~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:350:16: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param length - ~~~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:351:16: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param offset - ~~~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:758:11: error: parameter 'keybuf' not - found in the function declaration [-Werror,-Wdocumentation] - * \param keybuf is updated with a copy of the key data if successful lookup. - ^~~~~~ - ../../asn1/c1222/packet-c1222-template.c:758:11: note: did you mean 'keybuff'? - * \param keybuf is updated with a copy of the key data if successful lookup. - ^~~~~~ - keybuff - ../../asn1/c1222/packet-c1222-template.c:879:13: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param tvb - ~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:880:16: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param offset - ~~~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:881:13: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param len - ~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:882:15: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param pinfo - ~~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:883:14: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param tree - ~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:1023:13: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param tvb - ~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:1024:15: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param pinfo - ~~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:1025:14: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param tree - ~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:1047:15: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param pinfo - ~~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:1048:13: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param tvb - ~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:1049:16: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param offset - ~~~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:1068:13: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param tvb - ~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:1069:15: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param pinfo - ~~~~~~~~~~~^ - ../../asn1/c1222/packet-c1222-template.c:1070:14: error: empty paragraph passed - to '\param' command [-Werror,-Wdocumentation] - * \param tree - ~~~~~~~~~~^ - - svn path=/trunk/; revision=51272 - -commit 5672a65 -Author: Alexis La Goutte -Date: Sat Aug 10 21:30:30 2013 +0000 - - Fix (-W)documentation error found by Clang - - packet-umts_fp.c:3486:12: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param tvb - ~~~~~~~~~^ - packet-umts_fp.c:3488:13: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param tree - ~~~~~~~~~~^ - packet-umts_fp.c:3489:15: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param offset - ~~~~~~~~~~~~^ - packet-umts_fp.c:3491:4: error: '@return' command used in a comment that is - attached to a function returning void [-Werror,-Wdocumentation] - * @return Void. - ~^~~~~~~~~~~~ - - svn path=/trunk/; revision=51271 - -commit 5741c8c -Author: Alexis La Goutte -Date: Sat Aug 10 21:30:18 2013 +0000 - - Fix (-W)documentation error found by Clang - - packet-ucp.c:781:5: error: '\return' command used in a comment that is attached - to a function returning void [-Werror,-Wdocumentation] - * \return For 'int'-types, the value of the field. - ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - packet-ucp.c:954:17: error: parameter 'field' not found in the function - declaration [-Werror,-Wdocumentation] - * \param field The actual field, whose value needs displaying - ^~~~~ - - svn path=/trunk/; revision=51270 - -commit 7bee346 -Author: Alexis La Goutte -Date: Sat Aug 10 21:30:08 2013 +0000 - - Fix (-W)documentation error found by Clang - - packet-knet.c:466:5: error: '@return' command used in a comment that is attached - to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-knet.c:518:5: error: '@return' command used in a comment that is attached - to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-knet.c:677:5: error: '@return' command used in a comment that is attached - to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-knet.c:697:5: error: '@return' command used in a comment that is attached - to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-knet.c:717:5: error: '@return' command used in a comment that is attached - to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-knet.c:731:5: error: '@return' command used in a comment that is attached - to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - - svn path=/trunk/; revision=51269 - -commit f1c0e51 -Author: Alexis La Goutte -Date: Sat Aug 10 21:29:59 2013 +0000 - - Fix (-W)documentation error found by Clang - - packet-jxta.c:1668:13: error: parameter 'names' not found in the function - declaration [-Werror,-Wdocumentation] - * @param names The table of names. - ^~~~~ - packet-jxta.c:1668:13: note: did you mean 'names_table'? - * @param names The table of names. - ^~~~~ - names_table - - svn path=/trunk/; revision=51268 - -commit 3c0c2e2 -Author: Alexis La Goutte -Date: Sat Aug 10 21:29:51 2013 +0000 - - Fix (-W)documentation error found by Clang - - ./packet-gsm_rlcmac.h:1086:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< MS Radio Access capability IE > - ^~~ - /**< - ./packet-gsm_rlcmac.h:1089:26: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - typedef guint8 A5_bits_t;/* ::= < A5/1 : bit> */ - ^~~ - /**< - packet-gsm_rlcmac.c:171:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Starting Frame Number Description IE >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:174:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Ack/Nack Description IE >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:178:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Packet Timing Advance IE >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:183:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Power Control Parameters IE >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:191:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Global Power Control Parameters IE >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:195:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Global Packet Timing Advance IE >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:197:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Channel Quality Report struct >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:210:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< EGPRS Ack/Nack Description >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:216:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /**/ - ^~~~~ - /**< - packet-gsm_rlcmac.c:218:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /**/ - ^~~~~ - /**< - packet-gsm_rlcmac.c:264:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< SI 13 Rest Octets >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:288:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Packet TBF Release message content >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:293:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Packet Control Acknowledgement message content >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:299:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Packet Downlink Dummy Control Block message content >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:301:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< Packet Uplink Dummy Control Block message content >*/ - ^~~ - /**< - packet-gsm_rlcmac.c:305:1: error: not a Doxygen trailing comment - [-Werror,-Wdocumentation] - /*< MS Radio Access capability IE >*/ - ^~~ - /**< - - svn path=/trunk/; revision=51267 - -commit 4408571 -Author: Alexis La Goutte -Date: Sat Aug 10 21:29:42 2013 +0000 - - Fix (-W)documentation error found by Clang - - packet-eigrp.c:633:10: error: unrecognized parameter passing direction, valid - directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation] - * @param[in|out] tree detail dissection result - ^~~~~~~~ - packet-eigrp.c:638:5: error: '@return' command used in a comment that is - attached to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-eigrp.c:691:10: error: unrecognized parameter passing direction, valid - directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation] - * @param[in|out] tree detail dissection result - ^~~~~~~~ - packet-eigrp.c:696:5: error: '@return' command used in a comment that is - attached to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-eigrp.c:765:10: error: unrecognized parameter passing direction, valid - directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation] - * @param[in|out] tree detail dissection result - ^~~~~~~~ - packet-eigrp.c:769:5: error: '@return' command used in a comment that is - attached to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-eigrp.c:814:10: error: unrecognized parameter passing direction, valid - directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation] - * @param[in|out] tree detail dissection result - ^~~~~~~~ - packet-eigrp.c:818:5: error: '@return' command used in a comment that is - attached to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-eigrp.c:853:10: error: unrecognized parameter passing direction, valid - directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation] - * @param[in|out] tree detail dissection result - ^~~~~~~~ - packet-eigrp.c:857:5: error: '@return' command used in a comment that is - attached to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-eigrp.c:878:10: error: unrecognized parameter passing direction, valid - directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation] - * @param[in|out] tree detail dissection result - ^~~~~~~~ - packet-eigrp.c:882:19: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param[out] None - ~~~~~~~~~~~~~~~^ - packet-eigrp.c:884:5: error: '@return' command used in a comment that is - attached to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-eigrp.c:880:15: error: parameter 'pinfo' not found in the function - declaration [-Werror,-Wdocumentation] - * @param[in] pinfo general data about the protocol - ^~~~~ - packet-eigrp.c:881:15: error: parameter 'ti' not found in the function - declaration [-Werror,-Wdocumentation] - * @param[in] ti protocol item - ^~ - packet-eigrp.c:882:16: error: parameter 'None' not found in the function - declaration [-Werror,-Wdocumentation] - * @param[out] None - ^~~~ - packet-eigrp.c:902:19: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param[out] None - ~~~~~~~~~~~~~~~^ - packet-eigrp.c:904:5: error: '@return' command used in a comment that is - attached to a function returning void [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ - packet-eigrp.c:902:16: error: parameter 'None' not found in the function - declaration [-Werror,-Wdocumentation] - * @param[out] None - ^~~~ - packet-eigrp.c:1712:15: error: parameter 'pinfo' not found in the function - declaration [-Werror,-Wdocumentation] - * @param[in] pinfo general data about the protocol - ^~~~~ - packet-eigrp.c:1712:15: note: did you mean 'ti'? - * @param[in] pinfo general data about the protocol - ^~~~~ - ti - packet-eigrp.c:2585:18: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param[in] void - ~~~~~~~~~~~~~~^ - packet-eigrp.c:2585:15: error: parameter 'void' not found in the function - declaration [-Werror,-Wdocumentation] - * @param[in] void - ^~~~ - packet-eigrp.c:3324:18: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param[in] void - ~~~~~~~~~~~~~~^ - packet-eigrp.c:3324:15: error: parameter 'void' not found in the function - declaration [-Werror,-Wdocumentation] - * @param[in] void - ^~~~ - - svn path=/trunk/; revision=51266 - -commit 32e5c9f -Author: Alexis La Goutte -Date: Sat Aug 10 21:29:33 2013 +0000 - - Fix (-W)documentation error found by Clang - - ./packet-ssl-utils.h:463:16: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - @param comp_str - ~~~~~~~~~~~~~~^ - - svn path=/trunk/; revision=51265 - -commit 9381244 -Author: Alexis La Goutte -Date: Sat Aug 10 21:29:24 2013 +0000 - - Fix (-W)documentation error found by Clang - - ./packet-mstp.h:31:13: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param val - ~~~~~~~~~^ - ./packet-mstp.h:41:13: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param tvb - ~~~~~~~~~^ - ./packet-mstp.h:42:15: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param pinfo - ~~~~~~~~~~~^ - ./packet-mstp.h:43:14: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param tree - ~~~~~~~~~~^ - ./packet-mstp.h:44:17: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param subtree - ~~~~~~~~~~~~~^ - ./packet-mstp.h:45:16: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param offset - ~~~~~~~~~~~~^ - ./packet-mstp.h:46:5: error: '@return' command used in a comment that is - attached to a function returning void [-Werror,-Wdocumentation] - * @return none - ~^~~~~~~~~~~ - - svn path=/trunk/; revision=51264 - -commit 33b09b4 -Author: Alexis La Goutte -Date: Sat Aug 10 21:29:16 2013 +0000 - - Fix (-W)documentation error found by Clang - - ./packet-cell_broadcast.h:33:13: error: empty paragraph passed to '@param' - command [-Werror,-Wdocumentation] - * @param tvb - ~~~~~~~~~^ - ./packet-cell_broadcast.h:34:14: error: empty paragraph passed to '@param' - command [-Werror,-Wdocumentation] - * @param tree - ~~~~~~~~~~^ - ./packet-cell_broadcast.h:35:16: error: empty paragraph passed to '@param' - command [-Werror,-Wdocumentation] - * @param offset - ~~~~~~~~~~~~^ - ./packet-cell_broadcast.h:43:13: error: empty paragraph passed to '@param' - command [-Werror,-Wdocumentation] - * @param tvb - ~~~~~~~~~^ - ./packet-cell_broadcast.h:44:14: error: empty paragraph passed to '@param' - command [-Werror,-Wdocumentation] - * @param tree - ~~~~~~~~~~^ - ./packet-cell_broadcast.h:45:16: error: empty paragraph passed to '@param' - command [-Werror,-Wdocumentation] - * @param offset - ~~~~~~~~~~~~^ - ./packet-cell_broadcast.h:53:13: error: empty paragraph passed to '@param' - command [-Werror,-Wdocumentation] - * @param tvb - ~~~~~~~~~^ - ./packet-cell_broadcast.h:54:15: error: empty paragraph passed to '@param' - command [-Werror,-Wdocumentation] - * @param pinfo - ~~~~~~~~~~~^ - ./packet-cell_broadcast.h:55:14: error: empty paragraph passed to '@param' - command [-Werror,-Wdocumentation] - * @param tree - ~~~~~~~~~~^ - - svn path=/trunk/; revision=51263 - -commit aaf75af -Author: Alexis La Goutte -Date: Sat Aug 10 21:29:08 2013 +0000 - - Fix (-W)documentation error found by Clang - - ../../epan/xdlc.h:48:29: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - #define XDLC_N_R_MASK 0xE0 /*< basic */ - ^~~ - /**< - ../../epan/xdlc.h:50:34: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - #define XDLC_N_R_EXT_MASK 0xFE00 /*< extended */ - ^~~ - /**< - ../../epan/xdlc.h:52:29: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - #define XDLC_N_S_MASK 0x0E /*< basic */ - ^~~ - /**< - ../../epan/xdlc.h:54:34: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - #define XDLC_N_S_EXT_MASK 0x00FE /*< extended */ - ^~~ - /**< - ../../epan/xdlc.h:60:24: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - #define XDLC_P_F 0x10 /*< basic */ - ^~~ - /**< - ../../epan/xdlc.h:61:29: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - #define XDLC_P_F_EXT 0x0100 /*< extended */ - ^~~ - /**< - - svn path=/trunk/; revision=51262 + (cherry picked from commit 2eced3689d809e6a80a4d00a6bebd8b481e5ebc9) + Reviewed-on: https://code.wireshark.org/review/3921 + Reviewed-by: Pascal Quantin -commit 4c81d15 -Author: Alexis La Goutte -Date: Sat Aug 10 21:28:59 2013 +0000 +commit 933f635 +Author: Pascal Quantin +Date: Fri Aug 29 13:37:16 2014 +0200 - Fix (-W)documentation error found by Clang + 802.11: rename Control Frame Extension field to match the spec - packet-bacapp.c:78:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param tvb - ~~~~~~~~~^ - packet-bacapp.c:79:15: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param pinfo - ~~~~~~~~~~~^ - packet-bacapp.c:80:14: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param tree - ~~~~~~~~~~^ - packet-bacapp.c:100:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param tvb - ~~~~~~~~~^ - packet-bacapp.c:101:15: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param pinfo - ~~~~~~~~~~~^ - packet-bacapp.c:102:14: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param tree - ~~~~~~~~~~^ - packet-bacapp.c:103:16: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param offset - ~~~~~~~~~~~~^ - packet-bacapp.c:110:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param tvb - ~~~~~~~~~^ - packet-bacapp.c:111:15: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param pinfo - ~~~~~~~~~~~^ - packet-bacapp.c:112:14: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param tree - ~~~~~~~~~~^ - packet-bacapp.c:113:16: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param offset - ~~~~~~~~~~~~^ - packet-bacapp.c:130:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param tvb - ~~~~~~~~~^ - packet-bacapp.c:131:15: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param pinfo - ~~~~~~~~~~~^ - packet-bacapp.c:132:14: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param tree - ~~~~~~~~~~^ - packet-bacapp.c:133:16: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param offset - ~~~~~~~~~~~~^ - packet-bacapp.c:146:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param tvb - ~~~~~~~~~^ - packet-bacapp.c:147:15: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param pinfo - ~~~~~~~~~~~^ - packet-bacapp.c:148:14: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param tree - ~~~~~~~~~~^ - packet-bacapp.c:149:16: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param offset - ~~~~~~~~~~~~^ - - packet-bacapp.c:251:15: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param label - ~~~~~~~~~~~^ - packet-bacapp.c:263:15: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param label - ~~~~~~~~~~~^ - packet-bacapp.c:275:15: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param label - ~~~~~~~~~~~^ - packet-bacapp.c:288:15: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param label - ~~~~~~~~~~~^ - packet-bacapp.c:300:15: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param label - ~~~~~~~~~~~^ - packet-bacapp.c:325:24: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param service_choice - ~~~~~~~~~~~~~~~~~~~~^ - packet-bacapp.c:338:24: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param service_choice - ~~~~~~~~~~~~~~~~~~~~^ - packet-bacapp.c:521:15: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param label - ~~~~~~~~~~~^ - packet-bacapp.c:522:13: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param src - ~~~~~~~~~^ - packet-bacapp.c:521:11: error: parameter 'label' not found in the function - declaration [-Werror,-Wdocumentation] - * @param label - ^~~~~ - packet-bacapp.c:522:11: error: parameter 'src' not found in the function - declaration [-Werror,-Wdocumentation] - * @param src - ^~~ - packet-bacapp.c:654:11: error: parameter 'tree' not found in the function - declaration [-Werror,-Wdocumentation] - * @param tree the tree to append this item to - ^~~~ - packet-bacapp.c:654:11: note: did you mean 'subtree'? - * @param tree the tree to append this item to - ^~~~ - subtree - packet-bacapp.c:723:11: error: parameter 'tree' not found in the function - declaration [-Werror,-Wdocumentation] - * @param tree the tree to append this item to - ^~~~ - packet-bacapp.c:723:11: note: did you mean 'subtree'? - * @param tree the tree to append this item to - ^~~~ - subtree - packet-bacapp.c:749:11: error: parameter 'tree' not found in the function - declaration [-Werror,-Wdocumentation] - * @param tree the tree to append this item to - ^~~~ - packet-bacapp.c:749:11: note: did you mean 'subtree'? - * @param tree the tree to append this item to - ^~~~ - subtree - packet-bacapp.c:1076:24: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param service_choice - ~~~~~~~~~~~~~~~~~~~~^ - packet-bacapp.c:1266:17: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param service - ~~~~~~~~~~~~~^ - packet-bacapp.c:1337:4: error: unknown command tag name 'pram'; did you mean - 'param'? [-Werror,-Wdocumentation] - * @pram pinfo - ^~~~~ - param - packet-bacapp.c:1337:14: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @pram pinfo - ~~~~^ - packet-bacapp.c:1366:15: error: empty paragraph passed to '@param' command - [-Werror,-Wdocumentation] - * @param label - ~~~~~~~~~~~^ + As reported by Richard Sharpe on -dev: https://www.wireshark.org/lists/wireshark-dev/201408/msg00236.html - svn path=/trunk/; revision=51261 + Change-Id: I16638982e14e566bb7e584a2d030c546d2223ebe + Reviewed-on: https://code.wireshark.org/review/3916 + Reviewed-by: Alexis La Goutte + (cherry picked from commit 47f96d974caf6670926f572bd724be5973d8bb3b) + Reviewed-on: https://code.wireshark.org/review/3917 + Reviewed-by: Evan Huus -commit c28b726 -Author: Alexis La Goutte -Date: Sat Aug 10 21:28:50 2013 +0000 +commit 4872e8a +Author: Pascal Quantin +Date: Wed Aug 27 23:57:19 2014 +0200 - Fix (-W)documentation error found by Clang + NTP: fix parsing of control assignments with empty value - packet-9p.c:342:16: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - guint16 len; /*< Length of the string */ - ^~~ - /**< - packet-9p.c:343:13: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - char *str; /*< The string */ - ^~~ - /**< - packet-9p.c:364:15: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - guint8 type; /*< Type */ - ^~~ - /**< - packet-9p.c:365:19: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - guint32 version; /*< Monotonically incrementing version number */ - ^~~ - /**< - packet-9p.c:366:16: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] - guint64 path; /*< Per-server-unique ID for a file system element */ - ^~~ - /**< - 5 errors generated + Consider that ',' is a separator between assignments and make value presence optional - svn path=/trunk/; revision=51260 + Bug: 10417 + Change-Id: I23f2b4029548a1263d65ee11c6356270e7a89bd7 + Reviewed-on: https://code.wireshark.org/review/3884 + Reviewed-by: Evan Huus + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + (cherry picked from commit edcd2dd57f1649dbb25f1ad0f4a3a77c4d454322) + Reviewed-on: https://code.wireshark.org/review/3889 + Reviewed-by: Pascal Quantin -commit d26b7fc -Author: Alexis La Goutte -Date: Sat Aug 10 21:28:42 2013 +0000 +commit fa483e6 +Author: Gerald Combs +Date: Wed Aug 27 13:55:12 2014 -0700 - Fix (-W)documentation error found by Clang + Increase the error buffer size for rpcap. - ../../epan/wmem/wmem_user_cb.h:52:11: error: parameter 'allocator' not found in the function declaration - [-Werror,-Wdocumentation] - * @param allocator The allocator that triggered this callback. - ^~~~~~~~~ - ../../epan/wmem/wmem_user_cb.h:53:11: error: parameter 'event' not found in the function declaration - [-Werror,-Wdocumentation] - * @param event The event type that triggered this callback. - ^~~~~ - ../../epan/wmem/wmem_user_cb.h:54:11: error: parameter 'user_data' not found in the function declaration - [-Werror,-Wdocumentation] - * @param user_data Whatever user_data was originally passed to the call to - ^~~~~~~~~ - ../../epan/wmem/wmem_user_cb.h:63:11: error: parameter 'recurring' not found in the function declaration - [-Werror,-Wdocumentation] - * @param recurring If this is FALSE then the callback is called exactly once. - ^~~~~~~~~ - 4 errors generated. + If the rpcap port is unreachable pcap_findalldevs_ex can write more + than PCAP_ERRBUF_SIZE bytes to errbuf. E.g. if we try to capture from + Google's all-eights public DNS server we get: - svn path=/trunk/; revision=51259 - -commit 6b2498b -Author: Alexis La Goutte -Date: Sat Aug 10 21:28:33 2013 +0000 - - Fix (-W)documentation error found by Clang + ---- + Can't get list of interfaces: Is the server properly installed on 8.8.8.8? + connect() failed: A connection attempt failed because the connected + party did not properly respond after a period of time, or established + connection failed because connected host has failed to respond. (code 1 + ---- - ../../epan/expert.h:176:9: warning: parameter 'pi' not found in the function declaration [-Wdocumentation] - @param pi Current protocol item (or NULL) - ^~ - ../../epan/expert.h:176:9: note: did you mean 'tree'? - @param pi Current protocol item (or NULL) - ^~ - tree - ../../epan/expert.h:195:9: warning: parameter 'pi' not found in the function declaration [-Wdocumentation] - @param pi Current protocol item (or NULL) - ^~ - 2 warnings generated. + Set the buffer to PCAP_ERRBUF_SIZE*4 bytes. Hopefully that's large enough. - svn path=/trunk/; revision=51258 + Change-Id: I19f34cda16050c1ba8b9d7d6ed2d8e77b945a2af + Ping-Bug: 3554 + Ping-Bug: 6922 + Ping-Bug: 7021 + Reviewed-on: https://code.wireshark.org/review/3880 + Petri-Dish: Gerald Combs + Reviewed-by: Evan Huus + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + (cherry picked from commit 5ee328e90b26f82fbd00316110c5edd9a5c852e6) + Reviewed-on: https://code.wireshark.org/review/3886 -commit a7c7742 -Author: Alexis La Goutte -Date: Sat Aug 10 21:28:25 2013 +0000 +commit dfc005a +Author: Peter Wu +Date: Wed Jul 30 13:13:10 2014 +0200 - Fix (-W)documentation error found by Clang + Hack to fix RTP player progress line position - ../../epan/uat.h:245:23: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - * @param num_items_ptr - ~~~~~~~~~~~~~~~~~~~^ - 1 error generated. + PortAudio seems to return 0 as value for Pa_GetStreamTime() on + a PulseAudio system using the ALSA host API. This is known for 3 years, + but still has not been fixed. As this function basically gives us a + monotonically increasing clock in seconds as double, just use the Glib + library function for that. I don't know whether this adds much latency, + but it is certainly better than breaking the progress line (and also + the related auto-scroll). - svn path=/trunk/; revision=51257 - -commit 9f24c44 -Author: Alexis La Goutte -Date: Sat Aug 10 21:28:17 2013 +0000 - - Fix (-W)documentation error found by Clang + While at it, split the idx calculation and explain what each part does + and add modelines. Remove invalid _U_ annotations. - ../../epan/range.h:87:11: error: empty paragraph passed to '@return' command [-Werror,-Wdocumentation] - * @return - ~~~~~~~^ - ../../epan/range.h:86:11: error: parameter 'max_value'' not found in the function declaration [-Werror,-Wdocumentation] - * @param max_value' specifies the maximum value in a range. - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ../../epan/range.h:86:11: note: did you mean 'max_value'? - * @param max_value' specifies the maximum value in a range. - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - max_value + [1]: http://music.columbia.edu/pipermail/portaudio/2011-June/012452.html - svn path=/trunk/; revision=51256 + Bug: 10307 + Change-Id: I67fff531e0577add4b9b76052e286fb3fd5d01ff + Reviewed-on: https://code.wireshark.org/review/3260 + Petri-Dish: Evan Huus + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus + (cherry picked from commit a68eab6ab57e2ba3dff5f49a90cdf9bd81a45f0a) + Reviewed-on: https://code.wireshark.org/review/3815 -commit c47aad7 -Author: Alexis La Goutte -Date: Sat Aug 10 21:28:10 2013 +0000 +commit 74d8c02 +Author: Bill Meier +Date: Mon Aug 25 22:39:59 2014 -0400 - Fix (-W)documentation error found by Clang + packet-mausb.c: proto-reg-handoff() fixes - In file included from ../../epan/packet.h:29: - ./../proto.h:1775:16: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - @param protocol - ~~~~~~~~~~~~~~^ - ./../proto.h:1947:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] - @param flags - ~~~~~~~~~~~^ + - proto_reg_handoff...(): + Fix handling of tcp port pref change; + Rename 'gPORT_PREF' to 'mausb_tcp_port_pref'; + Do 'dissector_add_uint("llc.mausb_pid",..)' only once; - svn path=/trunk/; revision=51255 + Change-Id: Ic4498560f61d0ce95f8109c3a1bb3c407221269b + Reviewed-on: https://code.wireshark.org/review/3854 + Reviewed-by: Bill Meier + (cherry picked from commit f4b135c147497f168bafa77910fb819166e8dd81) + Reviewed-on: https://code.wireshark.org/review/3878 -commit 2c3468d +commit 57c2e5a Author: Alexis La Goutte -Date: Sat Aug 10 21:28:01 2013 +0000 +Date: Tue Aug 26 21:36:53 2014 +0200 - Fix (-W)documentation error found by Clang + CAPWAP : Fix wrong offset for AC Name with Priority - airpdcap.c:131:11: error: parameter 'password' not found in the function declaration [-Werror,-Wdocumentation] - * @param password [IN] pointer to a password (sequence of between 8 and - ^~~~~~~~ - airpdcap.c:154:11: error: parameter 'password' not found in the function declaration [-Werror,-Wdocumentation] - * @param password [IN] pointer to a password (sequence of between 8 and - ^~~~~~~~ + Thanks to Massimo Velluci for sample - svn path=/trunk/; revision=51254 + Change-Id: Ibab2658c2c11c9940d3fdebb0bdc42752d57e1ae + Reviewed-on: https://code.wireshark.org/review/3871 + Reviewed-by: Alexis La Goutte + (cherry picked from commit 2263b73ae59f8e9d9abf76d84194437f14fce33a) + Reviewed-on: https://code.wireshark.org/review/3872 -commit 7b44319 -Author: Alexis La Goutte -Date: Sat Aug 10 21:27:52 2013 +0000 +commit c51605b +Author: Matthieu Texier +Date: Mon Aug 25 15:22:07 2014 +0200 - Fix (-W)documentation error found by Clang + BGP: issue with BGP AS path heuristic (AS_CONFED_SET) - ../../epan/emem.h:560:5: error: '@return' command used in a comment that is attached to a function returning void - [-Werror,-Wdocumentation] - * @return void - ~^~~~~~~~~~~ + Add also a expert info when unable determine ASN length (2 or 4 bytes) - svn path=/trunk/; revision=51253 + Bug: 10399 + Change-Id: I24978e29e24f38c2e01e4b953a5a51496f0cf5a6 + Reviewed-on: https://code.wireshark.org/review/3831 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + (cherry picked from commit d127b573116f04352e811591644e15b69f0f7a62) + Reviewed-on: https://code.wireshark.org/review/3839 -commit ef56cd2 -Author: Alexis La Goutte -Date: Sat Aug 10 21:27:42 2013 +0000 +commit 25dcfb9 +Author: Bill Meier +Date: Mon Aug 25 10:39:51 2014 -0400 - Fix (-W)documentation error found by Clang + packet-a21.c: Fix a bug; - ./str_util.h:72:11: error: parameter 'str' not found in the function declaration [-Werror,-Wdocumentation] - * @param str The string to be checked - ^~~ - ./str_util.h:72:11: note: did you mean 'string'? - * @param str The string to be checked - ^~~ - string - ./str_util.h:80:11: error: parameter 'str' not found in the function declaration [-Werror,-Wdocumentation] - * @param str The string to be checked - ^~~ - ./str_util.h:80:11: note: did you mean 'string'? - * @param str The string to be checked - ^~~ - string + - expert_...() and external dissectors shouldn't be called under 'if (tree)'; - svn path=/trunk/; revision=51252 + Change-Id: I11dc61d11be6179a22d63a72847e7c76a9ff7a5a + Reviewed-on: https://code.wireshark.org/review/3835 + Reviewed-by: Bill Meier -commit 1ef2d9f +commit 505837f Author: Alexis La Goutte -Date: Sat Aug 10 21:27:34 2013 +0000 +Date: Mon Aug 25 16:02:07 2014 +0200 - Fix (-W)documentation error found by Clang + RPKI RTR: Wrong decoding of RPKI RTR End of Data PDU - ../wsutil/crc16.h:68:11: error: parameter 'pBuffer' not found in the function declaration [-Werror,-Wdocumentation] - * @param pBuffer a pointer to a buffer of the given length - ^~~~~~~ - ../wsutil/crc16.h:68:11: note: did you mean 'buf'? - * @param pBuffer a pointer to a buffer of the given length - ^~~~~~~ - buf - ../wsutil/crc16.h:77:11: error: parameter 'pBuffer' not found in the function declaration [-Werror,-Wdocumentation] - * @param pBuffer a pointer to a buffer of the given length - ^~~~~~~ - ../wsutil/crc16.h:77:11: note: did you mean 'buf'? - * @param pBuffer a pointer to a buffer of the given length - ^~~~~~~ - buf + The decoding of the End of Data PDU ignores the Serial Number, i.e., the last 32 bit of this PDU. Instead of that the current dissector implementation starts to decode a new RTR PDU. - svn path=/trunk/; revision=51251 - -commit a1abe15 -Author: Alexis La Goutte -Date: Sat Aug 10 21:27:26 2013 +0000 - - Fix error when build with clang 3.0 + Details of packet format see http://tools.ietf.org/html/rfc6810#section-5.8 - dumpcap.c:3981:88: error: implicit conversion loses integer precision: 'const __suseconds_t' - (aka 'const long') to 'guint32' (aka 'unsigned int') [-Werror,-Wshorten-64-to-32] - phdr->ts.tv_sec, phdr->ts.tv_usec, - ~~~~~~~~~^~~~~~~ - dumpcap.c:3989:73: error: implicit conversion loses integer precision: 'const __suseconds_t' - (aka 'const long') to 'guint32' (aka 'unsigned int') [-Werror,-Wshorten-64-to-32] - phdr->ts.tv_sec, phdr->ts.tv_usec, - ~~~~~~~~~^~~~~~~ + Found by Matthias Wählisch - svn path=/trunk/; revision=51250 + Bug: 10411 + Change-Id: I8451b5fbda18a034022b97ff442ddb2a2dabed7b + Reviewed-on: https://code.wireshark.org/review/3832 + Reviewed-by: Alexis La Goutte + (cherry picked from commit f44e082fa8403023425e27b28cb295f4e40e34e6) + Reviewed-on: https://code.wireshark.org/review/3833 -commit 36f3b77 -Author: Alexis La Goutte -Date: Sat Aug 10 21:27:17 2013 +0000 +commit 7beb44d +Author: Gerald Combs +Date: Sun Aug 24 08:09:01 2014 -0700 - Fix error when build with clang 3.0 + [Automatic manuf, services and enterprise-numbers update for 2014-08-24] - wiretap/lanalyzer.c:643:24: error: implicit conversion loses integer precision: 'const __suseconds_t' - (aka 'const long') to 'gint32' (aka 'int') [-Werror,-Wshorten-64-to-32] - gint32 usec = a->tv_usec; - ~~~~ ~~~^~~~~~~ - - svn path=/trunk/; revision=51249 + Change-Id: I13eff7b6d9b7f3db0a531b65b20a3f4b3626a8c8 + Reviewed-on: https://code.wireshark.org/review/3812 + Reviewed-by: Gerald Combs -commit 1abc2eb -Author: Martin Mathieson -Date: Sat Aug 10 20:57:46 2013 +0000 +commit febba25 +Author: Jeff Morriss +Date: Wed Aug 20 11:14:38 2014 -0400 - IxVeriwave 11ac patch (bug 8912) from Tom Cook. + If the user explicitly requested gnutls or libgcrypt generate an error if they + are not found. - This was the 4th patch, but also: - - use gmalloc0() to allocate vwr struct. Otherwise, valgrind says that - many of fields were still uninitialised when parse_s1_W_stats later - read them - - whitespace tidyup, got rid of remaining tabs and trailing whitespace + Accurately describe the default behavior: Wireshark will use the libraries if + they are available. - Did a fair bit of fuzz-testing without seeing any problems. + May help avoid problems like that described in: + https://ask.wireshark.org/questions/35600/not-able-to-configure-wireshark-with-gnutls - svn path=/trunk/; revision=51248 + Change-Id: I5f0b2ce87cb7c6b337de93609f13d8027e662263 + Reviewed-on: https://code.wireshark.org/review/3750 + Reviewed-by: Jeff Morriss + (cherry picked from commit 61b01c37a9f9839a2ad004796e26d74eb8fdc0d1) + Reviewed-on: https://code.wireshark.org/review/3771 -commit c6669a3 -Author: Jakub Zawadzki -Date: Sat Aug 10 17:49:28 2013 +0000 +commit a05a2d9 +Author: Guy Harris +Date: Tue Aug 19 00:16:04 2014 -0700 - dfilter: report warning if OR and AND logic operands are mixed without parentheses. + The error report timer is non-negative; make it FT_UINT16. - svn path=/trunk/; revision=51247 - -commit 237182b -Author: Martin Mathieson -Date: Sat Aug 10 17:09:12 2013 +0000 - - Use proper macros to cast between uint and pointer + This squelches an assertion. - svn path=/trunk/; revision=51246 - -commit 11304a3 -Author: Martin Mathieson -Date: Sat Aug 10 16:53:05 2013 +0000 - - Try again... + Use %u to print it, while we're at it. - svn path=/trunk/; revision=51245 + Change-Id: I79d06c5448a159e3e04930db776a9063c1004c03 + Reviewed-on: https://code.wireshark.org/review/3712 + Reviewed-by: Guy Harris -commit 8cddb7a -Author: Martin Mathieson -Date: Sat Aug 10 16:34:19 2013 +0000 +commit 682cae1 +Author: Guy Harris +Date: Mon Aug 18 12:08:53 2014 -0700 - Try using guint. + Don't use proto_tree_add_expert() with an item rather than a tree. - svn path=/trunk/; revision=51244 - -commit 0fb73ab -Author: Martin Mathieson -Date: Sat Aug 10 16:17:33 2013 +0000 - - Add a malformed check to show if GroupA has more RAPIDs than A & B - combined. + proto_tree_add_expert() is to be used only on an item that's been + created as a tree (i.e., an interior node, complete with an ett_ value); + to hang expert info off of an *item*, which might *not* have been set up + to take subtree items, use expert_add_info(). - svn path=/trunk/; revision=51243 + Change-Id: Icdcdf39c31c0a03ff80dbb629186e8f6fa82e8ab + Reviewed-on: https://code.wireshark.org/review/3705 + Reviewed-by: Guy Harris + (cherry picked from commit a3cecb290938f56787c0e08b30fc34749bb4baec) + Reviewed-on: https://code.wireshark.org/review/3706 -commit 1ea4e88 -Author: Martin Kaiser -Date: Sat Aug 10 12:37:47 2013 +0000 +commit f0e8636 +Author: Guy Harris +Date: Sun Aug 17 17:32:16 2014 -0700 - coverity 1058716 - set but not used variable + If we don't find a NetScaler signature, don't report an error. - svn path=/trunk/; revision=51242 - -commit 48485e2 -Author: Martin Kaiser -Date: Sat Aug 10 12:16:00 2013 +0000 - - dissect the URL in the transport protocol descriptor + It's *NOT* an error; it's just a file that isn't a NetScaler file. + Otherwise, we report errors on files that should just be passed on to + other open routines. + + Also, NetScaler files are *NOT* text files, and we should *NOT* use + ".txt" as the suffix. - svn path=/trunk/; revision=51241 + Change-Id: If001abbbbc3de3ea27439a44a47ce1d6071d38ae + Reviewed-on: https://code.wireshark.org/review/3678 + Reviewed-by: Guy Harris + (cherry picked from commit b8293f95ad18bc1cc00363627471c880d0f4e5a2) + Reviewed-on: https://code.wireshark.org/review/3679 -commit 5364626 +commit 968858c Author: Gerald Combs -Date: Fri Aug 9 22:47:35 2013 +0000 +Date: Sun Aug 17 08:09:03 2014 -0700 - Fix error handling. + [Automatic manuf, services and enterprise-numbers update for 2014-08-17] - svn path=/trunk/; revision=51240 + Change-Id: I748b8ab2e2935e1a08ccd5b7fb17477975b9377a + Reviewed-on: https://code.wireshark.org/review/3672 + Reviewed-by: Gerald Combs -commit c4befc8 +commit 949cca0 Author: Evan Huus -Date: Fri Aug 9 15:37:07 2013 +0000 +Date: Sat Aug 16 13:58:26 2014 -0400 - Decode Kafka metadata requests and responses. + rtsp: parse the correct token for the status code - svn path=/trunk/; revision=51239 - -commit 41f444e -Author: Chris Maynard -Date: Fri Aug 9 15:26:48 2013 +0000 - - Move the description of the -Y option to maintain a proper sort. + Don't call get_token_len on next_token *and* pass in next_token to store the + subsequent pointer - the token we want to parse is the *current* value of + next_token, not the next next token (which may be beyond the end of the buffer, + if next_token happens to be the *last* token). - svn path=/trunk/; revision=51238 + Bug: 10381 + Change-Id: I9fb27e8bdaf2f9556f61841de30cec04b98ffb96 + Reviewed-on: https://code.wireshark.org/review/3663 + Reviewed-by: Evan Huus + (cherry picked from commit 73959159dbf34b4a0b50fbd19e05cb1b470be9b0) + Reviewed-on: https://code.wireshark.org/review/3664 -commit 9aa40bf -Author: Chris Maynard -Date: Fri Aug 9 15:08:48 2013 +0000 +commit 6c73bc5 +Author: Jeff Morriss +Date: Thu Aug 14 14:02:04 2014 -0400 - Replace tabs with spaces. Add modelines. + Don't let the user enable echld and tfshark (which are works in progress) in + this branch. - svn path=/trunk/; revision=51237 - -commit 249285a -Author: Cal Turney -Date: Fri Aug 9 14:53:35 2013 +0000 - - Patch for bug 9014. If the relative time is negative, it is set to that of the previous packet. Since the packet is not discarded, its metadata is included in the stats. + Cherry-picked from change 3596 which also made these changes: - svn path=/trunk/; revision=51236 - -commit 5ffa911 -Author: Michael Mann -Date: Fri Aug 9 13:55:35 2013 +0000 - - Allow display base, not field type to have multiple ORed entries (for things like BASE_EXT_STRING) + Move them to the end of the list of optional programs. + Make it clear that echld is not built by default. + Change capitalization of tshark and tfshark. - svn path=/trunk/; revision=51235 + Change-Id: Ib702ed72eb2469968e06a16c73a4009ba4cf68ad + Ping-Bug: 10380 + Reviewed-on: https://code.wireshark.org/review/3596 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Petri-Dish: Jeff Morriss + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Jeff Morriss + Reviewed-on: https://code.wireshark.org/review/3624 + Reviewed-by: Evan Huus + Reviewed-by: Christopher Maynard -commit 1c2cb57 -Author: Evan Huus -Date: Fri Aug 9 11:20:02 2013 +0000 +commit fee236b +Author: Guy Harris +Date: Fri Aug 15 03:15:32 2014 -0700 - Enhance verification to assert that the recycler and master list contain all - free chunks of sufficient size. + An NLPID of 0xc0 refers to TRILL. - svn path=/trunk/; revision=51234 - -commit 2214b3f -Author: Pascal Quantin -Date: Fri Aug 9 07:58:27 2013 +0000 - - Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9022 : - Fix dissection of Feature-Caps header field + This will, at least, make it show up as the meaning of a field + containing an NLPID; whether it's actually used to say "a TRILL packet + follows" is another matter. + + At least partially addresses bug 10382, and fully addresses it if it's + never actually used to say "a TRILL packet follows". - svn path=/trunk/; revision=51233 + Change-Id: Ic9dc8ec432532bde692fad3aa9cc97a3109aa634 + Reviewed-on: https://code.wireshark.org/review/3602 + Reviewed-by: Guy Harris + (cherry picked from commit 2cab8766c35b4f1a9b699fbc194aa57e9bef3e8a) + Reviewed-on: https://code.wireshark.org/review/3627 -commit 48fcd0c -Author: Michael Mann -Date: Fri Aug 9 01:51:23 2013 +0000 +commit 9337e79 +Author: oyv +Date: Fri Aug 15 11:56:28 2014 +0200 - Make more filterable items courtesy of convert_proto_tree_add_text.pl + btle advertising header flags (RxAdd/TxAdd) dissected incorrectly - Fix a few misspelled hf_ variables. + bug:10384 + Signed-off-by: oyv - svn path=/trunk/; revision=51229 + Change-Id: Ic31772c551f36fc8d144a5eaeae987a1e5f3e3f1 + Reviewed-on: https://code.wireshark.org/review/3601 + Reviewed-by: Michael Mann -commit 5c0baee +commit a789ebd Author: Guy Harris -Date: Fri Aug 9 00:24:31 2013 +0000 +Date: Fri Aug 15 03:50:15 2014 -0700 - Don't print the packet counter when capturing if we're also printing - packet information to a terminal (which we assume is the same terminal - as the one to which the packet counts are being printed), as they get in - the way of each other. - - Don't print it if we're sending the standard error to a terminal, or if - -q is specified, either. + Regenerate manuf with the updated wka.tmpl. - Put all the setting of print_packet_counts together; it looks as if the - default value of print_packet_counts may have been changed to TRUE and - the code to handle -q wasn't changed to set it to FALSE if -q was - specified rather than setting it to TRUE if it wasn't specified. - - svn path=/trunk/; revision=51227 + Bug: 10383 + Change-Id: I107daae8ddd95b98a769bc2baf602aaf0454f2a2 + Reviewed-on: https://code.wireshark.org/review/3606 + Reviewed-by: Guy Harris -commit 2bbe930 -Author: Jeff Morriss -Date: Thu Aug 8 18:56:42 2013 +0000 +commit 1aa25b1 +Author: Guy Harris +Date: Fri Aug 15 03:26:02 2014 -0700 - As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9011 : + Add some missing group addresses. - Rename packet-cmd.c to packet-cisco-metadata.c . - - Assign copyright to the author. - - Also add the dissector to cmake (oops, should have been in r51198!). - - svn path=/trunk/; revision=51226 + Bug: 10383 + Change-Id: I94c9604824f25347fcd3c7bfd5c18aabdbe0a332 + Reviewed-on: https://code.wireshark.org/review/3603 + Reviewed-by: Guy Harris + (cherry picked from commit 47bb34a43a72d0117e5f8f1824fcc00108e8d10f) + Reviewed-on: https://code.wireshark.org/review/3605 -commit 77ff8f6 +commit 2035d31 Author: Jeff Morriss -Date: Thu Aug 8 18:03:29 2013 +0000 +Date: Wed Aug 13 21:05:38 2014 -0400 - Remove a couple of set-but-no-longer-used variables. + Fix the uninitialized-read error reported in bug 10370. - svn path=/trunk/; revision=51225 + Fix apparent cut-n-pasteo: if offset_e is set then we should be looking + at offset_e (instead of offset_s) and ts_end (instead of ts_start). + + Bug: 10370 + Change-Id: I0683ad55ac782c7fd03b7dbdf3f34df713267de5 + Reviewed-on: https://code.wireshark.org/review/3589 + Reviewed-by: Evan Huus + (cherry picked from commit 44698259b1f5865c60323acaf2a633654a2abe81) + Reviewed-on: https://code.wireshark.org/review/3591 -commit 45d2989 +commit 0af9dd7 Author: Jeff Morriss -Date: Thu Aug 8 17:53:11 2013 +0000 +Date: Wed Aug 13 17:40:16 2014 -0400 - From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9024 : + Use a wildcard to exclude all Wireshark (GUI) binaries: rpmbuild in RHEL6 + errors out if you %exclude a file that's not there. - In dissect_rsvp_lsp_attributes() there is a check for invalid Attributes - TLV length that is no more correct in light of changes described in - Section 14 of RFC 5420. This patch fixes that. + Fixes the issue reported by Chris on the -dev list. - svn path=/trunk/; revision=51224 + Change-Id: If8d8b6a9ee69c3d94756b729a809f3c04fc2517f + Reviewed-on: https://code.wireshark.org/review/3586 + Reviewed-by: Christopher Maynard + Petri-Dish: Christopher Maynard + (cherry picked from commit a83f67cb85926e42314d25f7ddbbd66dbae5b6ed) + Reviewed-on: https://code.wireshark.org/review/3590 + Reviewed-by: Jeff Morriss -commit 30e199e -Author: Michael Mann -Date: Thu Aug 8 17:25:03 2013 +0000 +commit 9069d7b +Author: Evan Huus +Date: Tue Aug 12 20:21:19 2014 -0400 - Use convert_proto_tree_add_text.pl to make many more fields filterable. + hip: fix infinite loop in dissect_hip_tlv - Someone may want to check that the display filter naming scheme is consistent, I at least tried to make it consistent with the new filters created. - May want to also add subtrees for the bit flags that used to be grouped in a single proto_tree_add_text. + We can't use tree_item == NULL to determine which branch of the previous if was + hit, since proto_tree_add_item can return NULL when run without tree, which was + leading to an infinite loop since we were never advancing the offset. Use the + actual locator_type instead. - svn path=/trunk/; revision=51223 + Introduced by either g3635d7bed70 or gebff85fdbb although neither of them + directly touch this code path. I'm guess that g3635d7bed70 removed an if (tree) + guard in some calling function which would have prevented this, but I haven't + checked. The bug would still have been there before, it just wouldn't have been + hit because it's only present with a NULL tree. Somebody more familiar with the + protocol should probably go over a capture or two and make sure this isn't a + symptom of some other decoding gone awry in the recent changes. + + Change-Id: Ie1ce89b16ef667b437c0d99c25e3f3cb2504347d + Reviewed-on: https://code.wireshark.org/review/3564 + Reviewed-by: Evan Huus + (cherry picked from commit d9e5021fe79973d00ddd8fcef0bbefbaae63dd0f) + Reviewed-on: https://code.wireshark.org/review/3567 -commit b882f54 -Author: Martin Mathieson -Date: Thu Aug 8 16:56:41 2013 +0000 +commit afce994 +Author: Jeff Morriss +Date: Tue Aug 12 10:09:03 2014 -0400 - Apply same changes to common stats to tshark tap + When checking if a message is Diameter also check for a minimum message length. + + This improves the detection of Diameter messages within a TCP bytestream (i.e., + when the Diameter PDUs don't neatly align with frames). - svn path=/trunk/; revision=51222 + Bug: 10362 + Change-Id: I49a6e8cf076a6ab8a14761493aab9f3b11e4756e + Reviewed-on: https://code.wireshark.org/review/3557 + Petri-Dish: Evan Huus + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus + (cherry picked from commit 433eeda109bdd5e4ed3860d13ea67e357befae6b) + Reviewed-on: https://code.wireshark.org/review/3561 + Reviewed-by: Jeff Morriss -commit c00caf8 -Author: Gerald Combs -Date: Thu Aug 8 16:41:10 2013 +0000 +commit 5a32e52 +Author: Pascal Quantin +Date: Sun Aug 10 16:48:40 2014 +0200 - Remove catalog.xml. As a comment from Bill Meier in 2010 notes, we don't - seem to use it (and if your Docbook environment isn't set up correctly - the problem should probably be fixed elsewhere). + NSIS: check Windows version before running uninstaller - svn path=/trunk/; revision=51221 + Change-Id: Icc8d725bff484c48d14e0a9208c545ca512a9768 + Reviewed-on: https://code.wireshark.org/review/3533 + Reviewed-by: Pascal Quantin + Reviewed-by: Christopher Maynard + Petri-Dish: Christopher Maynard + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit ddada16e68c185087d526aba8dbb1296fff974c0) + Reviewed-on: https://code.wireshark.org/review/3555 -commit 42ede93 -Author: Gerald Combs -Date: Thu Aug 8 15:58:35 2013 +0000 +commit af50351 +Author: Dom Gifford +Date: Thu Jul 24 15:32:55 2014 +0100 + + Fix support for decrypting 802.11 broadcast messages. + + A little bit of guess work is involved as the group key can use a + different cipher to the pairwise key, and we are trying to do this + purely based on the EAPOL messages with no prior knowledge of the + associate request. We try to guess the cipher based on the lengths. + + Bug:8734 + Change-Id: I4c456b45939c00a9d1122406891f704fa037349c + (cherry picked from commit 8da72cd43dcd597c9f03754831d55211a17f077c) + Reviewed-on: https://code.wireshark.org/review/3503 + Petri-Dish: Evan Huus + Reviewed-by: Evan Huus + +commit 8ecd485 +Author: Eugene Sukhodolin +Date: Sun Aug 10 23:02:30 2014 -0700 - Switch from Docbook 4.2 to 4.5. Our documentation builder only has the - 4.4 and 4.5 DTDs installed and a quick check using a popular network - protocol analyzer showed that xsltproc was fetching the 4.2 DTDs from - the network instead of the local filesystem. + Minor typo corrections - svn path=/trunk/; revision=51220 + Change-Id: I5962ba6a9b9285095ddacf00307a3094c697461a + Reviewed-on: https://code.wireshark.org/review/3546 + Reviewed-by: Alexis La Goutte + (cherry picked from commit 9deb7690963ea1132dd896d853acd976dc8a75c2) + Reviewed-on: https://code.wireshark.org/review/3547 -commit aabda8b -Author: Martin Mathieson -Date: Thu Aug 8 14:45:45 2013 +0000 +commit e82dc02 +Author: Alexis La Goutte +Date: Fri Aug 8 19:50:24 2014 +0200 - Improve stats of broadcast messages + Qt: Fix when build with Qt < 4.8.0 - svn path=/trunk/; revision=51219 + StyleName is not available in Qt < 4.8 + + Change-Id: Icbfcef7c62b124ce67f1a02ed928a96233ae2d9d + Reviewed-on: https://code.wireshark.org/review/3508 + Reviewed-by: Christopher Maynard + (cherry picked from commit 020d0f89637faab8ec0e25e07d64eb66d96c2a72) + Reviewed-on: https://code.wireshark.org/review/3525 + Reviewed-by: Evan Huus -commit c5319eb -Author: Evan Huus -Date: Thu Aug 8 12:23:23 2013 +0000 +commit e354501 +Author: Bill Meier +Date: Sat Aug 9 11:51:10 2014 -0400 - One more chunk header alignment fix. + packet-hislip.c: Fix various bugs and deficiencies + + - Remove an incorrect call to conversation_new() + (which messed up TCP sequence number analysis). + - hislip Request/Response analysis must be done during 'pass1' + (i.e. when 'flags.visited == 0'); + Not doing so caused various problems including + tshark '1 pass' poor dissection. + - Remove 'if (tree)' around a call to expert_...(). + - Don't show "unknown" for Async/Sync when the value is actually known. + - Simplify some code. + - Mark a field as GENERATED. - svn path=/trunk/; revision=51218 + Change-Id: I286c12f52e5f73377bed3a2792f3ff0003e2785f + Reviewed-on: https://code.wireshark.org/review/3541 + Petri-Dish: Bill Meier + Reviewed-by: Bill Meier + (cherry picked from commit e7301a15ab814e4070f918bba8561f291623faae) + Reviewed-on: https://code.wireshark.org/review/3543 -commit 0ebe18d -Author: Evan Huus -Date: Thu Aug 8 11:27:39 2013 +0000 +commit e1c548e +Author: Gerald Combs +Date: Sun Aug 10 08:08:52 2014 -0700 - Make sure our chunk headers are large enough to correctly align the actual data - pointer we return. + [Automatic manuf, services and enterprise-numbers update for 2014-08-10] - svn path=/trunk/; revision=51217 + Change-Id: I18fca49b0ac3b5385805edb85151e5bb994a13f5 + Reviewed-on: https://code.wireshark.org/review/3532 + Reviewed-by: Gerald Combs -commit d8684cf +commit 968c57d Author: Evan Huus -Date: Thu Aug 8 11:16:10 2013 +0000 +Date: Sat Aug 9 09:33:23 2014 -0400 - When splitting a free chunk, if we don't have room for a free header don't even - bother splitting. This greatly simplifies the logic, trims another 4% off the - fast path, and doesn't actually affect the results at all because of the way we - pad for alignment anyways. + Fix regression introduced by gf3b631668b - svn path=/trunk/; revision=51216 + I made a stupid when simplifying the bit-twiddling, and accidentally reversed + two of the bytes which completely broke MAC address name resolution. + + Bug: 10344 + Change-Id: I0720755fb290423150e4d84da9d45cb0b76341e4 + Reviewed-on: https://code.wireshark.org/review/3523 + Reviewed-by: Michael Mann -commit cf6288e -Author: Stig Bjørlykke -Date: Thu Aug 8 11:15:45 2013 +0000 +commit 7579f8f +Author: MarkPhillips +Date: Sat Aug 9 11:03:01 2014 +0100 - Added default ignore targets for new asn1 dissectors. - Removed cnf data from atn-cpdlc.asn to make it generate. + 802.11 BA sequence number decode is broken - svn path=/trunk/; revision=51215 + Bug: 10334 + Change-Id: If2da1c5ed63d7e2684a107181d56be38ed921106 + Reviewed-on: https://code.wireshark.org/review/3519 + Reviewed-by: Alexis La Goutte + (cherry picked from commit 3035e6ec92b597169362387d7b8ca1efc3d8064c) + Reviewed-on: https://code.wireshark.org/review/3520 -commit 2d2271f +commit 6501534 Author: Evan Huus -Date: Thu Aug 8 10:50:11 2013 +0000 +Date: Thu Aug 7 20:25:34 2014 -0400 - Correctly check bounds on dim_max. + Fix read-past-end-of-buffer in CUPS dissector - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9019 + Even when the protocol specifies that a string ends in a null-terminator, there + are packets which won't. Therefore: - svn path=/trunk/; revision=51213 - -commit 77f4bef -Author: Anders Broman -Date: Thu Aug 8 05:34:22 2013 +0000 - - From Mathias Guettler: - New dissector for Air/Ground Datalink ICAO doc 9705 Ed2: ULCS, CM, CPDLC. + **the result of tvb_get_ptr SHALL NOT be treated as a null-terminated string** - Add the files to the distribution. + We need to post that in big neon lettering somewhere obvious. - svn path=/trunk/; revision=51212 + Bug: 10353 + Change-Id: Ie30cd13353a9830311e573e734dd89dc07622c98 + Reviewed-on: https://code.wireshark.org/review/3486 + Reviewed-by: Evan Huus -commit 1219287 +commit 95f8f55 Author: Guy Harris -Date: Thu Aug 8 05:14:33 2013 +0000 +Date: Thu Aug 7 17:21:13 2014 -0700 - Rename variables to reflect their use and to avoid a shadowing warning. + Put setargv.obj back in the list of objects for mergecap. - Fix some indentation while we're at it. - - svn path=/trunk/; revision=51211 - -commit a4d1560 -Author: Anders Broman -Date: Thu Aug 8 05:09:13 2013 +0000 - - From Mathias Guettler: - New dissector for Air/Ground Datalink ICAO doc 9705 Ed2: ULCS, CM, CPDLC. + This should enable automatic wildcard expansion and fix bug 10354. - Just adding the files to SVN for now. + Add the usual setargv.obj comment for reordercap, which also links with + setargv.obj. - svn path=/trunk/; revision=51210 + Change-Id: If9c2b4ecf490dc263d3557a1cda24849a786d299 + Fixes-Bug: 10354 + Reviewed-on: https://code.wireshark.org/review/3484 + Reviewed-by: Guy Harris -commit 6e0c354 -Author: Guy Harris -Date: Thu Aug 8 04:57:38 2013 +0000 +commit dbae90c +Author: AndersBroman +Date: Tue Aug 5 15:22:14 2014 +0200 - Clarify what the special cases in wtap_wtap_encap_to_pcap_encap() are - doing. + Fix Bug #10348 Different dissection results for same file. + The fault is that reassembly_table_init() must be called when reloading + the file - move it to an init routine and register the init routine. + While there move the proto_register_opcua() routine to the end of the file + to be more consistent with other dissectors. + Change soft deprecated APIs - svn path=/trunk/; revision=51209 + Change-Id: I2b93692be24dbf60f4ef09aa7283e55ebf3c1874 + Reviewed-on: https://code.wireshark.org/review/3431 + Reviewed-by: Anders Broman + (cherry picked from commit 79c55a34cb9869a846ed4e58a760c50e409eeeb5) + Reviewed-on: https://code.wireshark.org/review/3468 -commit 08d223e -Author: Anders Broman -Date: Thu Aug 8 04:36:54 2013 +0000 +commit 28b65c0 +Author: Pascal Quantin +Date: Wed Aug 6 19:50:06 2014 +0200 - When dissecting IMSI handle the zero length tvb case, fixes "Malformed Packet: CAMEL (empty IMSI tag)" + MIPv6: fix dissection of Service Selection Identifier - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9015 + APN field is not encoded as a dotted string so the first character is not a length - svn path=/trunk/; revision=51208 + Bug: 10323 + Change-Id: Ia62137c785d505e9d0f1536a333b421a85480741 + Reviewed-on: https://code.wireshark.org/review/3461 + Petri-Dish: Pascal Quantin + Reviewed-by: Pascal Quantin + Reviewed-by: Anders Broman + (cherry picked from commit ccbe5fd0b9520493884de70056dbd9682647ab8d) + Reviewed-on: https://code.wireshark.org/review/3467 -commit fd4a111 -Author: Anders Broman -Date: Thu Aug 8 04:32:19 2013 +0000 +commit 3cc3350 +Author: Jeff Morriss +Date: Tue Aug 5 15:31:55 2014 -0400 - Don't call eth_addr_resolve() unconditionally. + Fix some dates in the changelog; add some recent changes to the changelog. - svn path=/trunk/; revision=51207 - -commit 812ad4f -Author: Anders Broman -Date: Thu Aug 8 04:31:07 2013 +0000 - - From Tommy Wu: - - Show major and Minor version. - - Correct SPI Name. + Apparently rpmbuild now verifies the dates (including the day of the week) + you entered. - svn path=/trunk/; revision=51206 + Change-Id: I1c67fb3170de3199b5fe5f8c117eaefb4d4d28c7 + Reviewed-on: https://code.wireshark.org/review/3442 + Reviewed-by: Jeff Morriss + (cherry picked from commit b76e0f71aa9b9a4c2ff1242332d1919748e25bc3) + Reviewed-on: https://code.wireshark.org/review/3443 -commit a46f373 -Author: Anders Broman -Date: Thu Aug 8 04:30:16 2013 +0000 +commit 7c06489 +Author: Jeff Morriss +Date: Fri Aug 1 14:51:53 2014 -0400 - Add an application Id. + Remove the old wireshark binary during RPM upgrades. + + If we have a pre-alternatives wireshark binary out there (e.g., because + we're upgrading from wireshark-1.10 to wireshark-1.12), get rid of it + in the %pre script. Otherwise the binary gets left there (because it's + listed as a %ghost in the new spec file). - svn path=/trunk/; revision=51205 + Change-Id: I5828fcff486af3d269bad8dfe544c7659179bf5e + Reviewed-on: https://code.wireshark.org/review/3332 + Reviewed-by: Jeff Morriss + (cherry picked from commit c93297c750b99ac487f1f787896959ca43f64c72) + Reviewed-on: https://code.wireshark.org/review/3440 -commit ea72be8 -Author: Guy Harris -Date: Thu Aug 8 04:29:08 2013 +0000 +commit 5a329cb +Author: Bill Meier +Date: Tue Aug 5 12:50:39 2014 -0400 - Speak of the "-d encap:" value as a linktype, rather than a DLT; if a - name is specified, it currently must be a DLT_ name rather than a - LINKTYPE_ name, as we use libpcap to do the mapping and it currently has - no API to map LINKTYPE_ names to values, but if a number is specified, - it could either be a LINKTYPE_ name or a DLT_ name if the two are - different, and we want to encourage the use of LINKTYPE_ values. - - Note that in comments. + Fix a few minor dissector bugs. - svn path=/trunk/; revision=51204 + Change-Id: If9a2cb3456e6262c6c255f5b64cbad9e9c70038f + Reviewed-on: https://code.wireshark.org/review/3433 + Petri-Dish: Bill Meier + Reviewed-by: Bill Meier -commit 3734d4e +commit 16bf5c5 Author: Guy Harris -Date: Thu Aug 8 04:18:20 2013 +0000 +Date: Mon Aug 4 16:04:06 2014 -0700 - Point to the tcpdump.org link-layer header types page. + Squelch a compiler warning. - svn path=/trunk/; revision=51203 + Change-Id: I8916bb3cc136c03c39fbdaf5d7bb61c3dae137e6 + Reviewed-on: https://code.wireshark.org/review/3422 + Reviewed-by: Guy Harris + (cherry picked from commit ce7b041305330e2cb87d895f57381241702c9d85) + Reviewed-on: https://code.wireshark.org/review/3423 -commit 8186532 +commit 01b75b7 Author: Guy Harris -Date: Thu Aug 8 04:16:53 2013 +0000 +Date: Mon Aug 4 15:26:00 2014 -0700 - Rename "dlt_value" to "linktype_value", and give more details in - comments about LINKTYPE_ values vs. DLT_ values. + Support both decimal and hex values for uint dissectors. - svn path=/trunk/; revision=51202 - -commit 62c083f -Author: Gerald Combs -Date: Thu Aug 8 00:46:19 2013 +0000 - - Compile on Qt < 5.0. + And, while we're at it, reject entries with invalid numbers. - svn path=/trunk/; revision=51201 + Change-Id: Ifefe28396cfe391d2d5c7f7ff335d0f041e35a03 + Reviewed-on: https://code.wireshark.org/review/3417 + Reviewed-by: Guy Harris + (cherry picked from commit 01361a92cbb53d229fe927b9765dcd6c7999efb4) + Reviewed-on: https://code.wireshark.org/review/3418 -commit 79454ef -Author: Gerald Combs -Date: Thu Aug 8 00:26:57 2013 +0000 +commit 5d8d02e +Author: Jeff Morriss +Date: Mon Aug 4 15:44:02 2014 -0400 - Add initial capture filter support. + Fix RPM builds with a prefix other than /usr. - Add CaptureFilterCombo and CaptureFilterEdit classes, similar to their - display filter counterparts. Add a CaptureFilterSyntaxWorker class which - runs a syntax check in a background thread similar to the threaded code - in capture_dlg.c. Add a bunch of related signal and slot plumbing. Other - minor fixups. + The location of update-alternatives does not depend on Wireshark's + installation prefix: it's always in /usr/sbin/. - svn path=/trunk/; revision=51200 + Change-Id: I7dda9cebec83bc64133adfeb5ee6af70dc6dc7ab + Reviewed-on: https://code.wireshark.org/review/3413 + Reviewed-by: Jeff Morriss + (cherry picked from commit 644b2e7c69c5289b8a6f524aef84eb7c54cf6058) + Reviewed-on: https://code.wireshark.org/review/3414 -commit 786adc8 -Author: Jeff Morriss -Date: Wed Aug 7 23:07:15 2013 +0000 +commit becb4d7 +Author: Evan Huus +Date: Fri Aug 1 21:27:01 2014 -0400 - From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8954 : + Only fake an item by returning 'tree' if they use the same TVB - This patch adds XRO (Exclude Routes) support to RSVP dissector. It - also extends coverage of some new Attribute Flags (LSP_ATTRIBUTES object). + Otherwise the offsets will be wrong when calling, e.g. proto_item_set_end. - svn path=/trunk/; revision=51199 + Bug:10329 + Change-Id: I5ae0c660af90678e446817b65f83c075e7c0b84e + Reviewed-on: https://code.wireshark.org/review/3340 + Petri-Dish: Evan Huus + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus -commit a018f63 -Author: Jeff Morriss -Date: Wed Aug 7 22:52:43 2013 +0000 +commit 087b6a6 +Author: Guy Harris +Date: Sun Aug 3 23:59:10 2014 -0700 - From Vaibhav Katkade via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9011 : - - Add support for the Cisco MetaData (0x8909) ethertype. + Some other places that needed buffer_ -> tagbuffer_. - From me: + ("Namespaces" in C code - more fun than a barrel full of rabid monkeys on + crack.) - Don't try to register the "eth.type" abbreviation; use "cmd.type" instead. - Add SVN id. - Clean up trailing white space and fix up some indentation. - Don't declare a variable static that need not be. - - svn path=/trunk/; revision=51198 + Change-Id: Idb0fafd9c59c55407530f8626ecdc8edef33154b + Reviewed-on: https://code.wireshark.org/review/3404 + Reviewed-by: Guy Harris -commit c44883c -Author: Jeff Morriss -Date: Wed Aug 7 22:20:49 2013 +0000 +commit bb25002 +Author: Evan Huus +Date: Sun Aug 3 20:30:52 2014 -0400 - From Роман Донченко via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9018 : + Try to detect overflow without causing signedness warnings. - This patch enables Wireshark to correctly decode messages specific to the - selected key exchange method by determining and remembering that method. - It's a little incomplete in that it doesn't support the case where - first_kex_packet_follows is true, but then the current implementation - doesn't either. - - It also adds/fixes dissection for the plain Diffie-Hellman key exchange and - DH group exchange messages that were broken/missing, completing support for - both of these key exchange methods. - - svn path=/trunk/; revision=51197 + Change-Id: I957ead1f674e2c56e9c741841fea11395769b238 + Reviewed-on: https://code.wireshark.org/review/3398 + Reviewed-by: Evan Huus + (cherry picked from commit 0294b29527d7bb6315cb1097c47e57a362803495) + Reviewed-on: https://code.wireshark.org/review/3399 -commit 07ee14d -Author: Martin Kaiser -Date: Wed Aug 7 21:17:53 2013 +0000 +commit a413ca0 +Author: Evan Huus +Date: Sun Aug 3 17:48:06 2014 -0400 - fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9020 - make sure that the loop counter is always incremented + Check for multiplicative overflow in the wmem_alloc_array macros. - svn path=/trunk/; revision=51196 + Bug:10343 + Change-Id: Iea511c806b92999b3b497f94886c46a818100a23 + Reviewed-on: https://code.wireshark.org/review/3396 + Reviewed-by: Bill Meier + (cherry picked from commit efb8a1ee4319593dc14b8a42068f2cfddea1bff5) + Reviewed-on: https://code.wireshark.org/review/3397 + Reviewed-by: Evan Huus -commit 2f072ac -Author: Martin Kaiser -Date: Wed Aug 7 20:18:11 2013 +0000 +commit b4fa306 +Author: Guy Harris +Date: Sun Aug 3 13:53:58 2014 -0700 - add a range check for dch_id - - this should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9005 + Remove duplicate line. - svn path=/trunk/; revision=51195 + Change-Id: I0b32ccaaa7c9e0294ee7bc96fe4937a98d8461d5 + Reviewed-on: https://code.wireshark.org/review/3394 + Reviewed-by: Guy Harris + (cherry picked from commit 6af06314576473c5d52844c9e2ee03c9455b50a3) + Reviewed-on: https://code.wireshark.org/review/3395 -commit 6fea3ab -Author: Gerald Combs -Date: Wed Aug 7 18:30:21 2013 +0000 +commit 072f532 +Author: Guy Harris +Date: Thu Jul 31 01:56:51 2014 -0700 - Make sure we copy our support files to DESTDIR. + Missing end-of-line backslash. - svn path=/trunk/; revision=51194 + Change-Id: I99b72e4d38b12e0356f27d29f919484e40b7443b + Reviewed-on: https://code.wireshark.org/review/3287 + Reviewed-by: Guy Harris + (cherry picked from commit acea064009473637487585fb0cefc774f8323d42) + Reviewed-on: https://code.wireshark.org/review/3393 -commit a2452d6 -Author: Pascal Quantin -Date: Wed Aug 7 17:34:49 2013 +0000 +commit b9dfdd3 +Author: Gerald Combs +Date: Sun Aug 3 08:08:51 2014 -0700 - Fix dissection of FemtoInterfaceMsg media type when it includes a mandatory LV or V IE + [Automatic manuf, services and enterprise-numbers update for 2014-08-03] - svn path=/trunk/; revision=51193 + Change-Id: I59fbca5004187ab8e0da653c37d93f358352c71f + Reviewed-on: https://code.wireshark.org/review/3381 + Reviewed-by: Gerald Combs -commit 2c81a97 -Author: Jeff Morriss -Date: Wed Aug 7 16:46:08 2013 +0000 +commit 61abd97 +Author: Alexis La Goutte +Date: Sat Aug 2 12:00:59 2014 +0200 - Ensure we have both _initialize() and a corresponding _cleanup() routines for - the various name resolvers; put those two routines next to each other. - - Add generic addr_resolv_init() and addr_resolv_cleanup() routines which call - all of those internal routines. - - Call the generic init/cleanup routine from epan_init() and epan_cleanup(). - - Create the hash tables for each name resolver in those initialization routines - in order to avoid having to repeatedly check if the table is already created - or not (and to avoid glib warnings if we neglected to perform that check): - - http://www.wireshark.org/lists/wireshark-dev/201308/msg00012.html - + HTTP2: Add a preference to enable/disable HTTP2 (weak) heuristics - Don't clean up hostnames in init_dissection(): it's done already in cleanup_dissection(). - Don't initialize hostnames in cleanup_dissection(): it's done already in init_dissection(). + By default, the heuristic is disabled - svn path=/trunk/; revision=51191 + Change-Id: I26ef23e8b153576a4fabd2e3324e830756e64bb7 + Ping-Bug:10335 + Ping-Bug:10310 + Reviewed-on: https://code.wireshark.org/review/3350 + Reviewed-by: Pascal Quantin + Reviewed-by: Evan Huus + (cherry picked from commit 0b23e0f91f1b3cce68dd2ff19058f41b0d93a7d4) + Reviewed-on: https://code.wireshark.org/review/3378 -commit 2dab57f -Author: Gerald Combs -Date: Wed Aug 7 16:33:39 2013 +0000 +commit 6295e53 +Author: Evan Huus +Date: Fri Aug 1 22:05:32 2014 -0400 - Switch to make-services.py. Fix some variable names and version tests. + Fix an infinite loop when the line has no length - svn path=/trunk/; revision=51189 + Bug:10333 + Change-Id: Ia2dae94095dddf57e4c75792b5477b0eb37c29c9 + Reviewed-on: https://code.wireshark.org/review/3344 + Reviewed-by: Anders Broman -commit 56d05bf -Author: Jeff Morriss -Date: Wed Aug 7 16:14:44 2013 +0000 +commit 3b22920 +Author: moraney.jalil +Date: Thu Jul 24 22:34:29 2014 +0300 - It's not necessary to call epan_free() in cf_open(): cf_close() (which is - called by cf_open()) already calls epan_free(). + Fixing a bug in add_ff_action_public_fields(), by removing the start argument and defining it inside the function. - svn path=/trunk/; revision=51188 + Change-Id: I6205384b3bcf38128912baf413b4455357d25347 + Reviewed-on: https://code.wireshark.org/review/3184 + Reviewed-by: Evan Huus + (cherry picked from commit 0501465a3acb2abc108177ea5149ec8de4a05210) + Reviewed-on: https://code.wireshark.org/review/3361 + Reviewed-by: Anders Broman -commit c617a6a -Author: Alexis La Goutte -Date: Wed Aug 7 13:44:44 2013 +0000 +commit 8562196 +Author: Martin Kaiser +Date: Fri Aug 1 12:32:21 2014 +0200 - Enhance LISP Dissector (Mapping, Locator and Record type...) - - Convert proto_tree_add_text calls to proto_tree_add_item - - (the end of my original commit...) + fix multi-byte entries in Operator Profile capability loops + (this problem showed up in an APDU with two 16bit application ids) - svn path=/trunk/; revision=51187 + Change-Id: Ie4842181b19db984a693534144fac5e91b217b34 + Reviewed-on: https://code.wireshark.org/review/3358 + Reviewed-by: Martin Kaiser + Tested-by: Martin Kaiser + (cherry picked from commit b5f4cb5c33a0592f8debfe24311f0fccbd167e97) + Reviewed-on: https://code.wireshark.org/review/3359 -commit 0995eb9 -Author: Jeff Morriss -Date: Wed Aug 7 13:26:05 2013 +0000 +commit 4936ea2 +Author: Guy Harris +Date: Sat Aug 2 04:16:53 2014 -0700 - Remove some set-but-no-longer-used variables. + Rename buffer_ routines to tagbuffer_ to avoid name collisions. - svn path=/trunk/; revision=51186 - -commit 9b85c5b -Author: Martin Mathieson -Date: Wed Aug 7 12:56:39 2013 +0000 - - Try to fix build by removing proto_tree_add_text() call replaced by items + In particular, collisions with the buffer_ routines in libwsutil; in the + trunk, we renamed *those* routines, but that breaks API/ABI + compatibility, so, in the 1.12 branch, we rename these routines, which + adds a difference between this code and the Lrexlib release that we'd + rather not have if we can avoid it. - svn path=/trunk/; revision=51185 + This should fix bug 10332. + + Change-Id: Ib37a50713acb880fb79adacc91f7bb49959be97e + Reviewed-on: https://code.wireshark.org/review/3352 + Reviewed-by: Guy Harris -commit 90e273c -Author: Alexis La Goutte -Date: Wed Aug 7 12:05:23 2013 +0000 +commit e2f1fa6 +Author: Jeff Morriss +Date: Fri Aug 1 10:32:58 2014 -0400 - Enhance BGP Update + Fix a couple debian dist files which are different for master-1.12. - Step 4 : Convert proto_tree_add_text calls to proto_tree_add_item and use new name of RFC4271 ( Withdrawn Routes Length ...) - - svn path=/trunk/; revision=51184 + Bug: 10331 + Change-Id: If4b1269eef1cb1deb01c1ad5f402a4a19910d88f + Reviewed-on: https://code.wireshark.org/review/3321 + Reviewed-by: Jeff Morriss -commit b4beea2 -Author: Alexis La Goutte -Date: Wed Aug 7 12:05:11 2013 +0000 +commit 76c9d88 +Author: Guy Harris +Date: Thu Jul 31 00:41:08 2014 -0700 - Enhance LISP Dissector (Mapping, Locator and Record type...) + Add a bunch of missing files to the distribution. - Convert proto_tree_add_text calls to proto_tree_add_item + Files from the debian directory, documents from the doc directory, + graphics from the docbook/wsug_graphics directory, and the echld + Makefile.nmake. - svn path=/trunk/; revision=51183 + Bug: 10331 + Change-Id: Iccccc58811753581b0b180053defd937aea22f95 + Reviewed-on: https://code.wireshark.org/review/3283 + Reviewed-by: Guy Harris + Reviewed-on: https://code.wireshark.org/review/3320 + Reviewed-by: Jeff Morriss -commit 8da9a76 -Author: Alexis La Goutte -Date: Wed Aug 7 12:04:04 2013 +0000 +commit ffe97f8 +Author: Evan Huus +Date: Thu Jul 31 13:18:21 2014 -0400 - From Matt Texier - - Enhance BGP Dissector - - Step 3 :Variable consistency and renaming, adding RFC and draft as comments (Preperation for next enhance...) + Use packet_scope instead of a stack local - From me : - Fix some typo/whitespace - Make checkhf happy... + As clang pointed out we end up storing a reference to it in a global and (more + relevantly) pushing that global to a tap which would run after the current frame + has returned. - Signed-off-by: Alexis La Goutte + Thanks to Alexis for bringing this to my attention. - svn path=/trunk/; revision=51182 + Change-Id: I3aac43a806d217b0dc8a973f6bb2fa48cdd041bb + Reviewed-on: https://code.wireshark.org/review/3289 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Reviewed-by: Anders Broman + (cherry picked from commit a644744fb9502971fee751b8a1e390d255b82d78) + Reviewed-on: https://code.wireshark.org/review/3310 + Reviewed-by: Michael Mann -commit aadc33f -Author: Stig Bjørlykke -Date: Wed Aug 7 10:02:03 2013 +0000 +commit b03c8af +Author: Jeff Morriss +Date: Fri Aug 1 10:08:38 2014 -0400 - Do not use overlapping memory in g_snprintf. - Use consistent spacing between title and value. + Add wireshark.pc.in to the source distribution (needed for cmake). - svn path=/trunk/; revision=51181 + Bug: 10331 + Change-Id: I81e0d224917cd4b38215e28ec146cd80efdb99d2 + Reviewed-on: https://code.wireshark.org/review/3316 + Reviewed-by: Jeff Morriss + (cherry picked from commit 7f9fdbb8c10522d2bc31d285d1486601a441f09d) + Reviewed-on: https://code.wireshark.org/review/3317 -commit 4317fad -Author: Anders Broman -Date: Wed Aug 7 04:39:32 2013 +0000 +commit 506e8f6 +Author: Guy Harris +Date: Wed Jul 30 16:41:51 2014 -0700 - From Michael Mann: + Add some files under asn1 to the distribution. - the heuristics of NDMP require 28 bytes to be present in order for it to be dissected as NDMP. NDMP is purely a heuristic dissector because TCPENCAP shares the same TCP port. - Since NDMP officially registered port 10000 with IANA, allow it to use dissector_add_uint() instead of packet-ipsec-tcp.c, and by default have TCPENCAP only rely on its heuristics. + Include CMakeLists.txt files and the gnm subdirectory, along with the + top-level Makefile.inc and Makefile.preinc files. Don't explicitly + include Custom.make, as automake does that automatically given that it's + included by asn1/Makefile.am. - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5462 + Add some files to EXTRA_DIST lists. - svn path=/trunk/; revision=51180 + Move some .asn files to EXTRA_DIST; they don't need to be in SRC_FILES, + as SRC_FILES always includes EXTRA_DIST, and they *do* need to be in + EXTRA_DIST so that they're in the distribution. + + Bug: 10331 + Change-Id: Id91df577260fa57028d40fe098be1d79c59398e6 + Reviewed-on: https://code.wireshark.org/review/3273 + Reviewed-by: Guy Harris + (cherry picked from commit 4d90d6e38d1afaeda387dea9522cc0417ff41141) + Reviewed-on: https://code.wireshark.org/review/3315 + Reviewed-by: Jeff Morriss -commit 907e735 -Author: Anders Broman -Date: Wed Aug 7 04:28:35 2013 +0000 +commit 0ef5faf +Author: Guy Harris +Date: Wed Jul 30 21:45:19 2014 -0700 - From Javier Godoy: - Dissect SCSI OSD attribute identification sense data descriptor. + Add some missing CMake files to the distribution. - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8971 + Ping-Bug: 10331 + Change-Id: I67ca59bb77766f4625e64b9042cdcb5d03cd7994 + Reviewed-on: https://code.wireshark.org/review/3281 + Reviewed-by: Guy Harris + (cherry picked from commit 5dd83af26d2a035bbe94fd453d2093e8504f2685) + Reviewed-on: https://code.wireshark.org/review/3314 + Reviewed-by: Jeff Morriss + +commit 3d8fb9c +Author: Gerald Combs +Date: Thu Jul 31 15:33:59 2014 -0700 + + 1.12.0 → 1.12.1. - svn path=/trunk/; revision=51179 + Change-Id: I059be7c092f52f5f7d3a29357abd8c9b05204905 + Reviewed-on: https://code.wireshark.org/review/3306 + Reviewed-by: Gerald Combs diff -Nru wireshark-1.12.0+git+4fab41a1/config.nmake wireshark-1.12.1+g01b65bf/config.nmake --- wireshark-1.12.0+git+4fab41a1/config.nmake 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/config.nmake 2014-09-16 12:09:03.000000000 -0400 @@ -35,7 +35,7 @@ # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=12 -VERSION_MICRO=0 +VERSION_MICRO=1 VERSION_BUILD=$(GIT_REVISION) # Local build information. Recommended: Unique string for your diff -Nru wireshark-1.12.0+git+4fab41a1/configure.ac wireshark-1.12.1+g01b65bf/configure.ac --- wireshark-1.12.0+git+4fab41a1/configure.ac 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/configure.ac 2014-09-16 12:09:03.000000000 -0400 @@ -7,7 +7,7 @@ # m4_define([version_major], [1]) m4_define([version_minor], [12]) -m4_define([version_micro], [0]) +m4_define([version_micro], [1]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], []) @@ -499,10 +499,12 @@ # version 4.2.2, the switched to LGPLv3+ / GPLv2+ in version 6.0.0. tls_message="no" +want_gnutls="if_available" AC_ARG_WITH([gnutls], AC_HELP_STRING( [--with-gnutls=@<:@yes/no@:>@], - [use GnuTLS library @<:@default=yes@:>@]), - with_gnutls="$withval", with_gnutls="yes") + [use GnuTLS library @<:@default=yes, if available@:>@]), + [ with_gnutls="$withval"; want_gnutls="yes" ], with_gnutls="yes") + if test "x$with_gnutls" = "xyes"; then have_license_compatible_gnutls="no" PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.1.10 ], @@ -522,15 +524,22 @@ else echo "GnuTLS with compatible license not found, disabling SSL decryption" tls_message="no" + + # Error out if the user explicitly requested gnutls + if test "x$want_gnutls" = "xyes"; then + AC_MSG_ERROR([GnuTLS crypto library was requested, but is not available]) + fi fi fi # libgrypt gcrypt_message="no" +want_gcrypt="if_available" AC_ARG_WITH([gcrypt], AC_HELP_STRING( [--with-gcrypt=@<:@yes/no@:>@], - [use gcrypt library @<:@default=yes@:>@]), - with_gcrypt="$withval", with_gcrypt="yes") + [use gcrypt library @<:@default=yes, if available@:>@]), + [ with_gcrypt="$withval"; want_gcrypt="yes" ], with_gcrypt="yes") + if test "x$with_gcrypt" = "xyes"; then AM_PATH_LIBGCRYPT(1.1.92, [ @@ -545,6 +554,11 @@ echo "libgcrypt not found, disabling ipsec decryption" gcrypt_message="no" fi + + # Error out if the user explicitly requested gcrypt + if test "x$want_gcrypt" = "xyes"; then + AC_MSG_ERROR([libgcrypt library was requested, but is not available]) + fi ] ) fi @@ -1759,7 +1773,7 @@ # Enable/disable tshark AC_ARG_ENABLE(tshark, AC_HELP_STRING( [--enable-tshark], - [build TShark @<:@default=yes@:>@]), + [build tshark @<:@default=yes@:>@]), tshark=$enableval,enable_tshark=yes) if test "x$enable_tshark" = "xyes" ; then @@ -1773,23 +1787,6 @@ AC_SUBST(tshark_bin) AC_SUBST(tshark_man) -# Enable/disable tfshark -AC_ARG_ENABLE(tfshark, - AC_HELP_STRING( [--enable-tfshark], - [build TFShark @<:@default=no@:>@]), - tfshark=$enableval,enable_tfshark=no) - -if test "x$enable_tfshark" = "xyes" ; then - tfshark_bin="tfshark\$(EXEEXT)" - tfshark_man="tfshark.1" - wiresharkfilter_man="wireshark-filter.4" -else - tfshark_bin="" - tfshark_man="" -fi -AC_SUBST(tfshark_bin) -AC_SUBST(tfshark_man) - # Enable/disable editcap AC_ARG_ENABLE(editcap, @@ -1807,26 +1804,6 @@ AC_SUBST(editcap_bin) AC_SUBST(editcap_man) -# Enable/disable echld - -AC_ARG_ENABLE(echld, - AC_HELP_STRING( [--enable-echld], - [support echld]), - have_echld=$enableval,have_echld=no) - -AM_CONDITIONAL(HAVE_ECHLD, test "x$have_echld" = "xyes") -if test "x$have_echld" = "xyes" -then - AC_DEFINE(HAVE_ECHLD, 1, [Define if echld is enabled]) - echld_test_bin="echld_test\$(EXEEXT)" - echld_dir="echld" -else - have_echld="no" - echld_test_bin="" - echld_dir="" -fi -AC_SUBST(echld_test_bin) -AC_SUBST(echld_dir) # Enabling/disabling of dumpcap is done later (after we know if we have PCAP # or not) @@ -2069,6 +2046,45 @@ AC_SUBST(rawshark_bin) AC_SUBST(rawshark_man) + +# Enable/disable echld +#AC_ARG_ENABLE(echld, +# AC_HELP_STRING( [--enable-echld], +# [support echld (Experimental) @<:@default=no@:>@]), +# have_echld=$enableval,have_echld=no) + +AM_CONDITIONAL(HAVE_ECHLD, test "x$have_echld" = "xyes") +#if test "x$have_echld" = "xyes" +#then +# AC_DEFINE(HAVE_ECHLD, 1, [Define if echld is enabled]) +# echld_test_bin="echld_test\$(EXEEXT)" +# echld_dir="echld" +#else +# have_echld="no" +# echld_test_bin="" +# echld_dir="" +#fi +AC_SUBST(echld_test_bin) +AC_SUBST(echld_dir) + +# Enable/disable tfshark +#AC_ARG_ENABLE(tfshark, +# AC_HELP_STRING( [--enable-tfshark], +# [build tfshark (Experimental) @<:@default=no@:>@]), +# tfshark=$enableval,enable_tfshark=no) + +#if test "x$enable_tfshark" = "xyes" ; then +# tfshark_bin="tfshark\$(EXEEXT)" +# tfshark_man="tfshark.1" +# wiresharkfilter_man="wireshark-filter.4" +#else +# tfshark_bin="" +# tfshark_man="" +#fi +AC_SUBST(tfshark_bin) +AC_SUBST(tfshark_man) + + dnl Use pcap-ng by default AC_ARG_ENABLE(pcap-ng-default, AC_HELP_STRING( [--enable-pcap-ng-default], @@ -2803,6 +2819,7 @@ asn1/dsp/Makefile asn1/ess/Makefile asn1/ftam/Makefile + asn1/gnm/Makefile asn1/goose/Makefile asn1/gprscdr/Makefile asn1/gsm_map/Makefile @@ -3052,7 +3069,7 @@ echo " Build wireshark (Gtk+) : $have_gtk""$gtk_lib_message" echo " Build wireshark-qt : $enable_qtshark" echo " Build tshark : $enable_tshark" -echo " Build tfshark : $enable_tfshark" +#echo " Build tfshark : $enable_tfshark" echo " Build capinfos : $enable_capinfos" echo " Build captype : $enable_captype" echo " Build editcap : $enable_editcap" @@ -3063,7 +3080,7 @@ echo " Build randpkt : $enable_randpkt" echo " Build dftest : $enable_dftest" echo " Build rawshark : $enable_rawshark" -echo " Build echld : $have_echld" +#echo " Build echld : $have_echld" echo "" echo " Save files as pcap-ng by default : $enable_pcap_ng_default" echo " Install dumpcap with capabilities : $setcap_message" diff -Nru wireshark-1.12.0+git+4fab41a1/debian/changelog wireshark-1.12.1+g01b65bf/debian/changelog --- wireshark-1.12.0+git+4fab41a1/debian/changelog 2014-08-01 05:27:06.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/debian/changelog 2014-12-12 10:44:01.000000000 -0500 @@ -1,3 +1,22 @@ +wireshark (1.12.1+g01b65bf-2~ubuntu14.10.1) utopic; urgency=medium + + * Security Update to Address Multiple CVEs (LP: #1397091) + * Use tarball from Vivid package of wireshark (1.12.1+g01b65bf-2) + * Additional new patches (from 1.12.2) in debian/patches/: + * 17_1.12.2_fix_TN5250_loop.patch: Fix TN5250 infinite loops + vulnerability (CVE-2014-8714) + * 18_1.12.2_fix_NCP_crash_1.patch & 19_1.12.2_fix_NCP_crash_2.patch: Fix + NCP dissector crashes (CVE-2014-8712, CVE-2014-8713) + * 20_1.12.2_fix_SigComp_crash.patch: Fix SigComp UDVM buffer overflow + vulnerability (CVE-2014-8710) + * 21_1.12.2_fix_AMQP_crash.patch: Fix AMQP dissector crash (CVE-2014-8711) + * Additional patches/changes kept from Vivid: + * d/patches/0001-Set-library-.so-versions-to-their-proper-value.patch: + Set library .so versions to their proper value. + * d/libwsutil4.symbols: File kept from Vivid. + + -- Thomas Ward Thu, 11 Dec 2014 15:26:28 -0500 + wireshark (1.12.0+git+4fab41a1-1) unstable; urgency=medium * New upstream release 1.12.0 from git snapshot: diff -Nru wireshark-1.12.0+git+4fab41a1/debian/control wireshark-1.12.1+g01b65bf/debian/control --- wireshark-1.12.0+git+4fab41a1/debian/control 2014-06-11 10:35:40.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/debian/control 2014-12-11 15:29:54.000000000 -0500 @@ -1,7 +1,8 @@ Source: wireshark Section: net Priority: optional -Maintainer: Balint Reczey +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Balint Reczey Standards-Version: 3.9.5 Build-Depends: libgtk-3-dev, # enable Qt 5 related dependencies for Qt 5-enabled build diff -Nru wireshark-1.12.0+git+4fab41a1/debian/libwsutil4.symbols wireshark-1.12.1+g01b65bf/debian/libwsutil4.symbols --- wireshark-1.12.0+git+4fab41a1/debian/libwsutil4.symbols 2014-07-23 10:20:39.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/debian/libwsutil4.symbols 2014-09-19 18:52:49.000000000 -0400 @@ -103,6 +103,7 @@ nstime_to_sec@Base 1.12.0~rc1 plugins_dump_all@Base 1.12.0~rc1 plugins_get_descriptions@Base 1.12.0~rc1 + printable_char_or_period@Base 1.12.1+g01b65bf profile_exists@Base 1.12.0~rc1 profile_store_persconffiles@Base 1.12.0~rc1 relinquish_special_privs_perm@Base 1.10.0 diff -Nru wireshark-1.12.0+git+4fab41a1/debian/patches/0001-Set-library-.so-versions-to-their-proper-value.patch wireshark-1.12.1+g01b65bf/debian/patches/0001-Set-library-.so-versions-to-their-proper-value.patch --- wireshark-1.12.0+git+4fab41a1/debian/patches/0001-Set-library-.so-versions-to-their-proper-value.patch 1969-12-31 19:00:00.000000000 -0500 +++ wireshark-1.12.1+g01b65bf/debian/patches/0001-Set-library-.so-versions-to-their-proper-value.patch 2014-12-12 10:38:27.000000000 -0500 @@ -0,0 +1,74 @@ +From a61ce89bd3d87c2ae30157a0084519e39d53116d Mon Sep 17 00:00:00 2001 +From: Balint Reczey +Date: Fri, 19 Sep 2014 19:53:15 +0200 +Subject: [PATCH] Set library .so versions to their proper value + +The versions should be bumped right before each final/RC release. + +Change-Id: I3ae1f117b25ad715db3ffc9f8c3b0a3979c847e7 +Reviewed-on: https://code.wireshark.org/review/4195 +Reviewed-by: Michael Mann +--- + epan/CMakeLists.txt | 2 +- + epan/Makefile.am | 2 +- + wiretap/CMakeLists.txt | 2 +- + wiretap/Makefile.am | 2 +- + wsutil/CMakeLists.txt | 2 +- + wsutil/Makefile.am | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt +index 39eddf5..054d75a 100644 +--- a/epan/CMakeLists.txt ++++ b/epan/CMakeLists.txt +@@ -1680,7 +1680,7 @@ add_library(epan ${LINK_MODE_LIB} + + add_dependencies(epan gitversion) + +-set(FULL_SO_VERSION "5.0.0") ++set(FULL_SO_VERSION "5.0.1") + + set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") + set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt +index 1ba0321..71cd852 100644 +--- a/wiretap/CMakeLists.txt ++++ b/wiretap/CMakeLists.txt +@@ -113,7 +113,7 @@ add_library(wiretap ${LINK_MODE_LIB} + ${WIRETAP_FILES} + ) + +-set(FULL_SO_VERSION "4.0.0") ++set(FULL_SO_VERSION "4.0.1") + + set_target_properties(wiretap PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") + set_target_properties(wiretap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt +index e4bd718..4de975e 100644 +--- a/wsutil/CMakeLists.txt ++++ b/wsutil/CMakeLists.txt +@@ -98,7 +98,7 @@ add_library(wsutil ${LINK_MODE_LIB} + ${WSUTIL_FILES} + ) + +-set(FULL_SO_VERSION "4.0.0") ++set(FULL_SO_VERSION "4.1.0") + + set_target_properties(wsutil PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") + set_target_properties(wsutil PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") +diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am +index 0b5f3ee..8cd00d1 100644 +--- a/wsutil/Makefile.am ++++ b/wsutil/Makefile.am +@@ -60,7 +60,7 @@ endif + + lib_LTLIBRARIES = libwsutil.la + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +-libwsutil_la_LDFLAGS = -version-info 4:0:0 @LDFLAGS_SHAREDLIB@ ++libwsutil_la_LDFLAGS = -version-info 5:0:1 @LDFLAGS_SHAREDLIB@ + + AM_CPPFLAGS = -I$(srcdir)/.. \ + $(LIBGCRYPT_CFLAGS) \ +-- +2.1.0 + diff -Nru wireshark-1.12.0+git+4fab41a1/debian/patches/17_1.12.2_fix_TN5250_loop.patch wireshark-1.12.1+g01b65bf/debian/patches/17_1.12.2_fix_TN5250_loop.patch --- wireshark-1.12.0+git+4fab41a1/debian/patches/17_1.12.2_fix_TN5250_loop.patch 1969-12-31 19:00:00.000000000 -0500 +++ wireshark-1.12.1+g01b65bf/debian/patches/17_1.12.2_fix_TN5250_loop.patch 2014-12-11 15:28:59.000000000 -0500 @@ -0,0 +1,36 @@ +From e0349a8514409420c60d89ca12d2d562628cb29c Mon Sep 17 00:00:00 2001 +From: Martin Kaiser +Date: Mon, 20 Oct 2014 22:37:51 +0200 +Subject: [PATCH 1/5] tn5250: fix an endless loop, exit when offset is not + incremented + +Bug: 10596 +Change-Id: I64509aa49fce4893dee4e7a74a560e09a98830f6 +Reviewed-on: https://code.wireshark.org/review/4878 +Reviewed-by: Martin Kaiser +Tested-by: Martin Kaiser +(cherry picked from commit bc2726578156f3608960fc65ce1f691639e6addc) +Reviewed-on: https://code.wireshark.org/review/4879 +Reviewed-by: Evan Huus +Reviewed-on: https://code.wireshark.org/review/5338 +Reviewed-by: Michael Mann +--- + epan/dissectors/packet-tn5250.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c +index a9ec088..0d46841 100644 +--- a/epan/dissectors/packet-tn5250.c ++++ b/epan/dissectors/packet-tn5250.c +@@ -4651,6 +4651,8 @@ dissect_write_structured_field(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offs + length = tvb_get_guint8(tvb,offset); + proto_tree_add_item(tn5250_tree, hf_tn5250_length, tvb, offset, + 1, ENC_BIG_ENDIAN); ++ if (length==0) ++ break; + proto_tree_add_item(tn5250_tree, hf_tn5250_dpt_ec, tvb, offset, + length, ENC_EBCDIC|ENC_NA); + offset += length; +-- +2.1.3 + diff -Nru wireshark-1.12.0+git+4fab41a1/debian/patches/18_1.12.2_fix_NCP_crash_1.patch wireshark-1.12.1+g01b65bf/debian/patches/18_1.12.2_fix_NCP_crash_1.patch --- wireshark-1.12.0+git+4fab41a1/debian/patches/18_1.12.2_fix_NCP_crash_1.patch 1969-12-31 19:00:00.000000000 -0500 +++ wireshark-1.12.1+g01b65bf/debian/patches/18_1.12.2_fix_NCP_crash_1.patch 2014-12-11 15:29:12.000000000 -0500 @@ -0,0 +1,37 @@ +From 54510127483ebe114b5a19d2f8d9f07abb6f3c1d Mon Sep 17 00:00:00 2001 +From: Evan Huus +Date: Sat, 25 Oct 2014 14:08:57 -0400 +Subject: [PATCH 2/5] ncp2222: initialize buffer in build_expert_data + +We do a bunch of conditional logic to fill in the buffer, and then were checking +strlen(buffer) to see if we'd actually filled it in or not, but if we hadn't +then the buffer was garbage and strlen(buffer) was throwing valgrind warnings. +Ensure this works as intended by setting the first byte of the buffer +unconditionally at the beginning, so strlen(buffer) returns 0 as expected in +that case. + +Bug: 10628 +Change-Id: I6f6c29fbbcb601b6ebccb3a4b312f0fa72c169ae +Reviewed-on: https://code.wireshark.org/review/4925 +Reviewed-by: Evan Huus +Reviewed-on: https://code.wireshark.org/review/5337 +Reviewed-by: Michael Mann +--- + epan/dissectors/packet-ncp2222.inc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc +index c055d48..b74b3b0 100644 +--- a/epan/dissectors/packet-ncp2222.inc ++++ b/epan/dissectors/packet-ncp2222.inc +@@ -2730,6 +2730,7 @@ build_expert_data(proto_tree *ncp_tree, const char *hf_name, char *buffer, + char temp_buffer[256]="\0"; + gboolean in_struct=FALSE; + ++ buffer[0] = '\0'; + tree_loc = ncp_tree->first_child; + for (tree_pointer=tree_loc; tree_pointer!=NULL; tree_pointer=tree_pointer->next) + { +-- +2.1.3 + diff -Nru wireshark-1.12.0+git+4fab41a1/debian/patches/19_1.12.2_fix_NCP_crash_2.patch wireshark-1.12.1+g01b65bf/debian/patches/19_1.12.2_fix_NCP_crash_2.patch --- wireshark-1.12.0+git+4fab41a1/debian/patches/19_1.12.2_fix_NCP_crash_2.patch 1969-12-31 19:00:00.000000000 -0500 +++ wireshark-1.12.1+g01b65bf/debian/patches/19_1.12.2_fix_NCP_crash_2.patch 2014-12-11 15:29:23.000000000 -0500 @@ -0,0 +1,39 @@ +From 6b8c5dba634cde2fe95fca81668337380f19d641 Mon Sep 17 00:00:00 2001 +From: Evan Huus +Date: Mon, 13 Oct 2014 12:55:40 -0400 +Subject: [PATCH 3/5] ncp2222: don't overflow buffer constructing string + +Fixes stack-smashing vuln. + +Somehow there was already an XXX in the code about this, but nobody realized at +the time it was worth fixing... really? + +Bug: 10552 +Change-Id: I849068bd6c45146339444f295b72430d3c6e08f2 +Reviewed-on: https://code.wireshark.org/review/4653 +Reviewed-by: Evan Huus +(cherry picked from commit b9988e2bbfc7c6c41ef82c559bd11a8c19170491) +Reviewed-on: https://code.wireshark.org/review/4654 +Reviewed-on: https://code.wireshark.org/review/5336 +Reviewed-by: Michael Mann +--- + epan/dissectors/packet-ncp2222.inc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc +index b74b3b0..7ef087c 100644 +--- a/epan/dissectors/packet-ncp2222.inc ++++ b/epan/dissectors/packet-ncp2222.inc +@@ -2756,8 +2756,7 @@ build_expert_data(proto_tree *ncp_tree, const char *hf_name, char *buffer, + case 18: + case 19: + case 20: /* string */ +- /* XXX: Should we verify: buffer_size is as large as value returned by get_finfo_length(...) ??? */ +- uni_to_string(get_finfo_value_string(PTREE_FINFO(tree_pointer)), get_finfo_length(PTREE_FINFO(tree_pointer)), buffer); ++ uni_to_string(get_finfo_value_string(PTREE_FINFO(tree_pointer)), MIN(get_finfo_length(PTREE_FINFO(tree_pointer)), buffer_size), buffer); + if (repeat_lookup > 0) { + if (strlen(temp_buffer) + strlen(buffer) < 250) { + g_strlcat(temp_buffer, buffer, 256); +-- +2.1.3 + diff -Nru wireshark-1.12.0+git+4fab41a1/debian/patches/20_1.12.2_fix_SigComp_crash.patch wireshark-1.12.1+g01b65bf/debian/patches/20_1.12.2_fix_SigComp_crash.patch --- wireshark-1.12.0+git+4fab41a1/debian/patches/20_1.12.2_fix_SigComp_crash.patch 1969-12-31 19:00:00.000000000 -0500 +++ wireshark-1.12.1+g01b65bf/debian/patches/20_1.12.2_fix_SigComp_crash.patch 2014-12-11 15:29:30.000000000 -0500 @@ -0,0 +1,39 @@ +From 9f8367d1a569a10778628981da8a877a1f6f9c3b Mon Sep 17 00:00:00 2001 +From: Evan Huus +Date: Tue, 4 Nov 2014 21:31:17 -0500 +Subject: [PATCH 4/5] sigcomp-udvm: fix invalid access + +Way back in 2006, svn r20041 (now gd408f2f6fc) worked around a problem by +limiting the amount of buffer dealt with in the udvm_state_access call (changing +it from state_minimum_access_length_buff[n] to STATE_MIN_ACCESS_LEN). + +The very next line however, tries to read the same amount of buffer to display +to the user - since it seems nobody ever applied a proper fix for the original +case, just apply the same workaround to the second call. + +Bug: 10662 +Change-Id: I32c81ee2a8eb7b30ff7ab1fbbb6ea5f206385d4b +Reviewed-on: https://code.wireshark.org/review/5125 +Reviewed-by: Evan Huus +Reviewed-on: https://code.wireshark.org/review/5331 +Reviewed-by: Michael Mann +--- + epan/sigcomp-udvm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c +index 1e23730..97c6736 100644 +--- a/epan/sigcomp-udvm.c ++++ b/epan/sigcomp-udvm.c +@@ -2705,7 +2705,7 @@ execute_next_instruction: + udvm_state_create(sha1buff, sha1_digest_buf, STATE_MIN_ACCESS_LEN); + /* end partial state-id change cco@iptel.org */ + proto_tree_add_text(udvm_tree,bytecode_tvb, 0, -1,"### Creating state ###"); +- proto_tree_add_string(udvm_tree,hf_id, bytecode_tvb, 0, 0, bytes_to_ep_str(sha1_digest_buf, state_minimum_access_length_buff[n])); ++ proto_tree_add_string(udvm_tree,hf_id, bytecode_tvb, 0, 0, bytes_to_ep_str(sha1_digest_buf, STATE_MIN_ACCESS_LEN)); + + n++; + +-- +2.1.3 + diff -Nru wireshark-1.12.0+git+4fab41a1/debian/patches/21_1.12.2_fix_AMQP_crash.patch wireshark-1.12.1+g01b65bf/debian/patches/21_1.12.2_fix_AMQP_crash.patch --- wireshark-1.12.0+git+4fab41a1/debian/patches/21_1.12.2_fix_AMQP_crash.patch 1969-12-31 19:00:00.000000000 -0500 +++ wireshark-1.12.1+g01b65bf/debian/patches/21_1.12.2_fix_AMQP_crash.patch 2014-12-11 15:29:42.000000000 -0500 @@ -0,0 +1,52 @@ +From 69875bf282dbd72486da981595f745a76c1346bd Mon Sep 17 00:00:00 2001 +From: Bill Meier +Date: Sun, 19 Oct 2014 10:04:39 -0400 +Subject: [PATCH 5/5] packet-amqp.c: Temporary/preliminary fix for Bug #10582 + (crash) + +This is a temporary/preliminary fix to prevent the buildbot fuzz-test + failures seen when testing the capture file attached to Bug #10582. + +As noted in the bug, a complete fix will require some reworking of + the amqp dissector. + +Change-Id: I2571f1eeb46a7eede04b8d809e87b95f1ff529df +Reviewed-on: https://code.wireshark.org/review/4835 +Reviewed-by: Bill Meier +(cherry picked from commit 8def8ef9c40189472a46d9b1ad95289780e09af5) +Reviewed-on: https://code.wireshark.org/review/4837 +Reviewed-by: Evan Huus +Reviewed-on: https://code.wireshark.org/review/5332 +Reviewed-by: Balint Reczey +--- + epan/dissectors/packet-amqp.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c +index 8609f87..558a4a4 100644 +--- a/epan/dissectors/packet-amqp.c ++++ b/epan/dissectors/packet-amqp.c +@@ -53,10 +53,20 @@ static int amqp_port = 5672; + + /* Generic defines */ + ++#if 0 + #define AMQP_INCREMENT(offset, addend, bound) {\ + offset += (addend);\ + THROW_ON((offset > bound), ReportedBoundsError); \ + } ++#else /* --> (temporary until in-progress code review completed; See Bug #10582) */ ++#define AMQP_INCREMENT(offset, addend, bound) {\ ++ THROW_ON( \ ++ (((unsigned)(offset) + (unsigned)(addend)) < (unsigned)(offset)) || \ ++ (((unsigned)(offset) + (unsigned)(addend)) > (unsigned)(bound )) \ ++ , ReportedBoundsError); \ ++ offset += (addend); \ ++} ++#endif + + /* + * This dissector handles AMQP 0-9, 0-10 and 1.0. The conversation structure +-- +2.1.3 + diff -Nru wireshark-1.12.0+git+4fab41a1/debian/patches/series wireshark-1.12.1+g01b65bf/debian/patches/series --- wireshark-1.12.0+git+4fab41a1/debian/patches/series 2014-06-17 14:41:31.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/debian/patches/series 2014-12-12 10:38:27.000000000 -0500 @@ -1,3 +1,4 @@ +0001-Set-library-.so-versions-to-their-proper-value.patch 01_Disable-building-documentation-in-PDF-and-release-no.patch 04_asn2wrs_ply.patch 05_note-README-when-running-as-root.patch @@ -5,3 +6,8 @@ 08_wireshark-desktop-menu.patch 09_idl2wrs.patch 16_licence_about_location.patch +17_1.12.2_fix_TN5250_loop.patch +18_1.12.2_fix_NCP_crash_1.patch +19_1.12.2_fix_NCP_crash_2.patch +20_1.12.2_fix_SigComp_crash.patch +21_1.12.2_fix_AMQP_crash.patch diff -Nru wireshark-1.12.0+git+4fab41a1/doc/Makefile.am wireshark-1.12.1+g01b65bf/doc/Makefile.am --- wireshark-1.12.0+git+4fab41a1/doc/Makefile.am 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/doc/Makefile.am 2014-09-16 12:09:03.000000000 -0400 @@ -248,20 +248,25 @@ README.design \ README.developer \ README.display_filter \ + README.dissector \ + README.epan_child \ README.heuristic \ README.idl2wrs \ README.malloc \ README.packaging \ README.plugins \ README.python \ + README.qt \ README.regression \ README.request_response_tracking\ README.stats_tree \ README.tapping \ README.wmem \ + README.wslua \ README.xml-output \ asn2deb.pod \ capinfos.pod \ + captype.pod \ dfilter2pod.pl \ dftest.pod \ dumpcap.pod \ diff -Nru wireshark-1.12.0+git+4fab41a1/doc/tshark.pod wireshark-1.12.1+g01b65bf/doc/tshark.pod --- wireshark-1.12.0+git+4fab41a1/doc/tshark.pod 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/doc/tshark.pod 2014-09-16 12:09:03.000000000 -0400 @@ -633,8 +633,9 @@ =item -r EinfileE Read packet data from I, can be any supported capture file format -(including gzipped files). It's B possible to use named pipes -or stdin here! +(including gzipped files). It is possible to use named pipes or stdin (-) +here but only with certain (not compressed) capture file formats (in +particular: those that can be read without seeking backwards). =item -R ERead filterE diff -Nru wireshark-1.12.0+git+4fab41a1/docbook/asciidoc.conf wireshark-1.12.1+g01b65bf/docbook/asciidoc.conf --- wireshark-1.12.0+git+4fab41a1/docbook/asciidoc.conf 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/docbook/asciidoc.conf 2014-09-16 12:09:03.000000000 -0400 @@ -4,7 +4,7 @@ # Yes, these are fake macros. # We should probably replace some or all of them with attributes. -wireshark-version:\[\]=1.12.0 +wireshark-version:\[\]=1.12.1 wireshark-major-minor-version:\[\]=1.12 wireshark-authors-url:\[\]=http://www.wireshark.org/about.html#authors diff -Nru wireshark-1.12.0+git+4fab41a1/docbook/Makefile.common wireshark-1.12.1+g01b65bf/docbook/Makefile.common --- wireshark-1.12.0+git+4fab41a1/docbook/Makefile.common 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/docbook/Makefile.common 2014-09-16 12:09:03.000000000 -0400 @@ -22,6 +22,7 @@ ws.css WSUG_GRAPHICS = \ + wsug_graphics/captureOptions.png \ wsug_graphics/ws-analyze-menu.png \ wsug_graphics/ws-bytes-pane-tabs.png \ wsug_graphics/ws-bytes-pane.png \ @@ -31,9 +32,16 @@ wsug_graphics/ws-capture-interfaces-win32.png \ wsug_graphics/ws-capture-menu.png \ wsug_graphics/ws-capture-options.png \ + wsug_graphics/ws-capture-options-compile-selected-bpfs.png \ + wsug_graphics/ws-capture-options-manage-interfaces-local.png \ + wsug_graphics/ws-capture-options-manage-interfaces-pipes.png \ + wsug_graphics/ws-capture-options-manage-interfaces-remote-plus.png \ + wsug_graphics/ws-capture-options-manage-interfaces-remote.png \ + wsug_graphics/ws-capture-options-manage-interfaces.png \ wsug_graphics/ws-capture-options-remote-capture.png \ wsug_graphics/ws-capture-options-remote-interface.png \ wsug_graphics/ws-capture-options-remote-settings.png \ + wsug_graphics/ws-capture-options-settings.png \ wsug_graphics/ws-capture-preferences.png \ wsug_graphics/ws-choose-color-rule.png \ wsug_graphics/ws-coloring-fields.png \ diff -Nru wireshark-1.12.0+git+4fab41a1/docbook/release-notes.asciidoc wireshark-1.12.1+g01b65bf/docbook/release-notes.asciidoc --- wireshark-1.12.0+git+4fab41a1/docbook/release-notes.asciidoc 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/docbook/release-notes.asciidoc 2014-09-16 12:09:03.000000000 -0400 @@ -11,221 +11,189 @@ The following bugs have been fixed: -//* ws-buglink:5000[] -//* ws-buglink:6000[Wireshark bug] -//* cve-idlink:2013-2486[] -//* Wireshark always manages to score tickets for Burning Man, Coachella, and SXSW while you end up working double shifts. (ws-buglink:0000[]) - -* "On-the-wire" packet lengths are limited to 65535 bytes. (ws-buglink:8808[], ws-buglink:9390[]) -* "Follow TCP Stream" shows only the first HTTP request and response. (ws-buglink:9044[]) -* Files with pcap-ng Simple Packet Blocks can't be read. (ws-buglink:9200[]) -* MPLS-over-PPP isn't recognized. (ws-buglink:9492[]) +// Link templates: ws-buglink:5000[] ws-buglink:6000[Wireshark bug] cve-idlink:2013-2486[] -=== New and Updated Features +The following vulnerabilities have been fixed. -The following features are new or have been significantly updated since version -1.10: +* ws-salink:2014-13[] ++ +MEGACO dissector infinite loop. +// Fixed in master: g9112a09 +// Fixed in master-1.12: g6295e53 +// Fixed in master-1.10: gfeed72f +(ws-buglink:10333[]) +cve-idlink:2014-6423[] + +* ws-salink:2014-14[] ++ +Netflow dissector crash. +// Fixed in master: g4469825 +// Fixed in master-1.12: g2035d31 +// Fixed in master-1.10: g6e67016 +(ws-buglink:10370[]) +cve-idlink:2014-6424[] + +* ws-salink:2014-15[] ++ +CUPS dissector crash. +// Fixed in master: gc10396d +// Fixed in master-1.12: g2035d31 +(ws-buglink:10353[]) +cve-idlink:2014-6425[] + +* ws-salink:2014-16[] ++ +HIP dissector infinite loop. +// Fixed in master: gd9e5021 +// Fixed in master-1.12: g9069d7b +cve-idlink:2014-6426[] + +* ws-salink:2014-17[] ++ +RTSP dissector crash. +// Fixed in master: g7395915 +// Fixed in master-1.12: g949cca0 +// Fixed in master-1.10: gd762bd3 +(ws-buglink:10381[]) +cve-idlink:2014-6427[] + +* ws-salink:2014-18[] ++ +SES dissector crash. +// Fixed in master: g433a444 +// Fixed in master-1.12: g0942b2c +// Fixed in master-1.10: g6763e8d +(ws-buglink:10454[]) +cve-idlink:2014-6428[] + +* ws-salink:2014-19[] ++ +Sniffer file parser crash. +// Fixed in master: g47c5929 +// Fixed in master-1.12: g4413725 +// Fixed in master-1.10: g9a7abcc +(ws-buglink:10461[]) +cve-idlink:2014-6429[] +cve-idlink:2014-6430[] +cve-idlink:2014-6431[] +cve-idlink:2014-6432[] -* The Windows installer now uninstalls the previous version of Wireshark - silently. You can still run the uninstaller manually beforehand if you wish - to run it interactively. -* Expert information is now filterable when the new API is in use. -* The "Number" column shows related packets and protocol conversation spans - (Qt only). -* When manipulating packets with editcap using the -C and/or - -s options, it is now possible to also adjust the original frame - length using the -L option. -* You can now pass the -C option to editcap multiple times, which - allows you to chop bytes from the beginning of a packet as well as at the end - of a packet in a single step. -* You can now specify an optional offset to the -C option for editcap, which - allows you to start chopping from that offset instead of from the absolute - packet beginning or end. -* "malformed" display filter has been renamed to "_ws.malformed". A handful of - other filters have been given the "_ws." prefix to note they are Wireshark - application specific filters and not dissector filters. -* The Kerberos dissector has been replaced with an auto generated one from ASN1 - protocol description, changing a lot of filter names. - -Additionally the Windows installers have an extra component: a preview of the -upcoming user interface for Wireshark 2.0. - -The following features are new (or have been significantly updated) -since version 1.11.3: - -* Transport name resolution is now disabled by default. -* Support has been added for all versions of the DCBx protocol. -* Cleanup of LLDP code, all dissected fields are now navigable. - -The following features are new (or have been significantly updated) -since version 1.11.2: - -* Qt port: - -** The About dialog has been added -** The Capture Interfaces dialog has been added. -** The Decode As dialog has been added. It managed to swallow up the -User Specified Decodes dialog as well. -** The Export PDU dialog has been added. -** Several SCTP dialogs have been added. -** The statistics tree (the backend for many Statistics and Telephony menu -items) dialog has been added. -** The I/O Graph dialog has been added. -** French translation has updated. - -The following features are new (or have been significantly updated) -since version 1.11.1: - -* Mac OS X packaging has been improved. - -The following features are new (or have been significantly updated) -since version 1.11.0: - -* Dissector output may be encoded as UTF-8. This includes TShark output. - -* Qt port: - -** The Follow Stream dialog now supports packet and TCP stream selection. -** A Flow Graph (sequence diagram) dialog has been added. -** The main window now respects geometry preferences. - -=== Removed Dissectors - -* The ASN1 plugin has been removed as it's deemed obsolete. -* The GNM dissector has been removed as it was never used. -* The Kerberos hand made dissector has been replaced by one generated from ASN1 code. - -=== Platform Support - -Support for Windows XP has been deprecated. We will make an effort to support it -for as long as possible but our ability to do so depends on upstream packages -and other factors beyond our control. -U3 packages are no longer supported or provided. +The following bugs have been fixed: -This is the last major release that will support 32-bit versions of Mac OS X. +//* Wireshark always manages to score tickets for Burning Man, Coachella, and +// SXSW while you end up working double shifts. (ws-buglink:0000[]) -=== New Protocol Support +* Wireshark can crash during remote capture (rpcap) configuration. + (ws-buglink:3554[], ws-buglink:6922[], ws-buglink:7021) ---sort-and-group-- +* 802.11 capture does not decrypt/decode DHCP response. (ws-buglink:8734[]) -29West -802.1AE Secure tag -A21 -ACR122 -ADB Client-Server -AllJoyn -Apple PKTAP -Aruba Instant AP -ASTERIX -ATN -Bencode -Bluetooth 3DS -Bluetooth HSP -Bluetooth Linux Monitor Transport -Bluetooth Low Energy -Bluetooth Low Energy RF Info -CARP -CFDP -Cisco MetaData -DCE/RPC MDSSVC -DeviceNet -Ethernet Local Management Interface (E-LMI) -Ethernet Passive Optical Network (EPON) -ELF file format -EXPORTED PDU -FINGER -HDMI -High-Speed LAN Instrument Protocol (HiSLIP) -HTTP2 -IDRP -IEEE 1722a -ILP -iWARP Direct Data Placement and Remote Direct Memory Access Protocol -Kafka -Kyoto Tycoon -Landis & Gyr Telegyr 8979 -LBM -LBMC -LBMPDM -LBMPDM-TCP -LBMR -LBT-RM -LBT-RU -LBT-TCP -Lightweight Mesh (v1.1.1) -Link16 -Linux netlink -Linux netlink netfilter -Linux rtnetlink (route netlink) -Linux netlink sock diag -Logcat -MBIM -Media Agnostic USB (MA USB) -MiNT -MP4 / ISOBMFF file format -MQ Telemetry Transport Protocol -MS NLB (Rewrite) -Novell PKIS certificate extensions -NXP PN532 HCI -OpenFlow -Open Sound Control -PDC -Pathport -Picture Transfer Protocol Over IP -PKTAP -Private Data Channel -QUIC (Quick UDP Internet Connections) -SAE J1939 -SEL RTAC (Real Time Automation Controller) EIA-232 Serial-Line Dissection -Sippy RTPproxy -SMB-Direct -SPDY -STANAG 4607 -STANAG 5066 DTS -STANAG 5066 SIS -Tinkerforge -Ubertooth -UDT -URL Encoded Form Data -USB Communications and CDC Control -USB Device Firmware Upgrade -VP8 -WHOIS -Wi-Fi Display -ZigBee Green Power profile +* Extra quotes around date fields (FT_ABSOLUTE_TIME) when using -E quote=d or s. (ws-buglink:10213[]) ---sort-and-group-- +* No progress line in "VOIP RTP Player". (ws-buglink:10307[]) -=== Updated Protocol Support +* MIPv6 Service Selection Identifier parse error. (ws-buglink:10323[]) -Too many protocols have been updated to list here. +* Probably wrong length check in proto_item_set_end. (ws-buglink:10329[]) -=== New and Updated Capture File Support +* 802.11 BA sequence number decode is broken. (ws-buglink:10334[]) ---sort-and-group-- +* wmem_alloc_array() "succeeds" (and clobbers memory) when requested to allocate + 0xaaaaaaaa items of size 12. (ws-buglink:10343[]) -Netscaler 2.6 -STANAG 4607 -STANAG 5066 Data Transfer Sublayer +* Different dissection results for same file. (ws-buglink:10348[]) ---sort-and-group-- +* Mergecap wildcard breaks in version 1.12.0. (ws-buglink:10354[]) + +* Diameter TCP reassemble. (ws-buglink:10362[]) + +* TRILL NLPID 0xc0 unknown to Wireshark. (ws-buglink:10382[]) + +* BTLE advertising header flags (RxAdd/TxAdd) dissected incorrectly. + (ws-buglink:10384[]) + +* Ethernet OAM (CFM) frames including TLV's are wrongly decoded as malformed. + (ws-buglink:10385[]) + +* BGP4: Wireshark skipped some potion of AS_PATH. (ws-buglink:10399[]) + +* MAC address name resolution is broken. (ws-buglink:10344[]) + +* Wrong decoding of RPKI RTR End of Data PDU. (ws-buglink:10411[]) + +* SSL/TLS dissector incorrectly interprets length for status_request_v2 hello + extension. (ws-buglink:10416[]) + +* Misparsed NTP control assignments with empty values. (ws-buglink:10417[]) + +* 6LoWPAN multicast address decompression problems. (ws-buglink:10426[]) + +* Netflow v9 flowset not decoded if options template has zero-length scope + section. (ws-buglink:10432[]) -=== Major API Changes +* GUI Hangs when Selecting Path to GeoIP Files. (ws-buglink:10434[]) -The libwireshark API has undergone some major changes: +* AX.25 dissector prints unprintable characters. (ws-buglink:10439[]) -* A more flexible, modular memory manager (wmem) has been added. It was - available experimentally in 1.10 but is now mature and has mostly - replaced the old emem API (which is deprecated). -* A new API for expert information has been added, replacing the old one. -* The tvbuff API has been cleaned up: tvb_length has been renamed to - tvb_captured_length for clarity, and tvb_get_string and tvb_get_stringz - have been deprecated in favour of tvb_get_string_enc and - tvb_get_stringz_enc. -* dissector_try_heuristic() signature has been changed to return heur_dtbl_entry_t - to make it possible to save it and use it in subsequent calls to avoid the overhead - of going trough the heuristics list. +* 6LoWPAN context handling not working. (ws-buglink:10443[]) + +* SIP: When export to a CSV, Info is changed to differ. (ws-buglink:10453[]) + +* Typo in packet-netflow.c. (ws-buglink:10458[]) + +* Incorrect MPEG-TS decoding (OPCR field). (ws-buglink:10446[]) + +=== New and Updated Features + +There are no new features in this release. + +=== New Protocol Support + +There are no new protocols in this release. + +=== Updated Protocol Support + +--sort-and-group-- +6LoWPAN +A21 +ACR122 +Art-Net +AX.25 +BGP +BTLE +CAPWAP +Ethernet OAM +DIAMETER +DICOM +DVB-CI +HIP +HiSLIP +HTTP2 +IEEE 802.11 +MAUSB +MEGACO +MIPv6 +MP2T +Netflow +NTP +openSAFETY +OSI +RDM +RPKI RTR +RTSP +SES +SIP +TLS +Token Ring MAC +--sort-and-group-- + +=== New and Updated Capture File Support + +--sort-and-group-- +DOS Sniffer +NetScaler +--sort-and-group-- == Getting Wireshark diff -Nru wireshark-1.12.0+git+4fab41a1/docbook/wsdg_src/WSDG_chapter_build_intro.asciidoc wireshark-1.12.1+g01b65bf/docbook/wsdg_src/WSDG_chapter_build_intro.asciidoc --- wireshark-1.12.0+git+4fab41a1/docbook/wsdg_src/WSDG_chapter_build_intro.asciidoc 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/docbook/wsdg_src/WSDG_chapter_build_intro.asciidoc 2014-09-16 12:09:03.000000000 -0400 @@ -16,7 +16,7 @@ * File I/O - using Wireshark's own wiretap library -* Capture - using the libpcap/winpcap library, in /wiretap +* Capture - using the libpcap/winpcap library, in '/wiretap' * User interface - using the Qt or $$GTK+$$ and associated libraries diff -Nru wireshark-1.12.0+git+4fab41a1/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc wireshark-1.12.1+g01b65bf/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc --- wireshark-1.12.0+git+4fab41a1/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/docbook/wsdg_src/WSDG_chapter_dissection.asciidoc 2014-09-16 12:09:03.000000000 -0400 @@ -15,7 +15,7 @@ Every dissection starts with the Frame dissector which dissects the packet details of the capture file itself (e.g. timestamps). From there it passes the -data on to the the lowest-level data dissector, e.g. the Ethernet dissector for +data on to the lowest-level data dissector, e.g. the Ethernet dissector for the Ethernet header. The payload is then passed on to the next dissector (e.g. IP) and so on. At each stage, details of the packet will be decoded and displayed. diff -Nru wireshark-1.12.0+git+4fab41a1/docbook/wsdg_src/WSDG_chapter_works.asciidoc wireshark-1.12.1+g01b65bf/docbook/wsdg_src/WSDG_chapter_works.asciidoc --- wireshark-1.12.0+git+4fab41a1/docbook/wsdg_src/WSDG_chapter_works.asciidoc 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/docbook/wsdg_src/WSDG_chapter_works.asciidoc 2014-09-16 12:09:03.000000000 -0400 @@ -50,15 +50,15 @@ * Display Filters - The display filter engine at 'epan/dfilter'. -Wiretap:: The wiretap library is used to read andwrite capture files in libpcap, +Wiretap:: The wiretap library is used to read and write capture files in libpcap, pcapng, and many other file formats. Source code is in the 'wiretap' directory. -Capture:: The interface with the capture engine. Source code in the +Capture:: The interface with the capture engine. Source code is in the root directory. Dumpcap:: The capture engine itself. This is the only part that is to execute -with elevated privileges. Source code in the root directory. +with elevated privileges. Source code is in the root directory. WinPcap and libpcap:: These are separate libraries that provide packet capture and filtering support on different platforms. The filtering WinPcap and libpcap @@ -80,7 +80,7 @@ etc) to run with normal user privileges. To hide all the low-level machine dependent details from Wireshark, the libpcap -and WinPcap (see <>) libraries is used. These libraries provide a +and WinPcap (see <>) libraries are used. These libraries provide a general purpose interface to capture packets and are used by a wide variety of applications. diff -Nru wireshark-1.12.0+git+4fab41a1/echld/Makefile.am wireshark-1.12.1+g01b65bf/echld/Makefile.am --- wireshark-1.12.0+git+4fab41a1/echld/Makefile.am 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/echld/Makefile.am 2014-09-16 12:09:03.000000000 -0400 @@ -63,7 +63,8 @@ EXTRA_DIST = \ CMakeLists.txt \ - Makefile.common + Makefile.common \ + Makefile.nmake CLEANFILES = \ libechld.a \ diff -Nru wireshark-1.12.0+git+4fab41a1/epan/address_to_str.c wireshark-1.12.1+g01b65bf/epan/address_to_str.c --- wireshark-1.12.0+git+4fab41a1/epan/address_to_str.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/address_to_str.c 2014-09-16 12:09:03.000000000 -0400 @@ -54,6 +54,7 @@ #include "value_string.h" #include "addr_resolv.h" #include "wsutil/pint.h" +#include "wsutil/str_util.h" #include "atalk-utils.h" #include "sna-utils.h" #include "osi-utils.h" @@ -627,8 +628,12 @@ case AT_AX25: addrdata = (const guint8 *)addr->data; g_snprintf(buf, buf_len, "%c%c%c%c%c%c-%02d", - (addrdata[0] >> 1) & 0x7f, (addrdata[1] >> 1) & 0x7f, (addrdata[2] >> 1) & 0x7f, - (addrdata[3] >> 1) & 0x7f, (addrdata[4] >> 1) & 0x7f, (addrdata[5] >> 1) & 0x7f, + printable_char_or_period(addrdata[0] >> 1), + printable_char_or_period(addrdata[1] >> 1), + printable_char_or_period(addrdata[2] >> 1), + printable_char_or_period(addrdata[3] >> 1), + printable_char_or_period(addrdata[4] >> 1), + printable_char_or_period(addrdata[5] >> 1), (addrdata[6] >> 1) & 0x0f ); break; case AT_IEEE_802_15_4_SHORT: diff -Nru wireshark-1.12.0+git+4fab41a1/epan/addr_resolv.c wireshark-1.12.1+g01b65bf/epan/addr_resolv.c --- wireshark-1.12.0+git+4fab41a1/epan/addr_resolv.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/addr_resolv.c 2014-09-16 12:09:03.000000000 -0400 @@ -1283,7 +1283,7 @@ /* manuf needs only the 3 most significant octets of the ethernet address */ manuf_key = (int *)g_new(int, 1); - *manuf_key = (int)((addr[2] << 16) + (addr[1] << 8) + addr[0]); + *manuf_key = (int)((addr[0] << 16) + (addr[1] << 8) + addr[2]); g_hash_table_insert(manuf_hashtable, manuf_key, g_strdup(name)); return; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/crypt/airpdcap.c wireshark-1.12.1+g01b65bf/epan/crypt/airpdcap.c --- wireshark-1.12.0+git+4fab41a1/epan/crypt/airpdcap.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/crypt/airpdcap.c 2014-09-16 12:09:03.000000000 -0400 @@ -282,6 +282,16 @@ #define EAPKEY_MIC_LEN 16 /* length of the MIC key for EAPoL_Key packet's MIC using MD5 */ #define NONCE_LEN 32 +#define TKIP_GROUP_KEY_LEN 32 +#define CCMP_GROUP_KEY_LEN 16 +/* Minimum size of the key bytes payload for a TKIP group key in an M3 message*/ +#define TKIP_GROUP_KEYBYTES_LEN ( sizeof(RSN_IE) + 8 + TKIP_GROUP_KEY_LEN + 6 ) /* 72 */ +/* arbitrary upper limit */ +#define TKIP_GROUP_KEYBYTES_LEN_MAX ( TKIP_GROUP_KEYBYTES_LEN + 28 ) +/* Minimum size of the key bytes payload for a TKIP group key in a group key message */ +#define TKIP_GROUP_KEYBYTES_LEN_GKEY (8 + 8 + TKIP_GROUP_KEY_LEN ) /* 48 */ +/* size of CCMP key bytes payload */ +#define CCMP_GROUP_KEYBYTES_LEN ( sizeof(RSN_IE) + 8 + CCMP_GROUP_KEY_LEN + 6 ) /* 56 */ typedef struct { guint8 type; guint8 key_information[2]; /* Make this an array to avoid alignment issues */ @@ -293,10 +303,11 @@ guint8 key_id[8]; guint8 key_mic[EAPKEY_MIC_LEN]; guint8 key_data_len[2]; /* Make this an array rather than a U16 to avoid alignment shifting */ - guint8 ie[sizeof(RSN_IE)]; /* Make this an array to avoid alignment issues */ + guint8 ie[TKIP_GROUP_KEYBYTES_LEN_MAX]; /* Make this an array to avoid alignment issues */ } EAPOL_RSN_KEY, * P_EAPOL_RSN_KEY; - - +#define RSN_KEY_WITHOUT_KEYBYTES_LEN sizeof(EAPOL_RSN_KEY)-TKIP_GROUP_KEYBYTES_LEN_MAX +/* Minimum possible group key msg size (group key msg using CCMP as cipher)*/ +#define GROUP_KEY_PAYLOAD_LEN_MIN RSN_KEY_WITHOUT_KEYBYTES_LEN+CCMP_GROUP_KEY_LEN /* A note about some limitations with the WPA decryption: @@ -334,34 +345,36 @@ static void -AirPDcapDecryptWPABroadcastKey(const EAPOL_RSN_KEY *pEAPKey, guint8 *decryption_key, PAIRPDCAP_SEC_ASSOCIATION sa) +AirPDcapDecryptWPABroadcastKey(const EAPOL_RSN_KEY *pEAPKey, guint8 *decryption_key, PAIRPDCAP_SEC_ASSOCIATION sa, gboolean group_hshake) { guint8 new_key[32]; guint8 key_version; guint8 *szEncryptedKey; - guint16 key_len = 0; + guint16 key_bytes_len = 0; /* Length of the total key data field */ + guint16 key_len = 0; /* Actual group key length */ static AIRPDCAP_KEY_ITEM dummy_key; /* needed in case AirPDcapRsnaMng() wants the key structure */ /* We skip verifying the MIC of the key. If we were implementing a WPA supplicant we'd want to verify, but for a sniffer it's not needed. */ /* Preparation for decrypting the group key - determine group key data length */ - /* depending on whether it's a TKIP or AES encryption key */ + /* depending on whether the pairwise key is TKIP or AES encryption key */ key_version = AIRPDCAP_EAP_KEY_DESCR_VER(pEAPKey->key_information[1]); if (key_version == AIRPDCAP_WPA_KEY_VER_NOT_CCMP){ /* TKIP */ - key_len = pntoh16(pEAPKey->key_length); + key_bytes_len = pntoh16(pEAPKey->key_length); }else if (key_version == AIRPDCAP_WPA_KEY_VER_AES_CCMP){ /* AES */ - key_len = pntoh16(pEAPKey->key_data_len); + key_bytes_len = pntoh16(pEAPKey->key_data_len); } - if (key_len > sizeof(RSN_IE) || key_len == 0) { /* Don't read past the end of pEAPKey->ie */ + + if (key_bytes_len > TKIP_GROUP_KEYBYTES_LEN_MAX || key_bytes_len == 0) { /* Don't read past the end of pEAPKey->ie */ return; } /* Encrypted key is in the information element field of the EAPOL key packet */ - szEncryptedKey = (guint8 *)g_memdup(pEAPKey->ie, key_len); + szEncryptedKey = (guint8 *)g_memdup(pEAPKey->ie, key_bytes_len); - DEBUG_DUMP("Encrypted Broadcast key:", szEncryptedKey, key_len); + DEBUG_DUMP("Encrypted Broadcast key:", szEncryptedKey, key_bytes_len); DEBUG_DUMP("KeyIV:", pEAPKey->key_iv, 16); DEBUG_DUMP("decryption_key:", decryption_key, 16); @@ -370,6 +383,13 @@ memcpy(new_key+16, decryption_key, 16); DEBUG_DUMP("FullDecrKey:", new_key, 32); + /* As we have no concept of the prior association request at this point, we need to deduce the */ + /* group key cipher from the length of the key bytes. In WPA this is straightforward as the */ + /* keybytes just contain the GTK, and the GTK is only in the group handshake, NOT the M3. */ + /* In WPA2 its a little more tricky as the M3 keybytes contain an RSN_IE, but the group handshake */ + /* does not. Also there are other (variable length) items in the keybytes which we need to account */ + /* for to determine the true key length, and thus the group cipher. */ + if (key_version == AIRPDCAP_WPA_KEY_VER_NOT_CCMP){ guint8 dummy[256]; /* TKIP key */ @@ -377,11 +397,16 @@ /* group key is decrypted using RC4. Concatenate the IV with the 16 byte EK (PTK+16) to get the decryption key */ rc4_state_struct rc4_state; + + /* The WPA group key just contains the GTK bytes so deducing the type is straightforward */ + /* Note - WPA M3 doesn't contain a group key so we'll only be here for the group handshake */ + sa->wpa.key_ver = (key_bytes_len >=TKIP_GROUP_KEY_LEN)?AIRPDCAP_WPA_KEY_VER_NOT_CCMP:AIRPDCAP_WPA_KEY_VER_AES_CCMP; + crypt_rc4_init(&rc4_state, new_key, sizeof(new_key)); /* Do dummy 256 iterations of the RC4 algorithm (per 802.11i, Draft 3.0, p. 97 line 6) */ crypt_rc4(&rc4_state, dummy, 256); - crypt_rc4(&rc4_state, szEncryptedKey, key_len); + crypt_rc4(&rc4_state, szEncryptedKey, key_bytes_len); } else if (key_version == AIRPDCAP_WPA_KEY_VER_AES_CCMP){ /* AES CCMP key */ @@ -390,10 +415,17 @@ guint16 key_index; guint8 *decrypted_data; + /* If this EAPOL frame is part of a separate group key handshake then this contains no */ + /* RSN IE, so we can deduct that from the calculation. */ + if (group_hshake) + sa->wpa.key_ver = (key_bytes_len >= (TKIP_GROUP_KEYBYTES_LEN_GKEY))?AIRPDCAP_WPA_KEY_VER_NOT_CCMP:AIRPDCAP_WPA_KEY_VER_AES_CCMP; + else + sa->wpa.key_ver = (key_bytes_len >= (TKIP_GROUP_KEYBYTES_LEN))?AIRPDCAP_WPA_KEY_VER_NOT_CCMP:AIRPDCAP_WPA_KEY_VER_AES_CCMP; + /* This storage is needed for the AES_unwrap function */ - decrypted_data = (guint8 *) g_malloc(key_len); + decrypted_data = (guint8 *) g_malloc(key_bytes_len); - AES_unwrap(decryption_key, 16, szEncryptedKey, key_len, decrypted_data); + AES_unwrap(decryption_key, 16, szEncryptedKey, key_bytes_len, decrypted_data); /* With WPA2 what we get after Broadcast Key decryption is an actual RSN structure. The key itself is stored as a GTK KDE @@ -402,7 +434,7 @@ key_found = FALSE; key_index = 0; - while(key_index < key_len && !key_found){ + while(key_index < key_bytes_len && !key_found){ guint8 rsn_id; /* Get RSN ID */ @@ -417,19 +449,20 @@ if (key_found){ /* Skip over the GTK header info, and don't copy past the end of the encrypted data */ - memcpy(szEncryptedKey, decrypted_data+key_index+8, key_len-key_index-8); + memcpy(szEncryptedKey, decrypted_data+key_index+8, key_bytes_len-key_index-8); } g_free(decrypted_data); } + key_len = (sa->wpa.key_ver==AIRPDCAP_WPA_KEY_VER_NOT_CCMP)?TKIP_GROUP_KEY_LEN:CCMP_GROUP_KEY_LEN; + /* Decrypted key is now in szEncryptedKey with len of key_len */ DEBUG_DUMP("Broadcast key:", szEncryptedKey, key_len); /* Load the proper key material info into the SA */ sa->key = &dummy_key; /* we just need key to be not null because it is checked in AirPDcapRsnaMng(). The WPA key materials are actually in the .wpa structure */ sa->validKey = TRUE; - sa->wpa.key_ver = key_version; /* Since this is a GTK and its size is only 32 bytes (vs. the 64 byte size of a PTK), we fake it and put it in at a 32-byte offset so the */ /* AirPDcapRsnaMng() function will extract the right piece of the GTK for decryption. (The first 16 bytes of the GTK are used for decryption.) */ @@ -458,7 +491,6 @@ return &ctx->sa[sa_index]; } -#define GROUP_KEY_PAYLOAD_LEN (8+4+sizeof(EAPOL_RSN_KEY)) static INT AirPDcapScanForGroupKey( PAIRPDCAP_CONTEXT ctx, const guint8 *data, @@ -484,10 +516,9 @@ #ifdef _DEBUG CHAR msgbuf[255]; #endif - AIRPDCAP_DEBUG_TRACE_START("AirPDcapScanForGroupKey"); - if (mac_header_len + GROUP_KEY_PAYLOAD_LEN < tot_len) { + if (mac_header_len + GROUP_KEY_PAYLOAD_LEN_MIN > tot_len) { AIRPDCAP_DEBUG_PRINT_LINE("AirPDcapScanForGroupKey", "Message too short", AIRPDCAP_DEBUG_LEVEL_3); return AIRPDCAP_RET_NO_VALID_HANDSHAKE; } @@ -512,7 +543,7 @@ /* get and check the body length (IEEE 802.1X-2004, pg. 25) */ bodyLength=pntoh16(data+offset+2); - if ((tot_len-offset-4) < bodyLength) { + if ((tot_len-offset-4) > bodyLength) { AIRPDCAP_DEBUG_PRINT_LINE("AirPDcapScanForGroupKey", "EAPOL body too short", AIRPDCAP_DEBUG_LEVEL_3); return AIRPDCAP_RET_NO_VALID_HANDSHAKE; } @@ -585,7 +616,7 @@ } /* Extract the group key and install it in the SA */ - AirPDcapDecryptWPABroadcastKey(pEAPKey, sta_sa->wpa.ptk+16, sa); + AirPDcapDecryptWPABroadcastKey(pEAPKey, sta_sa->wpa.ptk+16, sa, TRUE); }else{ AIRPDCAP_DEBUG_PRINT_LINE("AirPDcapScanForGroupKey", "Skipping: not an EAPOL packet", AIRPDCAP_DEBUG_LEVEL_3); @@ -1448,7 +1479,7 @@ if (broadcast_sa == NULL){ return AIRPDCAP_RET_UNSUCCESS; } - AirPDcapDecryptWPABroadcastKey(pEAPKey, sa->wpa.ptk+16, broadcast_sa); + AirPDcapDecryptWPABroadcastKey(pEAPKey, sa->wpa.ptk+16, broadcast_sa, FALSE); } return AIRPDCAP_RET_SUCCESS_HANDSHAKE; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dfilter/dfunctions.c wireshark-1.12.1+g01b65bf/epan/dfilter/dfunctions.c --- wireshark-1.12.0+git+4fab41a1/epan/dfilter/dfunctions.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dfilter/dfunctions.c 2014-09-16 12:09:03.000000000 -0400 @@ -171,7 +171,7 @@ case STTYPE_FIELD: hfinfo = (header_field_info *)stnode_data(st_node); ftype = hfinfo->type; - if (IS_FT_STRING(ftype)) { + if (!IS_FT_STRING(ftype)) { dfilter_fail("Only strings can be used in upper() or lower() or len()"); THROW(TypeError); } diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-6lowpan.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-6lowpan.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-6lowpan.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-6lowpan.c 2014-09-16 12:09:03.000000000 -0400 @@ -135,11 +135,12 @@ #define LOWPAN_IPHC_ADDR_COMPRESSED 0x3 /* IPHC multicast address modes. */ +#define LOWPAN_IPHC_MCAST_FULL 0x0 #define LOWPAN_IPHC_MCAST_48BIT 0x1 #define LOWPAN_IPHC_MCAST_32BIT 0x2 #define LOWPAN_IPHC_MCAST_8BIT 0x3 -#define LOWPAN_IPHC_MCAST_STATEFUL_48BIT 0x1 +#define LOWPAN_IPHC_MCAST_STATEFUL_48BIT 0x0 /* IPHC Traffic class and flow label field sizes (in bits) */ #define LOWPAN_IPHC_ECN_BITS 2 @@ -341,12 +342,30 @@ { LOWPAN_IPHC_ADDR_COMPRESSED, "Compressed" }, { 0, NULL } }; +static const value_string lowpan_iphc_saddr_stateful_modes [] = { + { LOWPAN_IPHC_ADDR_FULL_INLINE, "Unspecified address (::)" }, + { LOWPAN_IPHC_ADDR_64BIT_INLINE,"64-bits inline" }, + { LOWPAN_IPHC_ADDR_16BIT_INLINE,"16-bits inline" }, + { LOWPAN_IPHC_ADDR_COMPRESSED, "Compressed" }, + { 0, NULL } +}; +static const value_string lowpan_iphc_daddr_stateful_modes [] = { + { LOWPAN_IPHC_ADDR_64BIT_INLINE,"64-bits inline" }, + { LOWPAN_IPHC_ADDR_16BIT_INLINE,"16-bits inline" }, + { LOWPAN_IPHC_ADDR_COMPRESSED, "Compressed" }, + { 0, NULL } +}; static const value_string lowpan_iphc_mcast_modes [] = { + { LOWPAN_IPHC_MCAST_FULL, "Inline" }, { LOWPAN_IPHC_MCAST_48BIT, "48-bits inline" }, { LOWPAN_IPHC_MCAST_32BIT, "32-bits inline" }, { LOWPAN_IPHC_MCAST_8BIT, "8-bits inline" }, { 0, NULL } }; +static const value_string lowpan_iphc_mcast_stateful_modes [] = { + { LOWPAN_IPHC_MCAST_STATEFUL_48BIT, "48-bits inline" }, + { 0, NULL } +}; static const value_string lowpan_nhc_patterns [] = { { LOWPAN_NHC_PATTERN_EXT, "IPv6 extension header" }, { LOWPAN_NHC_PATTERN_UDP, "UDP compression header" }, @@ -1400,19 +1419,33 @@ iphc_src_mode = (iphc_flags & LOWPAN_IPHC_FLAG_SRC_MODE) >> LOWPAN_IPHC_FLAG_OFFSET_SRC_MODE; iphc_dst_mode = (iphc_flags & LOWPAN_IPHC_FLAG_DST_MODE) >> LOWPAN_IPHC_FLAG_OFFSET_DST_MODE; if (tree) { - const value_string *dam_vs; + const value_string *am_vs; proto_tree_add_uint (iphc_tree, hf_6lowpan_iphc_flag_tf, tvb, offset, 2, iphc_flags & LOWPAN_IPHC_FLAG_FLOW); proto_tree_add_boolean (iphc_tree, hf_6lowpan_iphc_flag_nhdr, tvb, offset, 2, iphc_flags & LOWPAN_IPHC_FLAG_NHDR); proto_tree_add_uint (iphc_tree, hf_6lowpan_iphc_flag_hlim, tvb, offset, 2, iphc_flags & LOWPAN_IPHC_FLAG_HLIM); proto_tree_add_boolean (iphc_tree, hf_6lowpan_iphc_flag_cid, tvb, offset, 2, iphc_flags & LOWPAN_IPHC_FLAG_CONTEXT_ID); proto_tree_add_boolean (iphc_tree, hf_6lowpan_iphc_flag_sac, tvb, offset, 2, iphc_flags & LOWPAN_IPHC_FLAG_SRC_COMP); - proto_tree_add_uint(iphc_tree, hf_6lowpan_iphc_flag_sam, tvb, offset, 2, iphc_flags & LOWPAN_IPHC_FLAG_SRC_MODE); + am_vs = iphc_flags & LOWPAN_IPHC_FLAG_SRC_COMP ? lowpan_iphc_saddr_stateful_modes : lowpan_iphc_addr_modes; + proto_tree_add_uint_format_value(iphc_tree, hf_6lowpan_iphc_flag_sam, tvb, offset, 2, iphc_flags & LOWPAN_IPHC_FLAG_SRC_MODE, + "%s (0x%04x)", val_to_str_const(iphc_src_mode, am_vs, "Reserved"), iphc_src_mode); proto_tree_add_boolean (iphc_tree, hf_6lowpan_iphc_flag_mcast, tvb, offset, 2, iphc_flags & LOWPAN_IPHC_FLAG_MCAST_COMP); proto_tree_add_boolean (iphc_tree, hf_6lowpan_iphc_flag_dac, tvb, offset, 2, iphc_flags & LOWPAN_IPHC_FLAG_DST_COMP); /* Destination address mode changes meanings depending on multicast compression. */ - dam_vs = (iphc_flags & LOWPAN_IPHC_FLAG_MCAST_COMP) ? (lowpan_iphc_mcast_modes) : (lowpan_iphc_addr_modes); + if (iphc_flags & LOWPAN_IPHC_FLAG_MCAST_COMP) { + if (iphc_flags & LOWPAN_IPHC_FLAG_DST_COMP) { + am_vs = lowpan_iphc_mcast_stateful_modes; + } else { + am_vs = lowpan_iphc_mcast_modes; + } + } else { + if (iphc_flags & LOWPAN_IPHC_FLAG_DST_COMP) { + am_vs = lowpan_iphc_daddr_stateful_modes; + } else { + am_vs = lowpan_iphc_addr_modes; + } + } ti_dam = proto_tree_add_uint_format_value(iphc_tree, hf_6lowpan_iphc_flag_dam, tvb, offset, 2, - iphc_flags & LOWPAN_IPHC_FLAG_DST_MODE, "%s (0x%04x)", val_to_str_const(iphc_dst_mode, dam_vs, "Reserved"), iphc_dst_mode); + iphc_flags & LOWPAN_IPHC_FLAG_DST_MODE, "%s (0x%04x)", val_to_str_const(iphc_dst_mode, am_vs, "Reserved"), iphc_dst_mode); } offset += 2; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-a21.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-a21.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-a21.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-a21.c 2014-09-16 12:09:03.000000000 -0400 @@ -643,28 +643,26 @@ proto_tree_add_item(tree, proto_a21, tvb, offset, 0, ENC_NA); - if(tree){ - ti = proto_tree_add_text(tree, tvb, offset, 1, "%s", - val_to_str_const(message_type, a21_message_type_vals, "Unknown")); - a21_tree = proto_item_add_subtree(ti, ett_a21); - /* message type in Octet 1 */ - proto_tree_add_item(a21_tree, hf_a21_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); - offset++; - /* Correlation Identifier in Octets 2-7 */ - tc = proto_tree_add_item(a21_tree, hf_a21_corr_id, tvb, offset, 6, ENC_BIG_ENDIAN); - corr_tree = proto_item_add_subtree(tc,ett_a21_corr_id); - - proto_tree_add_item(corr_tree, hf_a21_element_identifier, tvb, offset, 1, ENC_BIG_ENDIAN); - offset++; - proto_tree_add_item(corr_tree, hf_a21_element_length, tvb, offset, 1, ENC_BIG_ENDIAN); - offset++; + ti = proto_tree_add_text(tree, tvb, offset, 1, "%s", + val_to_str_const(message_type, a21_message_type_vals, "Unknown")); + a21_tree = proto_item_add_subtree(ti, ett_a21); + /* message type in Octet 1 */ + proto_tree_add_item(a21_tree, hf_a21_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); + offset++; + /* Correlation Identifier in Octets 2-7 */ + tc = proto_tree_add_item(a21_tree, hf_a21_corr_id, tvb, offset, 6, ENC_BIG_ENDIAN); + corr_tree = proto_item_add_subtree(tc,ett_a21_corr_id); + + proto_tree_add_item(corr_tree, hf_a21_element_identifier, tvb, offset, 1, ENC_BIG_ENDIAN); + offset++; + proto_tree_add_item(corr_tree, hf_a21_element_length, tvb, offset, 1, ENC_BIG_ENDIAN); + offset++; - proto_tree_add_item(corr_tree, hf_a21_corr_id_corr_value, tvb, offset, 4, ENC_BIG_ENDIAN); - offset +=4; + proto_tree_add_item(corr_tree, hf_a21_corr_id_corr_value, tvb, offset, 4, ENC_BIG_ENDIAN); + offset +=4; - dissect_a21_ie_common(tvb, pinfo, a21_tree, offset, message_type); + dissect_a21_ie_common(tvb, pinfo, a21_tree, offset, message_type); - } } diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-acr122.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-acr122.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-acr122.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-acr122.c 2014-09-16 12:09:03.000000000 -0400 @@ -320,7 +320,7 @@ sub_item = proto_tree_add_uint(main_tree, hf_command, tvb, offset, 4 + length, command); PROTO_ITEM_SET_GENERATED(sub_item); if (command == CMD_UNKNOWN) - proto_tree_add_expert(sub_item, pinfo, &ei_unknown_command_or_invalid_parameters, tvb, offset, 4 + length); + expert_add_info(pinfo, sub_item, &ei_unknown_command_or_invalid_parameters); col_add_fstr(pinfo->cinfo, COL_INFO, "Command: %s", val_to_str_ext_const(command, &command_vals_ext, "Unknown")); diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-artnet.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-artnet.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-artnet.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-artnet.c 2014-09-16 12:09:03.000000000 -0400 @@ -4214,7 +4214,7 @@ NULL, HFILL }}, { &hf_artnet_directory_reply_length, - { "Lenght", + { "Length", "artnet.directory_reply.length", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-aruba-iap.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-aruba-iap.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-aruba-iap.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-aruba-iap.c 2014-09-16 12:09:03.000000000 -0400 @@ -69,7 +69,7 @@ col_clear(pinfo->cinfo, COL_INFO); if (tree) { - ti = proto_tree_add_item(tree, proto_aruba_iap, tvb, 0, 0, ENC_NA); + ti = proto_tree_add_item(tree, proto_aruba_iap, tvb, 0, -1, ENC_NA); aruba_iap_tree = proto_item_add_subtree(ti, ett_aruba_iap); } diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-bgp.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-bgp.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-bgp.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-bgp.c 2014-09-16 12:09:03.000000000 -0400 @@ -1603,6 +1603,7 @@ static expert_field ei_bgp_ext_com_len_bad = EI_INIT; static expert_field ei_bgp_attr_pmsi_opaque_type = EI_INIT; static expert_field ei_bgp_attr_pmsi_tunnel_type = EI_INIT; +static expert_field ei_bgp_attr_as_path_as_len_err = EI_INIT; static expert_field ei_bgp_evpn_nlri_rt4_len_err = EI_INIT; static expert_field ei_bgp_evpn_nlri_rt_type_err = EI_INIT; @@ -5045,7 +5046,7 @@ else if (next_type == AS_SET || next_type == AS_SEQUENCE || next_type == AS_CONFED_SEQUENCE || - next_type == AS_CONFED_SEQUENCE) { + next_type == AS_CONFED_SET) { /* that's a good sign to assume ASN 2 bytes let's check that 2 first bytes of each ASN doesn't eq 0 to confirm */ for (j=0; j < length && !asn_is_null; j++) { if(tvb_get_ntohs(tvb, k+(2*j)) == 0) { @@ -5056,22 +5057,22 @@ assumed_as_len = 2; else assumed_as_len = 4; - } else /* we didn't find a valid AS segment type in the next coming segment assuming 2 bytes ASN */ assumed_as_len = 4; /* now that we have our assumed as length let's check we can calculate the attribute length properly */ k = k_save; - k++; while (k < end_attr_offset) { + /* we skip the AS type */ + k++; + /* we get the length of the AS segment */ length = tvb_get_guint8(tvb, k); + /* let's point to the fist byte of the AS segment */ + k++; /* we move to the next segment */ k = k + (length*assumed_as_len); - /* if I am not facing the last segment k need to point to next length */ - if(k < end_attr_offset) - k++; counter_as_segment++; } if (k == end_attr_offset) { @@ -5600,7 +5601,8 @@ proto_tree_add_item(subtree2, hf_bgp_update_path_attribute_type_code, tvb, o + i + 1, 1, ENC_BIG_ENDIAN); - attr_len_item = proto_tree_add_item(subtree2, hf_bgp_update_path_attribute_length, tvb, o + i + BGP_SIZE_OF_PATH_ATTRIBUTE, aoff - BGP_SIZE_OF_PATH_ATTRIBUTE, ENC_BIG_ENDIAN); + attr_len_item = proto_tree_add_item(subtree2, hf_bgp_update_path_attribute_length, tvb, o + i + BGP_SIZE_OF_PATH_ATTRIBUTE, + aoff - BGP_SIZE_OF_PATH_ATTRIBUTE, ENC_BIG_ENDIAN); /* Path Attribute Type */ switch (bgpa_type) { @@ -5623,6 +5625,12 @@ heuristic also tell us how many AS segments we have */ asn_len = heuristic_as2_or_4_from_as_path(tvb, o+i+aoff, o+i+aoff+tlen, bgpa_type, &number_as_segment); + if (asn_len == 255) + { + expert_add_info_format(pinfo, ti_pa, &ei_bgp_attr_as_path_as_len_err, + "ASN length uncalculated by heuristic : %u", asn_len); + break; + } proto_item_append_text(ti_pa,": "); if(tlen == 0) { proto_item_append_text(ti_pa,"empty"); @@ -7903,7 +7911,8 @@ { &ei_bgp_evpn_nlri_rt4_len_err, { "bgp.evpn.len", PI_MALFORMED, PI_ERROR, "Length is invalid", EXPFILL }}, { &ei_bgp_evpn_nlri_rt_type_err, { "bgp.evpn.type", PI_MALFORMED, PI_ERROR, "EVPN Route Type is invalid", EXPFILL }}, { &ei_bgp_attr_pmsi_tunnel_type, { "bgp.attr.pmsi.tunnel_type", PI_PROTOCOL, PI_ERROR, "Unknown Tunnel type", EXPFILL }}, - { &ei_bgp_attr_pmsi_opaque_type, { "bgp.attr.pmsi.opaque_type", PI_PROTOCOL, PI_ERROR, "Unvalid pmsi opaque type", EXPFILL }} + { &ei_bgp_attr_pmsi_opaque_type, { "bgp.attr.pmsi.opaque_type", PI_PROTOCOL, PI_ERROR, "Unvalid pmsi opaque type", EXPFILL }}, + { &ei_bgp_attr_as_path_as_len_err, {"bgp.attr.as_path.as_len", PI_UNDECODED, PI_ERROR, "unable to determine 4 or 2 bytes ASN", EXPFILL}} }; module_t *bgp_module; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-btle.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-btle.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-btle.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-btle.c 2014-09-16 12:09:03.000000000 -0400 @@ -776,17 +776,17 @@ }, { &hf_advertising_header_rfu_1, { "RFU", "btle.advertising_header.rfu.1", - FT_UINT8, BASE_DEC, NULL, 0xC0, + FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL } }, { &hf_advertising_header_randomized_tx, { "Randomized Tx Address", "btle.advertising_header.randomized_tx", - FT_BOOLEAN, 8, NULL, 0x20, + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL } }, { &hf_advertising_header_randomized_rx, { "Randomized Rx Address", "btle.advertising_header.randomized_rx", - FT_BOOLEAN, 8, NULL, 0x10, + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL } }, { &hf_advertising_header_reserved, diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-capwap.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-capwap.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-capwap.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-capwap.c 2014-09-16 12:09:03.000000000 -0400 @@ -1085,7 +1085,7 @@ break; case TYPE_AC_NAME_W_PRIORITY: /* AC Name With Priority (5) */ - proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name_with_priority, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name_with_priority, tvb, offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_item(sub_msg_element_type_tree, hf_capwap_msg_element_type_ac_name, tvb, offset+5, optlen-1, ENC_ASCII|ENC_NA); break; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-cfm.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-cfm.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-cfm.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-cfm.c 2014-09-16 12:09:03.000000000 -0400 @@ -1549,7 +1549,7 @@ } - cfm_tlv_offset += tlv_data_offset; + cfm_tlv_offset = tlv_data_offset; } } } diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-cups.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-cups.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-cups.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-cups.c 2014-09-16 12:09:03.000000000 -0400 @@ -279,7 +279,7 @@ if (o != -1) { offset++; l = o - offset; - s = tvb_get_ptr(tvb, offset, l); + s = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, l, ENC_ASCII); offset = o + 1; } } @@ -300,7 +300,7 @@ o = tvb_pbrk_guint8(tvb, offset, -1, " \t\r\n", NULL); if (o != -1) { l = o - offset; - s = tvb_get_ptr(tvb, offset, l); + s = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, l, ENC_ASCII); offset = o; } diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-dcerpc.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-dcerpc.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-dcerpc.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-dcerpc.c 2014-09-16 12:09:03.000000000 -0400 @@ -5379,7 +5379,7 @@ e_dce_dg_common_hdr_t *hdr, conversation_t *conv) { dcerpc_info *di; - dcerpc_call_value *value, v; + dcerpc_call_value *value; dcerpc_matched_key matched_key, *new_matched_key; proto_item *pi; proto_item *parent_pi; @@ -5421,16 +5421,16 @@ matched_key.call_id = hdr->seqnum; value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key); if (!value) { - v.uuid = hdr->if_id; - v.ver = hdr->if_ver; - v.object_uuid = hdr->obj_id; - v.opnum = hdr->opnum; - v.req_frame = pinfo->fd->num; - v.rep_frame = 0; - v.max_ptr = 0; - v.se_data = NULL; - v.private_data = NULL; - value = &v; + value = wmem_new(wmem_packet_scope(), dcerpc_call_value); + value->uuid = hdr->if_id; + value->ver = hdr->if_ver; + value->object_uuid = hdr->obj_id; + value->opnum = hdr->opnum; + value->req_frame = pinfo->fd->num; + value->rep_frame = 0; + value->max_ptr = 0; + value->se_data = NULL; + value->private_data = NULL; } di->conv = conv; @@ -5457,7 +5457,7 @@ e_dce_dg_common_hdr_t *hdr, conversation_t *conv) { dcerpc_info *di; - dcerpc_call_value *value, v; + dcerpc_call_value *value; dcerpc_matched_key matched_key, *new_matched_key; proto_item *pi; proto_item *parent_pi; @@ -5486,15 +5486,15 @@ matched_key.call_id = hdr->seqnum; value = (dcerpc_call_value *)g_hash_table_lookup(dcerpc_matched, &matched_key); if (!value) { - v.uuid = hdr->if_id; - v.ver = hdr->if_ver; - v.object_uuid = hdr->obj_id; - v.opnum = hdr->opnum; - v.req_frame = 0; - v.rep_frame = pinfo->fd->num; - v.se_data = NULL; - v.private_data = NULL; - value = &v; + value = wmem_new(wmem_packet_scope(), dcerpc_call_value); + value->uuid = hdr->if_id; + value->ver = hdr->if_ver; + value->object_uuid = hdr->obj_id; + value->opnum = hdr->opnum; + value->req_frame = 0; + value->rep_frame = pinfo->fd->num; + value->se_data = NULL; + value->private_data = NULL; } di->conv = conv; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-dcm.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-dcm.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-dcm.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-dcm.c 2014-09-16 12:09:03.000000000 -0400 @@ -7236,11 +7236,6 @@ { &hf_dcm_pdv_reassembled_length, { "Reassembled PDV length", "dicom.pdv.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } } - -/* - { &hf_dcm_FIELDABBREV, { "FIELDNAME", "dicom.FIELDABBREV", - FIELDTYPE, FIELDBASE, FIELDCONVERT, BITMASK, "FIELDDESCR", HFILL } }, - */ }; /* Setup protocol subtree array */ @@ -7297,6 +7292,9 @@ expert_dcm = expert_register_protocol(proto_dcm); expert_register_field_array(expert_dcm, ei, array_length(ei)); + /* Allow other dissectors to find this one by name. */ + new_register_dissector("dicom", dissect_dcm_static, proto_dcm); + dcm_module = prefs_register_protocol(proto_dcm, dcm_apply_settings); range_convert_str(&global_dcm_tcp_range, DICOM_DEFAULT_RANGE, 65535); diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-diameter.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-diameter.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-diameter.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-diameter.c 2014-09-16 12:09:03.000000000 -0400 @@ -335,7 +335,7 @@ exp_pdu_data_t *exp_pdu_data; guint8 tags_bit_field; - tags_bit_field = EXP_PDU_TAG_IP_SRC_BIT + EXP_PDU_TAG_IP_DST_BIT + EXP_PDU_TAG_SRC_PORT_BIT+ + tags_bit_field = EXP_PDU_TAG_IP_SRC_BIT + EXP_PDU_TAG_IP_DST_BIT + EXP_PDU_TAG_SRC_PORT_BIT + EXP_PDU_TAG_DST_PORT_BIT + EXP_PDU_TAG_ORIG_FNO_BIT; exp_pdu_data = load_export_pdu_tags(pinfo, "diameter", -1, &tags_bit_field, 1); @@ -1085,16 +1085,16 @@ cmd_str = val_to_str_const(cmd, cmd_vs, "Unknown"); col_add_fstr(pinfo->cinfo, COL_INFO, - "cmd=%s%s(%d) flags=%s %s=%s(%d) h2h=%x e2e=%x", - cmd_str, - ((flags_bits>>4)&0x08) ? " Request" : " Answer", - cmd, - msgflags_str[((flags_bits>>4)&0x0f)], - c->version_rfc ? "appl" : "vend", - val_to_str_const(diam_sub_dis_inf->application_id, c->version_rfc ? dictionary.applications : vnd_short_vs, "Unknown"), - diam_sub_dis_inf->application_id, - tvb_get_ntohl(tvb,12), - tvb_get_ntohl(tvb,16)); + "cmd=%s%s(%d) flags=%s %s=%s(%d) h2h=%x e2e=%x", + cmd_str, + ((flags_bits>>4)&0x08) ? " Request" : " Answer", + cmd, + msgflags_str[((flags_bits>>4)&0x0f)], + c->version_rfc ? "appl" : "vend", + val_to_str_const(diam_sub_dis_inf->application_id, c->version_rfc ? dictionary.applications : vnd_short_vs, "Unknown"), + diam_sub_dis_inf->application_id, + tvb_get_ntohl(tvb,12), + tvb_get_ntohl(tvb,16)); col_append_str(pinfo->cinfo, COL_INFO, " | "); col_set_fence(pinfo->cinfo, COL_INFO); @@ -1183,7 +1183,7 @@ diameter_pair->ans_frame = 0; diameter_pair->req_time = pinfo->fd->abs_ts; } - diameter_pair->processing_request=(flags_bits & DIAM_FLAGS_R)!=0; + diameter_pair->processing_request=(flags_bits & DIAM_FLAGS_R)!= 0; if (tree){ /* print state tracking info in the tree */ @@ -1261,6 +1261,23 @@ if (diam_len > 65534) return FALSE; + /* Diameter minimum message length: + * + * Version+Length - 4 bytes + * Flags+CC - 4 bytes + * AppID - 4 bytes + * HbH - 4 bytes + * E2E - 4 bytes + * 2 AVPs (Orig-Host, Orig-Realm), each including: + * * AVP code - 4 bytes + * * AVP flags + length - 4 bytes + * * (no data - what would a reasonable minimum be?) + * + * --> 36 bytes + */ + if (diam_len < 36) + return FALSE; + flags = tvb_get_guint8(tvb, 4); /* Check if any of the Reserved flag bits are set */ @@ -1329,7 +1346,7 @@ { hf_register_info hf; - hf.p_id = hf_ptr; + hf.p_id = hf_ptr; hf.hfinfo.name = name; hf.hfinfo.abbrev = abbr; hf.hfinfo.type = ft; @@ -1355,7 +1372,7 @@ hf_register_info hf; gint *ettp = &(a->ett); - hf.p_id = &(a->hf_value); + hf.p_id = &(a->hf_value); hf.hfinfo.name = NULL; hf.hfinfo.abbrev = NULL; hf.hfinfo.type = ft; @@ -1363,8 +1380,8 @@ hf.hfinfo.strings = NULL; hf.hfinfo.bitmask = 0x0; hf.hfinfo.blurb = a->vendor->code ? - wmem_strdup_printf(wmem_epan_scope(), "vendor=%d code=%d", a->vendor->code, a->code) - : wmem_strdup_printf(wmem_epan_scope(), "code=%d", a->code); + wmem_strdup_printf(wmem_epan_scope(), "vendor=%d code=%d", a->vendor->code, a->code) + : wmem_strdup_printf(wmem_epan_scope(), "code=%d", a->code); /* HFILL */ HFILL_INIT(hf); diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-dvbci.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-dvbci.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-dvbci.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-dvbci.c 2014-09-16 12:09:03.000000000 -0400 @@ -1767,7 +1767,7 @@ ti = proto_tree_add_text(tree, tvb, offset, cap_loop_len, "%s", title); loop_tree = proto_item_add_subtree(ti, ett_dvbci_opp_cap_loop); } - for (i=0; iconnectiontype = 255; + hislip_info->connectiontype = is_connection_syn_or_asyn(hislip_data.messagetype); hislip_info->pdus = wmem_tree_new(wmem_file_scope()); - conversation = conversation_new( pinfo->fd->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, pinfo->destport, 0); conversation_add_proto_data( conversation, proto_hislip, (void *) hislip_info); } - - if(hislip_info->connectiontype == 255) + /*synchronous or asynchronous channel*/ + if(hislip_info->connectiontype == HISLIP_INITIALIZE) { - hislip_info->connectiontype = is_connection_syn_or_asyn(hislip_data.messagetype); - proto_item_append_text(hislip_data.hislip_item," (Unknown)"); + proto_item_append_text(hislip_data.hislip_item," (Synchron)"); + it = proto_tree_add_item( hislip_tree, hf_hislip_syn, tvb, 0, 0, ENC_NA); } else { - /*synchronous or asynchronous channel*/ - if(hislip_info->connectiontype == HISLIP_INITIALIZE) - { - proto_item_append_text(hislip_data.hislip_item," (Synchron)"); - proto_tree_add_item( hislip_tree, hf_hislip_syn, tvb, 0, 0, ENC_NA); - } - else - { - proto_item_append_text(hislip_data.hislip_item," (Asynchron)"); - proto_tree_add_item( hislip_tree, hf_hislip_asyn, tvb, 0, 0, ENC_NA); - } + proto_item_append_text(hislip_data.hislip_item," (Asynchron)"); + it = proto_tree_add_item( hislip_tree, hf_hislip_asyn, tvb, 0, 0, ENC_NA); } + PROTO_ITEM_SET_GENERATED(it); - if(pinfo->fd->flags.visited) + switch(hislip_data.messagetype) { - proto_item *it; - switch(hislip_data.messagetype) - { - case HISLIP_ASYNCLOCK: - case HISLIP_ASYNCINITIALIZE: - case HISLIP_ASYNCMAXIMUMMESSAGESIZE: - case HISLIP_INITIALIZE: - case HISLIP_ASYNCSTATUSQUERY: - case HISLIP_ASYNCLOCKINFO: - - /*Retransmisson*/ - if((frame_number = search_for_retransmission(hislip_info->pdus, &hislip_data , pinfo->fd->num))!=0) - { - it = proto_tree_add_uint( hislip_tree, hf_hislip_retransmission, tvb, 0, 0, frame_number); - PROTO_ITEM_SET_GENERATED(it); - } + case HISLIP_ASYNCLOCK: + case HISLIP_ASYNCINITIALIZE: + case HISLIP_ASYNCMAXIMUMMESSAGESIZE: + case HISLIP_INITIALIZE: + case HISLIP_ASYNCSTATUSQUERY: + case HISLIP_ASYNCLOCKINFO: - /*Request*/ - hislip_trans = (hislip_transaction_t *)wmem_tree_lookup32( hislip_info->pdus, pinfo->fd->num); + /*Request*/ + hislip_trans = (hislip_transaction_t *)wmem_tree_lookup32( hislip_info->pdus, pinfo->fd->num); + if(!hislip_trans) + { + DISSECTOR_ASSERT_HINT(!pinfo->fd->flags.visited, "Missing 'Request' Info"); - if(!hislip_trans) - { /* This is a new request */ - hislip_trans = (hislip_transaction_t *)wmem_alloc(wmem_file_scope(),sizeof( hislip_transaction_t)); - hislip_trans->req_frame = pinfo->fd->num; - hislip_trans->rep_frame = 0; - hislip_trans->messagetype=hislip_data.messagetype; - hislip_trans->controltype=hislip_data.controlcode; - wmem_tree_insert32(hislip_info->pdus, pinfo->fd->num , (void *)hislip_trans); + hislip_trans = (hislip_transaction_t *)wmem_alloc(wmem_file_scope(),sizeof( hislip_transaction_t)); + hislip_trans->req_frame = pinfo->fd->num; + hislip_trans->rep_frame = 0; + hislip_trans->messagetype=hislip_data.messagetype; + hislip_trans->controltype=hislip_data.controlcode; + wmem_tree_insert32(hislip_info->pdus, pinfo->fd->num , (void *)hislip_trans); - } + } + if(hislip_trans->rep_frame != 0) + { it = proto_tree_add_uint( hislip_tree, hf_hislip_response, tvb, 0, 0, hislip_trans->rep_frame); PROTO_ITEM_SET_GENERATED(it); - break; - + } - case HISLIP_ASYNCLOCK_RESPONSE: - case HISLIP_ASYNCINITIALIZERESPONSE: - case HISLIP_ASYNCMAXIMUMMESSAGESIZERESPONSE: - case HISLIP_INITIALIZERESPONSE: - case HISLIP_ASYNCSTATUSRESPONSE: - case HISLIP_ASYNCLOCKINFORESPONSE: - - /*Response*/ - hislip_trans = (hislip_transaction_t *) wmem_tree_lookup32_le( hislip_info->pdus, pinfo->fd->num); - if (hislip_trans) - { - - hislip_trans->rep_frame = pinfo->fd->num; - oldcontrolvalue = hislip_trans->controltype; - it = proto_tree_add_uint( hislip_tree, hf_hislip_request,tvb, 0, 0, hislip_trans->req_frame); - PROTO_ITEM_SET_GENERATED(it); - } - break; + /*Retransmisson*/ + if((frame_number = search_for_retransmission(hislip_info->pdus, &hislip_data , pinfo->fd->num))!=0) + { + it = proto_tree_add_uint( hislip_tree, hf_hislip_retransmission, tvb, 0, 0, frame_number); + PROTO_ITEM_SET_GENERATED(it); + } + break; - default: - ; + case HISLIP_ASYNCLOCK_RESPONSE: + case HISLIP_ASYNCINITIALIZERESPONSE: + case HISLIP_ASYNCMAXIMUMMESSAGESIZERESPONSE: + case HISLIP_INITIALIZERESPONSE: + case HISLIP_ASYNCSTATUSRESPONSE: + case HISLIP_ASYNCLOCKINFORESPONSE: + + /*Response*/ + hislip_trans = (hislip_transaction_t *) wmem_tree_lookup32_le( hislip_info->pdus, pinfo->fd->num); + if (hislip_trans) + { + hislip_trans->rep_frame = pinfo->fd->num; + oldcontrolvalue = hislip_trans->controltype; + it = proto_tree_add_uint( hislip_tree, hf_hislip_request,tvb, 0, 0, hislip_trans->req_frame); + PROTO_ITEM_SET_GENERATED(it); } + break; + + + default: + ; + } @@ -850,8 +841,7 @@ decode_controlcode( tvb , pinfo , hislip_tree , &hislip_data, oldcontrolvalue ); - if(tree) - decode_messagepara( tvb , pinfo , hislip_tree , &hislip_data); + decode_messagepara( tvb , pinfo , hislip_tree , &hislip_data); proto_tree_add_item(hislip_tree,hf_hislip_payloadlength, tvb, hislip_data.offset, 8, ENC_BIG_ENDIAN); hislip_data.offset += 8; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-http2.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-http2.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-http2.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-http2.c 2014-09-16 12:09:03.000000000 -0400 @@ -97,6 +97,11 @@ void proto_register_http2(void); void proto_reg_handoff_http2(void); + +/* Heuristic dissection */ +static gboolean global_http2_heur = FALSE; + + /* Packet Header */ static int proto_http2 = -1; static int hf_http2 = -1; @@ -1143,6 +1148,16 @@ static gboolean dissect_http2_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { + + /* It is not easy to write a good http2 heuristic, + this heuristic is disabled by default + */ + + if (!global_http2_heur) + { + return FALSE; + } + if (tvb_memeql(tvb, 0, kMagicHello, MAGIC_FRAME_LENGTH) != 0) { /* we couldn't find the Magic Hello (PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n) see if there's a valid frame type (0-11 are defined at the moment) */ @@ -1537,11 +1552,20 @@ &ett_http2_settings }; + module_t *http2_module; + proto_http2 = proto_register_protocol("HyperText Transfer Protocol 2", "HTTP2", "http2"); proto_register_field_array(proto_http2, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + http2_module = prefs_register_protocol(proto_http2, NULL); + + prefs_register_bool_preference(http2_module, "heuristic_http2", + "Enable HTTP2 heuristic (disabled by default)", + "The HTTP2 heuristic is weak and there are some false positives", + &global_http2_heur); + new_register_dissector("http2", dissect_http2, proto_http2); } diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-icmpv6.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-icmpv6.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-icmpv6.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-icmpv6.c 2014-09-16 12:09:03.000000000 -0400 @@ -2188,8 +2188,8 @@ break; } /* Update the 6LoWPAN dissectors with new context information. */ - hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, 0, - proto_get_id_by_filter_name(IEEE802154_PROTOABBREV_WPAN)); + hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, + proto_get_id_by_filter_name(IEEE802154_PROTOABBREV_WPAN), 0); if ((opt_len <= 24) && hints) { lowpan_context_insert(context_id, hints->src_pan, context_len, &context_prefix, pinfo->fd->num); } diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-ieee80211.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-ieee80211.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-ieee80211.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-ieee80211.c 2014-09-16 12:09:03.000000000 -0400 @@ -7664,7 +7664,7 @@ } static guint -add_ff_action_public_fields(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, guint8 code, guint start) +add_ff_action_public_fields(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, guint8 code) { guint32 oui; guint8 subtype; @@ -7673,6 +7673,8 @@ guint8 frag; gboolean more; + guint start = offset; + switch (code) { case PA_EXT_CHANNEL_SWITCH_ANNOUNCEMENT: offset += add_ff_extended_channel_switch_announcement(tree, tvb, pinfo, offset); @@ -7750,7 +7752,7 @@ offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_CATEGORY_CODE); code = tvb_get_guint8(tvb, offset); offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_PA_ACTION_CODE); - offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code, start); + offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code); return offset - start; } @@ -7762,7 +7764,7 @@ offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_CATEGORY_CODE); code = tvb_get_guint8(tvb, offset); offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_PPA_ACTION_CODE); - offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code, start); + offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code); return offset - start; } @@ -11449,7 +11451,7 @@ /*MIN: 2 + (2+4)+ (2+4) + 4 + 2 + 0 (BKID CNT and LIST) =20*/ if (tag_len < 20) { expert_add_info_format(pinfo, ti_len, &ei_ieee80211_tag_length, - "tag_len is %d, its neither WAPI not BSS-AC-Access-Delay", tag_len); + "tag_len is %d, it's neither WAPI not BSS-AC-Access-Delay", tag_len); return offset; } @@ -16431,7 +16433,7 @@ if (bmap & (G_GINT64_CONSTANT(1) << f)) continue; proto_tree_add_uint_format_value(ba_bitmap_tree, hf_ieee80211_block_ack_bitmap_missing_frame, - tvb, offset + (f/8), 1, ssn + f, "%u", ssn + f); + tvb, offset + (f/8), 1, ssn + f, "%u", (ssn + f) & 0x0fff); } /*offset += 8;*/ break; @@ -18219,9 +18221,9 @@ "Type and subtype combined (first byte: type, second byte: subtype)", HFILL }}, {&hf_ieee80211_fc_frame_extension, - {"Extension", "wlan.fc.extension", + {"Control Frame Extension", "wlan.fc.extension", FT_UINT8, BASE_DEC, NULL, 0, - "Frame extension", HFILL }}, + NULL, HFILL }}, {&hf_ieee80211_fc_flags, {"Flags", "wlan.flags", @@ -18943,7 +18945,7 @@ NULL, HFILL }}, {&hf_ieee80211_ff_sswf_num_rx_dmg_ants, - {"Sector Sweep Feedback Number of recieve DMG Antennas", "wlan.sswf.num_dmg_ants", + {"Sector Sweep Feedback Number of receive DMG Antennas", "wlan.sswf.num_dmg_ants", FT_UINT24, BASE_DEC, NULL, 0x006000, NULL, HFILL }}, @@ -19093,7 +19095,7 @@ NULL, HFILL }}, {&hf_ieee80211_ff_bic_nabft, - {"Number of A-BFT's recieved from each Antenna", "wlan.bic.nabft", + {"Number of A-BFT's received from each Antenna", "wlan.bic.nabft", FT_UINT16, BASE_DEC, NULL, 0x07e0, NULL, HFILL }}, @@ -21087,7 +21089,7 @@ {&hf_ieee80211_ff_toa, {"TOA", "wlan_mgt.fixed.toa", FT_UINT32, BASE_DEC, NULL, 0, - "Previous TS of recieve antenna port", HFILL }}, + "Previous TS of receive antenna port", HFILL }}, {&hf_ieee80211_ff_max_tod_err, {"MAX TOD ERROR", "wlan_mgt.fixed.max_tod_err", diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-logcat.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-logcat.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-logcat.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-logcat.c 2014-09-16 12:09:03.000000000 -0400 @@ -103,6 +103,7 @@ gchar *c; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Logcat"); + col_clear(pinfo->cinfo, COL_INFO); mainitem = proto_tree_add_item(tree, proto_logcat, tvb, offset, -1, ENC_NA); maintree = proto_item_add_subtree(mainitem, ett_logcat); @@ -168,7 +169,6 @@ proto_tree_add_item(maintree, hf_logcat_log, tvb, offset, string_length, ENC_ASCII | ENC_NA); - col_clear(pinfo->cinfo, COL_INFO); col_add_str(pinfo->cinfo, COL_INFO, log); offset += string_length; check_length += string_length; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-mausb.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-mausb.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-mausb.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-mausb.c 2014-09-16 12:09:03.000000000 -0400 @@ -522,7 +522,7 @@ } /* Global Port Preference */ -static unsigned int gPORT_PREF = 0; +static unsigned int mausb_tcp_port_pref = 0; /* Initialize the subtree pointers */ static gint ett_mausb = -1; @@ -1458,7 +1458,7 @@ /* Register TCP port preference */ prefs_register_uint_preference(mausb_module, "tcp.port", "MAUSB TCP Port", "Set the port for Media Agnostic Packets", - 10, &gPORT_PREF); + 10, &mausb_tcp_port_pref); } @@ -1467,9 +1467,10 @@ { static gboolean initialized = FALSE; static dissector_handle_t mausb_tcp_handle; - static dissector_handle_t mausb_snap_handle; + static guint saved_mausb_tcp_port_pref; if (!initialized) { + dissector_handle_t mausb_snap_handle; /* only initialize once */ mausb_tcp_handle = new_create_dissector_handle(dissect_mausb, proto_mausb); @@ -1477,15 +1478,16 @@ mausb_snap_handle = new_create_dissector_handle(dissect_mausb_pkt, proto_mausb); + dissector_add_uint("llc.mausb_pid", PID_MAUSB, mausb_snap_handle); initialized = TRUE; } else { /* if we have already been initialized */ - dissector_delete_uint("tcp.port", gPORT_PREF, mausb_tcp_handle); + dissector_delete_uint("tcp.port", saved_mausb_tcp_port_pref, mausb_tcp_handle); } - dissector_add_uint("llc.mausb_pid", PID_MAUSB, mausb_snap_handle); - dissector_add_uint("tcp.port", gPORT_PREF, mausb_tcp_handle); + saved_mausb_tcp_port_pref = mausb_tcp_port_pref; + dissector_add_uint("tcp.port", mausb_tcp_port_pref, mausb_tcp_handle); } void diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-megaco.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-megaco.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-megaco.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-megaco.c 2014-09-16 12:09:03.000000000 -0400 @@ -3244,7 +3244,7 @@ "%s", tvb_format_text_wsp(tvb,tvb_linebegin, linelen)); tvb_linebegin = tvb_lineend; - } while ( tvb_lineend < tvb_len ); + } while ( tvb_lineend < tvb_len && linelen > 0); } /* diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-mip6.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-mip6.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-mip6.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-mip6.c 2014-09-16 12:09:03.000000000 -0400 @@ -1034,6 +1034,8 @@ static int hf_mip6_vsm_subtype = -1; static int hf_mip6_vsm_subtype_3gpp = -1; +static int hf_mip6_opt_ss_identifier = -1; + static int hf_mip6_opt_badff_spi = -1; static int hf_mip6_opt_badff_auth = -1; @@ -2250,15 +2252,13 @@ } /* 20 Service Selection Mobility Option [RFC5149] */ -#define MAX_APN_LENGTH 100 static void dissect_mip6_opt_ssm(const mip6_opt *optp _U_, tvbuff_t *tvb, int offset, guint optlen, packet_info *pinfo _U_, proto_tree *opt_tree, proto_item *hdr_item _U_ ) { int len; - guint8 str[MAX_APN_LENGTH+1]; - int curr_len; + guint8 *str; /* offset points to tag(opt) */ offset++; @@ -2281,20 +2281,9 @@ */ if (len > 0) { - /* init buffer and copy it */ - memset(str, 0, MAX_APN_LENGTH); - tvb_memcpy(tvb, str, offset, len> (48-33); - pcr_ext = tvb_get_ntoh48(tvb, offset) & 0x1FF; + pcr_ext = (guint16)(tvb_get_ntoh48(tvb, offset) & 0x1FF); - proto_tree_add_uint64_format_value(mp2t_af_tree, hf_mp2t_af_pcr, tvb, offset, 6, - pcr_base*300 + pcr_ext, "%" G_GINT64_MODIFIER "u", pcr_base*300 + pcr_ext); + proto_tree_add_uint64(mp2t_af_tree, hf_mp2t_af_pcr, tvb, offset, 6, + pcr_base*300 + pcr_ext); offset += 6; } if (af_flags & MP2T_AF_OPCR_MASK) { - guint64 opcr_base = 0; - guint32 opcr_ext = 0; - guint8 tmp = 0; + guint64 opcr_base; + guint16 opcr_ext; - tmp = tvb_get_guint8(tvb, offset); - opcr_base = (opcr_base << 8) | tmp; - offset += 1; - - tmp = tvb_get_guint8(tvb, offset); - opcr_base = (opcr_base << 8) | tmp; - offset += 1; + /* the same format as PCR above */ + opcr_base = tvb_get_ntoh48(tvb, offset) >> (48-33); + opcr_ext = (guint16)(tvb_get_ntoh48(tvb, offset) & 0x1FF); - tmp = tvb_get_guint8(tvb, offset); - opcr_base = (opcr_base << 8) | tmp; - offset += 1; - - tmp = tvb_get_guint8(tvb, offset); - opcr_base = (opcr_base << 8) | tmp; - offset += 1; - - tmp = tvb_get_guint8(tvb, offset); - opcr_base = (opcr_base << 1) | ((tmp >> 7) & 0x01); - opcr_ext = (tmp & 0x01); - offset += 1; - - tmp = tvb_get_guint8(tvb, offset); - opcr_ext = (opcr_ext << 8) | tmp; - offset += 1; - - proto_tree_add_none_format(mp2t_af_tree, hf_mp2t_af_opcr, tvb, offset - 6, 6, - "Original Program Clock Reference: base(%" G_GINT64_MODIFIER "u) * 300 + ext(%u) = %" G_GINT64_MODIFIER "u", - opcr_base, opcr_ext, opcr_base * 300 + opcr_ext); + proto_tree_add_uint64(mp2t_af_tree, hf_mp2t_af_opcr, tvb, offset, 6, + opcr_base*300 + opcr_ext); offset += 6; } @@ -1363,7 +1340,7 @@ } } , { &hf_mp2t_af_opcr, { "Original Program Clock Reference", "mp2t.af.opcr", - FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL + FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL } } , { &hf_mp2t_af_sc, { "Splice Countdown", "mp2t.af.sc", diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-netflow.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-netflow.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-netflow.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-netflow.c 2014-09-16 12:09:03.000000000 -0400 @@ -1516,7 +1516,7 @@ "MPLS-Label%d: %u exp-bits: %u %s", level, ((b0<<12)+(b1<<4)+(b2>>4)), ((b2>>1)&0x7), - ((b2&0x1)?"top-of-stack":"")); + ((b2&0x1)?"bottom-of-stack":"")); } else { ti = proto_tree_add_text(pdutree, tvb, offset, length, "MPLS-Label%d: bad length %d", level, length); @@ -2439,6 +2439,10 @@ if (length == 0) { /* XXX: Zero length fields probably shouldn't be included in the cached template */ /* YYY: Maybe. If you don't cache the zero length fields can you still compare that you actually */ /* have the same template with the same ID. See WMeier comment "c." above */ + /* XXX: One capture has been seen wherein the "length" field in the template is 0 even though + the field is actually present in the dataflow. + See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10432#c1 + */ continue; } /* See if variable length field */ @@ -5165,7 +5169,7 @@ offset_e[i], 4, &ts_end[i]); } else { proto_tree_add_time(pdutree, hf_cflow_abstimeend, tvb, - offset_s[i], 4, &ts_start[i]); + offset_e[i], 4, &ts_end[i]); } } } @@ -5420,16 +5424,15 @@ tmplt_p = (v9_v10_tmplt_t *)g_hash_table_lookup(v9_v10_tmplt_table, &tmplt); if (!pinfo->fd->flags.visited) { /* cache template info only during first pass */ do { - if ((option_scope_field_count == 0) || - (v9_tmplt_max_fields && + if (v9_tmplt_max_fields && ((option_scope_field_count > v9_tmplt_max_fields) - || (option_field_count > v9_tmplt_max_fields)))) { - break; /* Don't allow cache of this template */ + || (option_field_count > v9_tmplt_max_fields))) { + break; /* Don't cache this template */ } if (tmplt_p != NULL) { /* Entry for this template already exists; Can be dup or changed */ /* ToDo: Test for changed template ? If so: expert ? */ - break; /* Don't allow cacheing of this template */ + break; /* Don't cache this template */ } tmplt.fields_p[TF_SCOPES] = (v9_v10_tmplt_entry_t *)wmem_alloc0(wmem_file_scope(), option_scope_field_count *sizeof(v9_v10_tmplt_entry_t)); tmplt.fields_p[TF_ENTRIES] = (v9_v10_tmplt_entry_t *)wmem_alloc0(wmem_file_scope(), option_field_count *sizeof(v9_v10_tmplt_entry_t)); @@ -5517,12 +5520,12 @@ do { if ((count == 0) || (v9_tmplt_max_fields && (count > v9_tmplt_max_fields))) { - break; /* Don't allow cache of this template */ + break; /* Don't cache this template */ } if (tmplt_p != NULL) { /* Entry for this template already exists; Can be dup or changed */ /* ToDo: Test for changed template ? If so: expert ? */ - break; /* Don't allow cacheing of this template */ + break; /* Don't cache this template */ } tmplt.fields_p[TF_ENTRIES] = (v9_v10_tmplt_entry_t *)wmem_alloc0(wmem_file_scope(), count * sizeof(v9_v10_tmplt_entry_t)); break; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-ntp.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-ntp.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-ntp.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-ntp.c 2014-09-16 12:09:03.000000000 -0400 @@ -1228,22 +1228,25 @@ tvbparse_wanted_t *want_identifier = tvbparse_chars(-1, 1, 0, "abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ.0123456789", NULL, NULL, NULL); /* this is the equal sign used in assignments */ - tvbparse_wanted_t *want_equalsign = tvbparse_chars(-1, 1, 0, "=", NULL, NULL, NULL); + tvbparse_wanted_t *want_equalsign = tvbparse_char(-1, "=", NULL, NULL, NULL); /* possible characters allowed for values */ tvbparse_wanted_t *want_value = tvbparse_set_oneof(0, NULL, NULL, NULL, tvbparse_quoted(-1, NULL, NULL, tvbparse_shrink_token_cb, '\"', '\\'), tvbparse_quoted(-1, NULL, NULL, tvbparse_shrink_token_cb, '\'', '\\'), tvbparse_chars(-1, 1, 0, "abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ.0123456789 ", NULL, NULL, NULL), NULL); + tvbparse_wanted_t *want_comma = tvbparse_until(-1, NULL, NULL, NULL, + tvbparse_char(-1, ",", NULL, NULL, NULL), TP_UNTIL_SPEND); /* the following specifies an assignment of the form identifier=value */ tvbparse_wanted_t *want_assignment = tvbparse_set_seq(-1, NULL, NULL, NULL, want_identifier, want_equalsign, - want_value, + tvbparse_some(-1, 0, 1, NULL, NULL, NULL, want_value), + tvbparse_some(-1, 0, 1, NULL, NULL, NULL, want_comma), NULL); /* we ignore white space characters */ - want_ignore = tvbparse_chars(-1, 1, 0, ", \t\r\n", NULL, NULL, NULL); + want_ignore = tvbparse_chars(-1, 1, 0, " \t\r\n", NULL, NULL, NULL); /* data part of control messages consists of either identifiers or assignments */ want = tvbparse_set_oneof(-1, NULL, NULL, NULL, want_assignment, diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-opensafety.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-opensafety.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-opensafety.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-opensafety.c 2014-09-16 12:09:03.000000000 -0400 @@ -752,7 +752,7 @@ { guint ctr, rem_length; guint16 crc, f2crc, calcCrc; - guint8 b_Length, crcOffset; + guint8 b_Length, b_CTl, crcOffset; guint8 *bytes; guint b_ID; gboolean found; @@ -803,57 +803,74 @@ * as they remain the only values left, which are not valid */ if ( ( ( b_ID >> 4 ) != 0x09 ) && ( ( b_ID >> 4 ) != 0x0F ) ) { - /* Find CRC position and calculate checksum */ + /* Read CRC from position */ crc = tvb_get_guint8(message_tvb, ctr + 3 + b_Length ); - bytes = (guint8 *)tvb_memdup(wmem_packet_scope(), message_tvb, ctr - 1, b_Length + 5 ); - if ( b_Length > 8 ) { - crc = tvb_get_letohs ( message_tvb, ctr + 3 + b_Length ); - crcOffset = 1; - - calcCrc = crc16_0x755B( bytes, b_Length + 4, 0 ); - if ( ( crc ^ calcCrc ) != 0 ) - calcCrc = crc16_0x5935( bytes, b_Length + 4, 0 ); - } else { - calcCrc = crc8_0x2F ( bytes, b_Length + 4, 0 ); - } - - if ( ( crc ^ calcCrc ) == 0 ) + /* There exists some false positives, where the only possible + * data information in the frame is the ID and the ADDR fields. + * The rest of the fields in frame 1 are zeroed out. The packet + * must be filtered out and may not be used. To detect it, we + * check for the CT value, which, if zero indicates strongly + * that this is false-positive. */ + b_CTl = tvb_get_guint8(message_tvb, ctr + 2 ); + + /* If either length, crc or CTl is not zero, this may be a + * correct package. If all three are 0, this is most certainly + * an incorrect package, because the possibility of a valid + * package with all three values being zero is next to impossible */ + if ( b_Length != 0x00 || crc != 0x00 || b_CTl != 0x00 ) { - /* Check if this is a Slim SSDO message */ - if ( ( b_ID >> 3 ) == ( OPENSAFETY_SLIM_SSDO_MESSAGE_TYPE >> 3 ) ) + /* calculate checksum */ + bytes = (guint8 *)tvb_memdup(wmem_packet_scope(), message_tvb, ctr - 1, b_Length + 5 ); + if ( b_Length > 8 ) { - /* Slim SSDO messages must have a length != 0, as the first byte - * in the payload contains the SOD access command */ - if ( b_Length > 0 ) - { - *u_frameOffset = ( ctr - 1 ); - *u_frameLength = b_Length + 2 * crcOffset + 11; + crc = tvb_get_letohs ( message_tvb, ctr + 3 + b_Length ); + crcOffset = 1; + + calcCrc = crc16_0x755B( bytes, b_Length + 4, 0 ); + if ( ( crc ^ calcCrc ) != 0 ) + calcCrc = crc16_0x5935( bytes, b_Length + 4, 0 ); + } else { + calcCrc = crc8_0x2F ( bytes, b_Length + 4, 0 ); + } - /* It is highly unlikely, that both frame 1 and frame 2 generate - * a crc == 0 or equal crc's. Therefore we check, if both crc's are - * equal. If so, it is a falsely detected frame. */ - f2crc = tvb_get_guint8 ( message_tvb, ctr + 3 + 5 + b_Length ); - if ( b_Length > 8 ) - f2crc = tvb_get_letohs ( message_tvb, ctr + 3 + 5 + b_Length ); - if ( crc != f2crc ) + if ( ( crc ^ calcCrc ) == 0 ) + { + /* Check if this is a Slim SSDO message */ + if ( ( b_ID >> 3 ) == ( OPENSAFETY_SLIM_SSDO_MESSAGE_TYPE >> 3 ) ) + { + /* Slim SSDO messages must have a length != 0, as the first byte + * in the payload contains the SOD access command */ + if ( b_Length > 0 ) { - found = 1; - break; + *u_frameOffset = ( ctr - 1 ); + *u_frameLength = b_Length + 2 * crcOffset + 11; + + /* It is highly unlikely, that both frame 1 and frame 2 generate + * a crc == 0 or equal crc's. Therefore we check, if both crc's are + * equal. If so, it is a falsely detected frame. */ + f2crc = tvb_get_guint8 ( message_tvb, ctr + 3 + 5 + b_Length ); + if ( b_Length > 8 ) + f2crc = tvb_get_letohs ( message_tvb, ctr + 3 + 5 + b_Length ); + if ( crc != f2crc ) + { + found = 1; + break; + } } } - } - else - { - *u_frameLength = 2 * b_Length + 2 * crcOffset + 11; - *u_frameOffset = ( ctr - 1 ); + else + { + *u_frameLength = 2 * b_Length + 2 * crcOffset + 11; + *u_frameOffset = ( ctr - 1 ); - /* At this point frames had been checked for SoC and SoA types of - * EPL. This is no longer necessary and leads to false-negatives. - * SoC and SoA frames get filtered out at the EPL entry point, cause - * EPL only provides payload, no longer complete frames. */ - found = 1; - break; + /* At this point frames had been checked for SoC and SoA types of + * EPL. This is no longer necessary and leads to false-negatives. + * SoC and SoA frames get filtered out at the EPL entry point, cause + * EPL only provides payload, no longer complete frames. */ + found = 1; + break; + } } } } @@ -1003,7 +1020,7 @@ static void dissect_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_tvb, proto_tree *ssdo_payload, guint8 sacmd ) { - guint dataLength = 0, ctr = 0, n = 0; + guint dataLength = 0, ctr = 0, n = 0, nCRCs = 0; guint8 ssdoSubIndex = 0; guint16 ssdoIndex = 0, dispSSDOIndex = 0; guint32 sodLength = 0, entry = 0; @@ -1066,11 +1083,14 @@ entry = tvb_get_letohl ( new_tvb, 0 ); proto_tree_add_uint_format_value ( sod_tree, hf_oss_sod_par_timestamp, new_tvb, 0, 4, entry, "0x%08X", entry ); - for ( n = 4; n < dataLength; n+=4 ) - { - entry = tvb_get_letohl ( new_tvb, n ); - proto_tree_add_uint_format_value ( sod_tree, hf_oss_sod_par_checksum, new_tvb, (n ), - 4, entry, "[#%d] 0x%08X", ( n / 4 ), entry ); + + /* This is to avoid a compiler loop optimization warning */ + nCRCs = dataLength / 4; + for ( ctr = 1; ctr < nCRCs; ctr++ ) + { + entry = tvb_get_letohl ( new_tvb, ctr * 4 ); + proto_tree_add_uint_format_value ( sod_tree, hf_oss_sod_par_checksum, new_tvb, ctr * 4, + 4, entry, "[#%d] 0x%08X", ctr, entry ); } } /* If != upload, it is most likely a 101A download */ @@ -1130,11 +1150,14 @@ entry = tvb_get_letohl ( new_tvb, ctr + 5 ); proto_tree_add_uint_format_value ( sod_tree, hf_oss_sod_par_timestamp, new_tvb, ctr + 5, 4, entry, "0x%08X", entry ); - for ( n = 4; n < sodLength; n+=4 ) + + /* This is to avoid a compiler loop optimization warning */ + nCRCs = sodLength / 4; + for ( n = 1; n < nCRCs; n++ ) { - entry = tvb_get_letohl ( new_tvb, ctr + 5 + n ); - proto_tree_add_uint_format_value ( sod_tree, hf_oss_sod_par_checksum, new_tvb, (ctr + 5 + n ), - 4, entry, "[#%d] 0x%08X", ( n / 4 ), entry ); + entry = tvb_get_letohl ( new_tvb, ctr + 5 + ( n * 4 ) ); + proto_tree_add_uint_format_value ( sod_tree, hf_oss_sod_par_checksum, new_tvb, + (ctr + 5 + ( n * 4 ) ), 4, entry, "[#%d] 0x%08X", n, entry ); } } else if ( ssdoIndex == OPENSAFETY_SOD_DVI && ssdoSubIndex == 0x07 ) { entry = tvb_get_letohl ( new_tvb, ctr + 5 ); @@ -2199,7 +2222,7 @@ if ( dissect_opensafety_message(frameStart1, frameStart2, type, next_tvb, pinfo, opensafety_item, opensafety_tree, found) != TRUE ) markAsMalformed = TRUE; - if ( tree && markAsMalformed ) + if ( markAsMalformed ) { if ( OSS_FRAME_ADDR_T(message_tvb, byte_offset + frameStart1) > 1024 ) expert_add_info(pinfo, opensafety_item, &ei_message_spdo_address_invalid ); @@ -2377,19 +2400,26 @@ static void apply_prefs ( void ) { - static gboolean opensafety_init = FALSE; + static dissector_handle_t opensafety_udpdata_handle; + static dissector_handle_t opensafety_sii_handle; static guint opensafety_udp_port_number; static guint opensafety_udp_siii_port_number; + static gboolean opensafety_init = FALSE; /* It only should delete dissectors, if run for any time except the first */ - if ( opensafety_init ) + if ( !opensafety_init ) + { + opensafety_udpdata_handle = find_dissector("opensafety_udpdata"); + opensafety_sii_handle = find_dissector("opensafety_siii"); + opensafety_init = TRUE; + } + else { /* Delete dissectors in preparation of a changed config setting */ - dissector_delete_uint ("udp.port", opensafety_udp_port_number, find_dissector("opensafety_udpdata")); - dissector_delete_uint ("udp.port", opensafety_udp_siii_port_number, find_dissector("opensafety_siii")); + dissector_delete_uint ("udp.port", opensafety_udp_port_number, opensafety_udpdata_handle); + dissector_delete_uint ("udp.port", opensafety_udp_siii_port_number, opensafety_sii_handle); } - opensafety_init = TRUE; /* Storing the port numbers locally, to being able to delete the old associations */ opensafety_udp_port_number = global_network_udp_port; @@ -2814,50 +2844,45 @@ void proto_reg_handoff_opensafety(void) { - static int opensafety_inited = FALSE; + /* Storing global data_dissector */ + data_dissector = find_dissector ( "data" ); - if ( !opensafety_inited ) + /* EPL & SercosIII dissector registration */ + heur_dissector_add("epl_data", dissect_opensafety_epl, proto_opensafety); + heur_dissector_add("sercosiii", dissect_opensafety_siii, proto_opensafety); + + /* If an openSAFETY UDP transport filter is present, add to its + * heuristic filter list. Otherwise ignore the transport */ + if ( find_dissector("opensafety_udp") != NULL ) + heur_dissector_add("opensafety_udp", dissect_opensafety_udpdata, proto_opensafety); + + /* Modbus TCP dissector registration */ + dissector_add_string("modbus.data", "data", find_dissector("opensafety_mbtcp")); + + /* For Profinet we have to register as a heuristic dissector, as Profinet + * is implemented as a plugin, and therefore the heuristic dissector is not + * added by the time this method is being called + */ + if ( find_dissector("pn_io") != NULL ) { - /* Storing global data_dissector */ - if ( data_dissector == NULL ) - data_dissector = find_dissector ( "data" ); - - /* EPL & SercosIII dissector registration */ - heur_dissector_add("epl_data", dissect_opensafety_epl, proto_opensafety); - heur_dissector_add("sercosiii", dissect_opensafety_siii, proto_opensafety); - - /* If an openSAFETY UDP transport filter is present, add to its - * heuristic filter list. Otherwise ignore the transport */ - if ( find_dissector("opensafety_udp") != NULL ) - heur_dissector_add("opensafety_udp", dissect_opensafety_udpdata, proto_opensafety); - - /* Modbus TCP dissector registration */ - dissector_add_string("modbus.data", "data", find_dissector("opensafety_mbtcp")); - - /* For Profinet we have to register as a heuristic dissector, as Profinet - * is implemented as a plugin, and therefore the heuristic dissector is not - * added by the time this method is being called + heur_dissector_add("pn_io", dissect_opensafety_pn_io, proto_opensafety); + } + else + { + /* The native dissector cannot be loaded. so we add our protocol directly to + * the ethernet subdissector list. No PNIO specific data will be dissected + * and a warning will be displayed, recognizing the missing dissector plugin. */ - if ( find_dissector("pn_io") != NULL ) - { - heur_dissector_add("pn_io", dissect_opensafety_pn_io, proto_opensafety); - } - else - { - /* The native dissector cannot be loaded. so we add our protocol directly to - * the ethernet subdissector list. No PNIO specific data will be dissected - * and a warning will be displayed, recognizing the missing dissector plugin. - */ - dissector_add_uint("ethertype", ETHERTYPE_PROFINET, find_dissector("opensafety_pnio")); - } + dissector_add_uint("ethertype", ETHERTYPE_PROFINET, find_dissector("opensafety_pnio")); + } - register_init_routine ( setup_dissector ); + apply_prefs(); - /* registering frame end routine, to prevent a malformed dissection preventing - * further dissector calls (see bug #6950) */ - /* register_frame_end_routine(reset_dissector); */ - } + register_init_routine ( setup_dissector ); + /* registering frame end routine, to prevent a malformed dissection preventing + * further dissector calls (see bug #6950) */ + /* register_frame_end_routine(reset_dissector); */ } /* diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-osi.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-osi.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-osi.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-osi.c 2014-09-16 12:09:03.000000000 -0400 @@ -440,6 +440,7 @@ { NLPID_ISO11577, "ISO 11577" }, { NLPID_COMPRESSED, "Data compression protocol" }, { NLPID_IP, "IP" }, + { NLPID_TRILL, "TRILL" }, { NLPID_SNDCF, "SubNetwork Dependent Convergence Function"}, { NLPID_IP6, "IPv6" }, { NLPID_PPP, "PPP" }, diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-rdm.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-rdm.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-rdm.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-rdm.c 2014-09-16 12:09:03.000000000 -0400 @@ -360,7 +360,7 @@ { RDM_SENS_RESISTANCE, "Resistance" }, { RDM_SENS_POWER, "Power" }, { RDM_SENS_MASS, "Mass" }, - { RDM_SENS_LENGTH, "Lenght" }, + { RDM_SENS_LENGTH, "Length" }, { RDM_SENS_AREA, "Area" }, { RDM_SENS_VOLUME, "Volume" }, { RDM_SENS_DENSITY, "Density" }, diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-rpki-rtr.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-rpki-rtr.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-rpki-rtr.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-rpki-rtr.c 2014-09-16 12:09:03.000000000 -0400 @@ -149,6 +149,7 @@ switch (pdu_type) { case RPKI_RTR_SERIAL_NOTIFY_PDU: /* Serial Notify (0) */ case RPKI_RTR_SERIAL_QUERY_PDU: /* Serial Query (1) */ + case RPKI_RTR_END_OF_DATA_PDU: /* End Of Data (7) */ proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_session_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_length, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -166,7 +167,6 @@ offset += 4; break; case RPKI_RTR_CACHE_RESPONSE_PDU: /* Cache Response (3) */ - case RPKI_RTR_END_OF_DATA_PDU: /* End Of Data (7) */ proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_session_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(rpkirtr_tree, hf_rpkirtr_length, tvb, offset, 4, ENC_BIG_ENDIAN); diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-rtsp.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-rtsp.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-rtsp.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-rtsp.c 2014-09-16 12:09:03.000000000 -0400 @@ -435,7 +435,7 @@ is_rtsp_request_or_reply(const guchar *line, size_t linelen, rtsp_type_t *type) { guint ii; - const guchar *next_token; + const guchar *token, *next_token; int tokenlen; gchar response_chars[4]; @@ -446,12 +446,12 @@ */ *type = RTSP_REPLY; /* The first token is the version. */ - tokenlen = get_token_len(line, line+5, &next_token); + tokenlen = get_token_len(line, line+5, &token); if (tokenlen != 0) { /* The next token is the status code. */ - tokenlen = get_token_len(next_token, line+linelen, &next_token); + tokenlen = get_token_len(token, line+linelen, &next_token); if (tokenlen >= 3) { - memcpy(response_chars, next_token, 3); + memcpy(response_chars, token, 3); response_chars[3] = '\0'; rtsp_stat_info->response_code = (guint)strtoul(response_chars, NULL, 10); } diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-ses.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-ses.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-ses.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-ses.c 2014-09-16 12:09:03.000000000 -0400 @@ -1029,6 +1029,7 @@ type = tvb_get_guint8(tvb, offset); session.spdu_type = type; session.abort_type = SESSION_NO_ABORT; + session.pres_ctx_id = 0; session.ros_op = 0; session.rtse_reassemble = FALSE; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-sip.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-sip.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-sip.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-sip.c 2014-09-16 12:09:03.000000000 -0400 @@ -2653,7 +2653,7 @@ case POS_TO : - if(hdr_tree) { + /*if(hdr_tree)*/ { proto_item *item; sip_element_item = proto_tree_add_string_format(hdr_tree, @@ -3175,7 +3175,7 @@ break; } - if(hdr_tree) { + /*if(hdr_tree)*/ { comma_offset = value_offset; while((comma_offset = dissect_sip_contact_item(tvb, pinfo, sip_element_tree, comma_offset, next_offset, &contacts_expires_0, &contacts_expires_unknown)) != -1) diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-ssl-utils.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-ssl-utils.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-ssl-utils.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-ssl-utils.c 2014-09-16 12:09:03.000000000 -0400 @@ -5248,13 +5248,16 @@ ssl_dissect_hnd_hello_ext_status_request_v2(ssl_common_dissect_t *hf, tvbuff_t *tvb, proto_tree *tree, guint32 offset) { - guint list_len; + gint32 list_len; - list_len = tvb_get_ntoh24(tvb, offset); - offset += 3; + list_len = tvb_get_ntohs(tvb, offset); + offset += 2; - while (list_len-- > 0) + while (list_len > 0) { + guint32 prev_offset = offset; offset = ssl_dissect_hnd_hello_ext_status_request(hf, tvb, tree, offset, TRUE); + list_len -= (offset - prev_offset); + } return offset; } diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-trmac.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-trmac.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-trmac.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-trmac.c 2014-09-16 12:09:03.000000000 -0400 @@ -240,7 +240,7 @@ error_report_timer_value = 10 * tvb_get_ntohs(tvb, svoff+2); proto_tree_add_uint_format_value(sv_tree, hf_trmac_error_report_timer_value, tvb, svoff+2, sv_length-2, - error_report_timer_value, "%d ms", error_report_timer_value ); + error_report_timer_value, "%u ms", error_report_timer_value ); proto_item_append_text(sv_item, ": %d ms", error_report_timer_value ); break; @@ -606,7 +606,7 @@ /* Generated from convert_proto_tree_add_text.pl */ { &hf_trmac_local_ring_number, { "Local Ring Number", "trmac.local_ring_number", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_trmac_assign_physical_drop_number, { "Assign Physical Drop Number", "trmac.assign_physical_drop_number", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_trmac_error_report_timer_value, { "Error Report Timer Value", "trmac.error_report_timer_value", FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, + { &hf_trmac_error_report_timer_value, { "Error Report Timer Value", "trmac.error_report_timer_value", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_trmac_authorized_function_classes, { "Authorized Function Classes", "trmac.authorized_function_classes", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_trmac_authorized_access_priority, { "Authorized Access Priority", "trmac.authorized_access_priority", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_trmac_correlator, { "Correlator", "trmac.correlator", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-ucp.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-ucp.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-ucp.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-ucp.c 2014-09-16 12:09:03.000000000 -0400 @@ -1595,7 +1595,7 @@ UcpHandleByte(hf_ucp_parm_DD); UcpHandleTime(hf_ucp_parm_DDT); /* DDMMYYHHmm */ UcpHandleTime(hf_ucp_parm_VP); /* DDMMYYHHmm */ - UcpHandleData(hf_ucp_data_section); + UcpHandleIRAString(hf_ucp_parm_AMsg); } static void diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-vp8.c wireshark-1.12.1+g01b65bf/epan/dissectors/packet-vp8.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/packet-vp8.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/packet-vp8.c 2014-09-16 12:09:03.000000000 -0400 @@ -175,6 +175,7 @@ gboolean hasHeader = FALSE; col_set_str(pinfo->cinfo, COL_PROTOCOL, "VP8"); + col_clear(pinfo->cinfo, COL_INFO); item = proto_tree_add_item(tree, proto_vp8, tvb, 0, -1, ENC_NA); vp8_tree = proto_item_add_subtree(item, ett_vp8); @@ -593,7 +594,7 @@ if (!vp8_prefs_initialized) { vp8_handle = find_dissector("vp8"); dissector_add_string("rtp_dyn_payload_type","VP8", vp8_handle); - + vp8_prefs_initialized = TRUE; } else { range_foreach(dynamic_payload_type_range, range_delete_vp8_rtp_pt_callback); g_free(dynamic_payload_type_range); diff -Nru wireshark-1.12.0+git+4fab41a1/epan/dissectors/usb.c wireshark-1.12.1+g01b65bf/epan/dissectors/usb.c --- wireshark-1.12.0+git+4fab41a1/epan/dissectors/usb.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/dissectors/usb.c 2014-09-16 12:09:03.000000000 -0400 @@ -6611,12 +6611,14 @@ { 0x04a93260, "PowerShot SX270 HS" }, { 0x04a93261, "PowerShot A3500 IS" }, { 0x04a93262, "PowerShot A2600" }, + { 0x04a93263, "PowerShot SX275 HS" }, { 0x04a93264, "PowerShot A1400" }, { 0x04a93265, "Powershot ELPH 130 IS / IXUS 140" }, { 0x04a93268, "PowerShot ELPH 330 HS / IXUS 255 HS" }, { 0x04a93271, "PowerShot A2500" }, { 0x04a93276, "PowerShot SX170 IS" }, { 0x04a93277, "PowerShot SX510 HS" }, + { 0x04a93278, "PowerShot S200" }, { 0x04a9327d, "Powershot ELPH 115 IS / IXUS 132" }, { 0x04a9327f, "EOS Rebel T5 / EOS 1200D / EOS Kiss X70" }, { 0x04a93284, "PowerShot D30" }, @@ -6805,6 +6807,7 @@ { 0x04b41006, "Human Interface Device" }, { 0x04b42050, "hub" }, { 0x04b42830, "Opera1 DVB-S (cold state)" }, + { 0x04b43813, "NANO BIOS Programmer" }, { 0x04b44235, "Monitor 02 Driver" }, { 0x04b44381, "SCAPS USC-1 Scanner Controller" }, { 0x04b44611, "Storage Adapter FX2 (CY)" }, @@ -12290,7 +12293,7 @@ { 0x0930653e, "Flash Memory" }, { 0x09306540, "TransMemory Flash Memory" }, { 0x09306544, "Kingston DataTraveler 2.0 Stick (2GB)" }, - { 0x09306545, "Kingston DataTraveler 102 Flash Drive / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick" }, + { 0x09306545, "Kingston DataTraveler 102/2.0 / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick" }, { 0x09307100, "Toshiba Thrive AT100/AT105" }, { 0x09320300, "VideoAdvantage" }, { 0x09320302, "Syntek DC-112X" }, @@ -12999,6 +13002,7 @@ { 0x0b48300c, "TT-connect T-3650 CI" }, { 0x0b48300d, "TT-connect CT-3650 CI" }, { 0x0b48300e, "TT-connect C-2400" }, + { 0x0b483012, "TT-connect CT2-4650 CI" }, { 0x0b483014, "TT-TVStick CT2-4400" }, { 0x0b49064f, "Trance Vibrator" }, { 0x0b4b0100, "D'music MP3 Player" }, diff -Nru wireshark-1.12.0+git+4fab41a1/epan/enterprise-numbers wireshark-1.12.1+g01b65bf/epan/enterprise-numbers --- wireshark-1.12.0+git+4fab41a1/epan/enterprise-numbers 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/enterprise-numbers 2014-09-16 12:09:03.000000000 -0400 @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2014-07-27) +(last updated 2014-09-13) SMI Network Management Private Enterprise Codes: @@ -362,9 +362,9 @@ Jim Kinder jkinder&nat.com 87 - Institute of Telematics, University of Karlsruhe + Institute of Telematics, Karlsruhe Institute of Technology (KIT) Roland Bless - ldap&tm.uka.de + roland.bless&kit.edu 88 New York University Jimmy Kyriannis @@ -4507,8 +4507,8 @@ 100063.3642&compuserve.com 1123 Engenio Information Technologies, Inc. - Mark Johnson - mark.johnson&engenio-it.com + MSW Architecture team (Sean Olson) + mswarch&netapp.com 1124 NetSpan, Corp. Lawrence Halcomb @@ -20179,8 +20179,8 @@ info&kudaleinc.com 5049 Equifax Inc. - David Galas - david.galas&equifax.com + Larry Laughlin + hostmaster&equifax.com 5050 Nordmark NorLan Consult Tore Nordmark @@ -41407,8 +41407,8 @@ jwilliams&bluware.com 10363 Catbird Networks - Alec Peterson - ahp&catbird.com + Chris Melville + cmelville&catbird.com 10364 Central Manchester City Learning Center Shaun Gilchrist @@ -69307,9 +69307,9 @@ William J. Kammerer wkammerer&novannet.com 17439 - Matsushita Avionics Systems Corporation - Minhhai Nguyen - minhhai.nguyen&mascorp.com + Panasonic Avionics Corporation (previous was 'Matsushita Avionics Systems Corporation') + Louie Iturzaeta + Louie.Iturzaeta&panasonic.aero 17440 Omnipod, Inc. Jerry B. Altzman @@ -77109,8 +77109,8 @@ stephan.kurth&tlc.de 19389 ComSign Ltd. - Erez Shapira - ErezS&ComSign.co.il + Zeev Shetach + Zeev&ComSign.co.il 19390 Trend Software LLC VASILIY GAGIN @@ -92050,9 +92050,9 @@ Vitaly Gryzunov viv&nwudc.ru 23122 - Bluewin AG - Christian Schnidrig - 2048&bluewin.ch + Swisscom Ltd. - formely Bluewin AG + Guido Roeskens + scs.reg.iana&gmail.com 23123 gedas deutschland GmbH Manfred Gruner @@ -93644,9 +93644,9 @@ Scott Marquardt scott.marquardt&rbcmtg.com 23520 - NotJustHosting GbR - Frank Prößdorf - info¬justhosting.com + Unassigned + Removed 2014-08-12 + 23521 Amherst County Public Schools David Childress @@ -96691,8 +96691,8 @@ tomh&hdlccpropertytax.com 24281 Family Health International - Ken Rudd - krudd&fhi.org + Douglas Wilkins + dwilkins&fhi360.org 24282 StackFrame, LLC Gene McCulley @@ -97499,8 +97499,8 @@ info&lightbackups.com 24483 ISO New England Inc. - Richard Brooks - rbrooks&iso-ne.com + Jason Qualkenbush + jqualkenbush&iso-ne.com 24484 Advanced Broadcast Components Ltd. Ekkehard Domning @@ -99800,8 +99800,8 @@ csmark&ruraltechinc.com 25058 Bain Capital LLC - Paul Bebelos - pbebelos&baincapital.com + Jona Kee + jkee&baincapital.com 25059 Abicom International Mr David Edwards @@ -114000,9 +114000,9 @@ Kovács Balázs pen&jonapot.hu 28605 - Minters GmbH + Logicalis GmbH (previous was 'Minters GmbH') Hendrik Hasselberg - iana&minters.de + iana&logicalis.de 28606 TheFind, Inc. Alex Meyer @@ -126112,9 +126112,9 @@ Zu-xiong Qiu qiu1111&sh-titan.com 31633 - EBM Telecom AG + Quickline Business AG (previous was 'EBM Telecom AG') Benjamin Schlageter - b.schlageter&ebm.ch + benjamin.schlageter&business.quickline.ch 31634 ICT Embedded b.v. Jorg Wissink @@ -136274,7 +136274,7 @@ 34173 PD Software s.r.o. Pavel Dedík - pavel.dedik&pd.sk + pavel.dedik&pdsoftware.eu 34174 FastOnlinePM W. Greg Youree @@ -140825,8 +140825,8 @@ cmoates&gaggle.net 35311 ARANZ Medical Ltd - Kieron Telford - k.telford&aranz.com + Christopher Fairbairn + chris.fairbairn&aranzmedical.com 35312 gabosh Oliver Bohlen @@ -141974,8 +141974,8 @@ e.sheffer&mail.ru 35598 PIWorks Inc - Artem Fedorenko - artem.fedorenko&piworks.net + Baris Akpinar + subscription&piworks.net 35599 Marketware Antonio Barros de Sousa @@ -145957,9 +145957,9 @@ Paul De Audney pdeaudney&gmail.com 36594 - Telistar Solutions Pte Ltd + Certi Networks Sdn Bhd (previous was 'Telistar Solutions Pte Ltd') Jovi Yeong - jovi.yeong&telistarsolutions.com + jovi&certinetworks.com 36595 Ena Tecnologia, S.L. Miguel Angel Martin Mendez @@ -154390,8 +154390,8 @@ ADMIN&ECBIZNET.ORG 38702 Talisman Energy Inc - Andrew Bentley - abentley&talisman-energy.com + Jeff Pitman + jpitman&talisman-energy.com 38703 Advancia Corporation Rod Miller @@ -163162,8 +163162,8 @@ craig&cory-net.com 40895 VRVis Zentrum für Virtual Reality und Visualisierung Forschungs-GmbH - Sergej Schweizer, Adi Kriegisch - ssc&vrvis.at + Adi Kriegisch, Georg Muelleder + oid&vrvis.at 40896 Pearson Technology David Ferguson @@ -165401,9 +165401,9 @@ Mathias Globig mathias&globig-consulting.de 41455 - Chrisso Technologies, LLC - Neil Bedwell - neil.bedwell&chrissotech.com + International Radio and Electronics Corporation (previous was 'Chrisso Technologies, LLC') + Don Pettifor + dpettifor&irec1.com 41456 Tintri Inc. Rajiv Dharmadhikari @@ -173505,7 +173505,7 @@ Alanna Marquis info&caninecreche.co.za 43481 - Innovaatik Grupp OÜ + Innovaatik OÜ Jargo Kõster jargo&inno.ee 43482 @@ -174791,7 +174791,7 @@ 43802 Avaloq Evolution AG Jukka Salmi - jukka.salmi&avaloq.com + it-infrastructure&avaloq.com 43803 University of South Wales Jeremy Thomas @@ -176013,7 +176013,7 @@ Vincent D'Onofrio registration&rivada.com 44108 - Telecom S.A. + Telecom Argentina S.A. Javier Mendez javier.mendez&proveedor.telecom.com.ar 44109 @@ -176096,6 +176096,1190 @@ MapGear W. Goedhart w.goedhart&mapgear.nl +44129 + beijing yunzheng telecommunication technology Co, LTD + guohongliang + guohongliang&robustsync.com +44130 + Michael Ghazi + Michael Ghazi + hftekk&gmail.com +44131 + Nanjing DunLei Network Technology Co.,Ltd. + Jianping Shi + dlshijianping&gmail.com +44132 + OpsVision Solutions + David Ishmael + dishmael&opsvision.com +44133 + Commerce Technologies, Inc. + David Pigliavento + pen&commercehub.com +44134 + Bless Information & Communication Inc. + Bok Hyeon Lee + bhlee&bless.co.kr +44135 + Jonkoping Energi AB + Rickard Höglund + rickard.hoglund&jonkopingenergi.se +44136 + Data Controls Inc. + Keisuke Yamaguchi + info&dci.jp +44137 + KaiXiang + xinbo yan + xinbo.yan&kaixiangtech.com +44138 + NodeForge + Dave Franks + noc&nodeforge.com +44139 + Vizury Interactive Solutions Pvt. Ltd + Udai Singh Mehra + vizury.infracomm&vizury.com +44140 + Rapp Management AG + Michael Kretschmann + iana-pen&rapp.ch +44141 + Rosbank + Vitaliy Glushnev + vitaliy.glushnev&socgen.com +44142 + Edidin Group, Inc + Howard Edidin + hedidin&edidingroup.net +44143 + kazalo GmbH + Daniel Menzel + daniel.menzel&kazalo.de +44144 + Symbolic IO + Rakesh Patel + snmp-admin&SymbolicIO.com +44145 + Pokazz sp. z o.o. + Piotr Czekala + info&pokazz.com +44146 + INSYS K.Bartkowski, P.Czekala sp.j. + Piotr Czekala + info&insys.pl +44147 + Diagnostic Imaging Associates + Curtis Blankenship + curtis&diarads.net +44148 + Nanjing Tsinghua Novel Network Technology Co.,Ltd. + Han Chen + bsnch&163.com +44149 + KouXianglong + KouXianglong + 643166601&qq.com +44150 + Intermarketing Oy + Valtteri Konttinen + valtteri.konttinen&intermarketing.fi +44151 + Metrovision + Jacques Charlier + charlier&metrovision.fr +44152 + Kambio Company + Konstantin Yakovlev + kostya&kambio.com +44153 + DreamCode S.A.S. + Jorge Jonathan Ortiz Vélez + jonathan.ortiz&dreamcodesoft.com +44154 + InfoStreet, Inc. + Todd Paradise / Jeff Carlson + noc&infostreet.com +44155 + Sacred Heart Hospital of Allentown + Rebecca DiFrancesco + rdifranc&shh.org +44156 + Computer Applications & Technical Services + Ibrm Haymour + ibrm&cats.com.jo +44157 + Stadtverwaltung Duebendorf + Robert Steiner + robert.steiner&duebendorf.ch +44158 + Mediterranean Broadband Infrastructure s.r.l. + Roberto Ferrari + rferrari&mbigroup.it +44159 + DK-Technologies + Michael Kristensen + mk&dk-technologies.com +44160 + Contra Costa Oncology + Sara Cuff + sarac&contracostaoncology.com +44161 + Tri-County Hematology & Oncology Assoc. + Ruth Settle + rsettle&tricountyassoc.com +44162 + CHAMPLAIN VALLEY HEMATOLOGY ONCOLOGY, PC + MICHELLE PASCHALL + MICHELLE.PASCHALL&VTMEDNET.ORG +44163 + University of SS. Cyril and Methodius in Trnava + Marian Hercek + marian.hercek&ucm.sk +44164 + OutSmart Power Systems LLC + Uwe Meding + umeding&outsmartinc.com +44165 + Eduardo Miranda MD + Elizabeth Facundo + mbsbilling11&yahoo.com +44166 + Andrews & Patel Associates, P.C + Andrew Munchel + amunchel&andrewspatel.com +44167 + North Texas Gynecologic Oncology + Elizabeth Stevens + elizabeth.stevens&northtxgynonc.com +44168 + NetCraft Australia Pty Ltd + Geoffrey D. Bennett + oid&netcraft.com.au +44169 + FIDA INTERNATIONAL (S) PTE LTD + STEIN MA + stein_ma&prolink2u.com +44170 + Decision Group Inc. + Charles Chien + charles&decision.com.tw +44171 + RogSibAl LLC + Maxim Alexandrov + support&rogsibal.ru +44172 + Hangzhou Kuaiyue Mobile Technologies, Ltd. + ye daoliang + ye.dl&kuaiyuetech.com +44173 + InPhoSys Ltd + Jacques Peacock + jpeacock&callconnection.com +44174 + Baptist Health Cancer Care & Blood Disorders + Joshua Gold + joshua.gold&bhsi.com +44175 + Urology Cancer Center + Gary Glissman + gglissman&gucancer.com +44176 + SOCIETE REUNIONNAISE DU RADIOTELEPHONE + Christophe CAMON + christophe.camon&srr.fr +44177 + INSTITUTO DE HEMATOLOGIA Y ONCOLOGIA MEDICA, SRL + ALFREDO J MARTINEZ + amartinez&ihom-coi.com +44178 + Cancer Clinic + Leah Moore + Leah&cancerclinic.com +44179 + Daniel Stensnes + Daniel Stensnes + daniel&zift.no +44180 + Oncology & Hematology Associates of West Broward, P.A. + Jane Steinkamp + jane.steinkamp&ohawb.com +44181 + Chitra Venkatraman, M.D., P.A. + Veronica Avent + ronniesworld330&yahoo.com +44182 + Associates in Oncology/Hematology + Kimberly Roddy + kroddy&aohmd.com +44183 + Security Confidence Corporation + Matthew Corney + info&securityconfidence.com +44184 + Ma-Ya IT Consult, e.U. + Albin Mayer + albinm&mayaitc.com +44185 + Horizon Medical Group, Inc + Michelle Hamm + mhamm&horizonbioadvance.com +44186 + Keats, Connelly & Associates, LLC + Michael Connelly + Admin&Keatsconnelly.com +44187 + Zirtual Inc + Joe Tyson + joe.tyson&zirtual.com +44188 + Cancer Center Oncology Medical Group + Debbie Mason + dmason&grossmontoncology.com +44189 + Pacific Cancer Care + Valeria Wareham + vwareham&pacificcancercare.com +44190 + PostAR + Bostjan Kezmah + bostjan.kezmah&cepris.si +44191 + CLG Enterprises + Louie Gomes + IANA&CLGEnterprises.net +44192 + Remego Ltd. + See Kok Sin + koksin.see&remego.com +44193 + Beijing DATAX Technology Co., Ltd. + Xinhong Deng + dengxh&champor.com.cn +44194 + EnGenius Networks, Inc. + Joe Liang + joe.liang&senao.com +44195 + Southern Oncology Specialists, PLLC + Sarah Cowart + scowart&southern-oncology.com +44196 + SecureRF Corporation + Joanne Kelleher + jkelleher&securerf.com +44197 + Piedmont Cancer Institute + Penny DeMarco + pdemarco&piedmontcancerinstitute.com +44198 + Cancer and Hematology Centers of Western Michigan + Brian Kyllonen + bkyllonen&chcwm.com +44199 + University of New South Wales + Igor Grozdanov + i.grozdanov&unsw.edu.au +44200 + Markit Ltd + John Kennedy + john.kennedy&markit.com +44201 + Micromation.Net + Norberto Núñez + micromation.net&gmail.com +44202 + American Energy Partners, LP + Jamie Nelson + jamie.nelson&aep-lp.com +44203 + Global 3R Ltd. + Andrius Jankevicius + pen&fostral.net +44204 + Medical Oncology Associates of Long Island, PC + Sandra Rosenberg/Ronnie Morales + srosenberg&medoncli.com +44205 + BandRich, Inc. + Purine Chu + purine_chu&bandrich.com +44206 + Fujitsu Isotec Limited + Masatoshi Sato + masatoshi.sato&jp.fujitsu.com +44207 + Proxee Solutions + Louis-Pierre Morin + lpmorin&proxee.ca +44208 + Telecom Personal Paraguay + Norberto Isaac Núñez + Norberto.Nunez&personal.com.py +44209 + fsis GmbH + Fermin Sanchez + info&fsis.ch +44210 + Robadey Network + Nicolas Robadey + nicolas&robadey.net +44211 + GGR Communications Ltd + Ed Collen + ed.collen&ggr.net +44212 + Oncology Hematology Care of Connecticut, LLC + Nora Dias + noraoncology&gmail.com +44213 + Happy Gears Inc + Vadim Kurland + info&happygears.net +44214 + Erie Indemnity Company + Jamison Budacki + jamison.budacki&erieinsurance.com +44215 + Arsslensoft + Arsslen Idadi + arsslens021&gmail.com +44216 + FUYOH VIDEO INDUSTRY CO.,LTD. + Shinya Mochizuki + mochizuki&fva.co.jp +44217 + FiberRoad + Lifeng Zhang + lifeng_zhang&fiberroad.com.cn +44218 + Buffalo Boots GmbH + Michael Conradi + hostmaster&buffalo.de +44219 + Beijing Raytight Technologies, Co + Chao Gao + gaochao&raytight.com +44220 + Netzin Technology Corporation,.Ltd. + Jiun-Jie.Chang + jackie.chang&netzintech.com +44221 + Primary Oncology Network, PLLC + Tonia Flohr + toniaflohr&ponwv.com +44222 + Fox Valley Hematology Oncology/Illinois Cancer Specialists + AKHILA YESHWANT + akhilay&yahoo.com +44223 + GE AVIC Civil Avionics Systems Company Limited + Andrew Hodgman + andrew.hodgman&aviagesystems.com +44224 + MATTHEW TAUB MD PA + INGRID SANTOS + optimumoncology&gmail.com +44225 + Mr.yassine hamraoui + yassine hamraoui + yassinehamraoui2012&gmail.com +44226 + sonoran hematology oncology + aimee dundas + aimeedundas192&yahoo.com +44227 + Pulse Secure + Dmitry Teleganov + dt-iana&ux4.net +44228 + port GmbH + Marcus Tangermann + mt&port.de +44229 + Wanco Inc + Joseph Chen + joe.chen&wanco.com +44230 + Bundesamt für Seeschifffahrt und Hydrographie + Jörg Gerdes + joerg.gerdes&bsh.de +44231 + Queens Medical Associates, PC + Sadiaka Joarder + sjoarder&queensmedical.com +44232 + Ing. Büro Mann + Dipl.-Ing. U. Mann + oid.mann&bklev.de +44233 + Balluff GmbH + Markus Rentschler + Markus.Rentschler&balluff.de +44234 + VIT S.A. + WALTER SUAREZ + walter.suarezm&gmail.com +44235 + Ospero Pty. Ltd. + Jonathan Kerkin + jkerkin&ospero.com +44236 + Compassionate Oncology Medical Group + Joanne Ferri + joanne&compassionateoncology.org +44237 + Allegro Packets GmbH + Klaus Degner + iana&allegro-packets.com +44238 + Esense Embeded + Bojan Cupic + bojancupic&gmail.com +44239 + Centro de cancer de la mujer de Puerto Rico + Juan C Prieto + centrocancermujer&gmail.com +44240 + Rocket Internet AG + Alessandro Avagliano + alessandro.avagliano&rocket-internet.de +44241 + LotusCom Inc. + Houman Sadeghi Kaji + h.sadeghikaji&lotuscomsys.com +44242 + Radomir LLC + Roman Zolotov + zolotov&radomir.su +44243 + NSTEK Inc. + KyungTae Kim + mrlord7&nstek.com +44244 + Gardens Regional Hospital and Medical Center, Inc. + Anthony Carrasco + acarrasco&tcrmc.org +44245 + Fazion Sistemas Ltda + Moacyr Franco Neto + moacyr&fazion.com.br +44246 + St. Louis Cancer Care, LLC + Carol Riley + caroljriley&hotmail.com +44247 + CLEAR SRL + Marcos Vicentini + sistemas&clear.com.ar +44248 + Simula Research Laboratory + Nornet Ito + nornet-ito&simula.no +44249 + Florida Cancer Specialists & Research Institute + Donna L. Irving + dirving&flcancer.com +44250 + Coastal Integrative Cancer Care + Gail Kissinger + gkissinger&ohmacc.com +44251 + IMT Services Corp + Andrew Bent + andy&insuremytrip.com +44252 + Iceotope + Patrick Regnouf + Patrick.Regnouf&iceotope.com +44253 + HANKYUNG I-NET + lee ki dae + lkd&hkinet.co.kr +44254 + LuckyBulldozer + Ben Torkington + ben&luckybulldozer.com +44255 + Medical Oncology Associates of San Diego + Joyce Johnston + jjohnston&oncologysandiego.com +44256 + Kootenai Cancer Center + Johanna Bruning + jbruning&kh.org +44257 + Teraoka Weigh-System Pte Ltd + Desmond Lye + desmond&teraoka.com.sg +44258 + Hello World Ltd + Eric Yan + eric&hlwd.uk +44259 + Xstream Flow (Pty) Ltd + Andrew van Tonder + andrew.vantonder&xstreamflow.com +44260 + BALLY WULFF Games & Entertainment GmbH + Henry Gutknecht + it&bally-wulff.de +44261 + CARBOGEN AMCIS AG + Ryan Griffiths + ryan.griffiths&carbogen-amcis.com +44262 + BJ's Wholesale Club + Will Dalton + wdalton&bjs.com +44263 + Cancer Center of Sarasota Manatee + Shanthy Gadam + sgadam&cancersarasota.com +44264 + SurfCrew, Inc. + Todd Ignasiak + todd&surfcrew.com +44265 + Grotex OOO + Dmitriy Bubnov + iana-pen&luna-78.com +44266 + Luna-78 LLC + Dmitriy Bubnov + iana-pen&luna-78.com +44267 + Hematology & Oncology Associates of Alabama, LLC + Vaughn Skinner + vskinner&hoaallc.com +44268 + DynaScan Technology, Inc. + Asson Ko + asson&dynascan.com.tw +44269 + Beamly + Neil Saunders + neil&beamly.com +44270 + Barnardsoft Co., Ltd. + Masaaki Matsumi + matsumi.masaaki&barnardsoft.co.jp +44271 + Nuage Networks + Diego Garcia del Rio + diego&nuagenetworks.net +44272 + PRO-PflegeBeratung + Peter Andree + kontakt&pro-pflegeberatung.de +44273 + Gernert-Net + Björn Gernert + mail&gernert-net.de +44274 + Trit Networks LLC + Dima Dorfman + iana-pen&trit.net +44275 + Illumio, Inc. + Bryan Pelham + bryan.pelham&illumio.com +44276 + TANABIKI Inc. + Noriaki Tanabiki + n-tanabiki&tanabiki.com +44277 + Mike Tennant + Mike Tennant + mtennant&bigted.net +44278 + ShangHai RealCom Communication Technology Co.,Ltd. + Li Yan + tech&realcom.com.cn +44279 + ZheJiang University PRESS + Tong HuaZhang + tonghz&zju.edu.cn +44280 + F E T Elettronica snc + Marco Tani + info&fet.it +44281 + Blood & Marrow Transplant Group of Georgia + Robin Cullen + rcullen&bmtga.com +44282 + Microware Computing & Consulting Pvt Ltd + Sanjay Sangal + sanjay&sanjaysangal.com +44283 + Appnovation Technologies Inc + Will Sheldon + will&appnovation.com +44284 + Time4 Systems Ltd. + Kenneth Hann + ken&time4systems.com +44285 + New England Cancer Specialists + James Reddy + reddyj&newecs.org +44286 + Working Distributors, Inc. + Ken Mautz + it&workingdistributors.com +44287 + JConcept Open Solutions + OLIVIER SMADJA + olivier&jconcept.com.br +44288 + greaty + xiaoyong.huang + xiaoyong.huang&greatytech.com +44289 + Beijing Cyber Greatwall Information Technology Co., Ltd. + Liu Junfeng + info&cybergreatwall.com +44290 + Sajeev Anand, M.D., LLC + Robin Williams + rrwilliams726&gmail.com +44291 + New London Cancer Center + Mithlesh Govil + mgovil&gmail.com +44292 + emplus Networks Inc. + Stan H.Y, Liu + stan.liu&senao.com +44293 + Unwired Networks GmbH + Gregor Glashuettner + gregor.glashuettner&unwired.at +44294 + Quanta-Computing + Matthieu ROSINSKI + sysadmin&quanta-computing.com +44295 + SSE - Stuellein Software Engineering + Christian Stuellein + christian.stuellein&sse-engineering.de +44296 + HelmetHub + James Griffith + jgriffith&helmet-hub.com +44297 + Alliance Cancer Specialists, PC + Susan Lindner + bhoma130&gmail.com +44298 + CogVis GmbH + Jürgen Konetschnig + konetschnig&cogvis.at +44299 + I.M. Dauntless + Ramona Trevino + ramonatrevino&sbcglobal.net +44300 + Cyber1st R&D Ltd. + Jonathan Spurgin + jonathan.spurgin&cyber1st.co.uk +44301 + Alexander Maier GmbH + Alexander Maier + alexander.maier&maier-gst.de +44302 + Clearview Cancer Institute + Michelle Brown, Chief Operations Officer + mbrown&ccihsv.com +44303 + Netz-AG Emil-Figgestraße 15-39 + Fabian Reiners + fabian.reiners&wh-nef.de +44304 + HEMATOLOGY ONCOLOGY LIFE CENTER LLC + JULIE BEENE + JBEENE&HOLCMED.COM +44305 + Oncology Hematology Associates of Springfield, MD, PC + Amber Pierce + amberpierce22&gmail.com +44306 + CAROLINA ONCOLOGY ASSOCIATES, P.A. + EMILY SHEPHERD + ESHEPHERD&CAROLINAONCOLOGY.COM +44307 + LP Technologies, Inc. + Micky Mukalay + info&lptech.com +44308 + Centripetal Networks, Inc. + Justin Rogers + admin¢ripetalnetworks.com +44309 + Center for Cancer Care + Candace Hayes + chayes&suburban-hemonc.com +44310 + SiteSpect, Inc. + Simon Tetelbaum + stetelbaum&sitespect.com +44311 + Budapesti Fazekas Mihaly Gyakorlo Altalanos Iskola es Gimnazium + Herczeg Zsolt + herczeg.zsolt&fazekas.hu +44312 + Amundson Partners, Inc. + Mark Amundson PharmD + mpa&cableone.net +44313 + Johan Grip (ogun.org) + Johan Grip + ogun&ogun.org +44314 + Democritus University of Thrace + Ioannis Alexiadis + noc&duth.gr +44315 + Guido Di Fazio + Guido Di Fazio + g.difazio&mclink.it +44316 + Softneta UAB + Tomas Dumbliauskas + info&softneta.com +44317 + Kanton Zug (www.zg.ch) + Gisler Rudolf + rudolf.gisler&zg.ch +44318 + PT. Telekomunikasi Indonesia + Mohamad Fajar Aditya Masyhur + aditya_mh&telkom.co.id +44319 + Tulsa Cancer Institute PLLC + Madonna Gallant + Madonna.Gallant&cancercareokla.com +44320 + Lake Norman Hematology Oncology + Betty Adams + betty&lakenormanoncology.com +44321 + TrilioData, Inc + Muralidhar Balcha + murali.balcha&triliodata.com +44322 + Shenzhen Mailian Electronics Co.,Ltd + luo shuang shuang + 157641738&qq.com +44323 + SmartRG, Inc. + David La Cagnina + david.lacagnina&smartrg.com +44324 + EstiNet Technologies Inc. + Fuh-Jang Lin + lfj&estinet.com +44325 + TangoME, Inc. + Zach Carlson + chefs&tango.me +44326 + Kwartzlab Makerspace + Ben Brown + admin&kwartzlab.ca +44327 + Ardexa Pty Ltd + David Mohr + david.mohr&ardexa.com +44328 + tmon + Ingo Flaschberger + iana&tmon.at +44329 + Elektronik Art + Pawel Sienczak + pawel&elektronikart.pl +44330 + Xeneta AS + Pål Eivind Jacobsen Nes + pal.nes&xeneta.com +44331 + ZHAW Zürcher Hochschule für Angewandte Wissenschaften + Stephan Neuhaus + stephan.neuhaus&zhaw.ch +44332 + Wallarm, Inc + Alexander Golovko + admin&wallarm.com +44333 + artdecode.de + Stephan Neuhaus + sten&artdecode.de +44334 + Saint Vincent Physician Services, Inc. + Jennifer Woodbury + Jennifer.woodbury&stvincenthospital.com +44335 + Waverules LLC + John Handley + jhandley&waverules.com +44336 + Oncology Hematology Associates of Saginaw Valley, P.C. + Jennifer Metevia + jmetevia&jbartnik.com +44337 + ONCOLOGY ASSOCIATES OF MONROE + KRISTI HOLTON + kholtonoa&yahoo.com +44338 + Low Country Cancer Care Associates, P.C. + Jim Tucker + jtucker&lcccsav.com +44339 + Low Country Cancer Care Associates, P.C. + Jim Tucker + jtucker&lcccsav.com +44340 + Mid-Illinois Hematology & Oncology Associates, Ltd. + Sarah Whelan + sarah.whelan&mihoaonline.org +44341 + GreatCall, Inc. + Laurent Gousset + gcitsyseng&greatcall.com +44342 + Regional Cancer Care Associates LLC + Toni McCambridge + tmccambridge®ionalcancercare.org +44343 + Jackson Oncology Associates, PLLC + Ann Huff + joncology&jacksononcology.com +44344 + CANCER CENTER ASSOCIATES + LISA MCGILLEM + LMCGILLEM&CANCERCENTERASSOCIATES.COM +44345 + LLC, Sintek + Artem Svechnikov + svechnikov.artem&sintek-nn.ru +44346 + JSC "Promstroikontrakt" + Dmitry Valiavsky + admin&psk-holding.ru +44347 + IK SATPROF LLC + Dmitrii Zubchenko + dmitry.zubchenko&iksatprof.ru +44348 + NIL KSA + Michel Beloshitsky + mbeloshitsky&nilksa.ru +44349 + Highland Clinic, APMC + Renee' DeMoss + rdemoss&highlandclinic.com +44350 + Cancer Care Centers of Brevard + Gail Erentreich + gerentreich&hoacb.com +44351 + greglearns (Greg Edwards) + Greg Edwards + greg&greglearns.com +44352 + North Shore Hematology & Oncology Associates P.C. + ToniAnn Genna + tgenna&nshoa.com +44353 + Cancer Center of Central Connecticut, LLC + Susan Hansen + shh6219316&sbcglobal.net +44354 + Grace Hematology and Oncology + Amanda Strange + gracehematology01&yahoo.com +44355 + Oncology Hematology Associates of Northern PA, PC + Carrie Frederick + cbfrederick&ohanp.com +44356 + Trust Medical and Oncology Center + Alvaro Talavera + talaveramd&yahoo.com +44357 + Birchbox Inc. + Jereme Corrado + hostmaster&birchbox.com +44358 + Nashat Y Gabrail, MD Inc + Shelly Rentsch + skr1105&aol.com +44359 + Frederick P. Smith, MD PC + Mary McNeal + mmcneal&cchealthcare.net +44360 + EAST SIDE ONCOLOGY ASSOCIATES, PLLC + VALERIE VALLEJO + VAL629&AOL.COM +44361 + Dabas Cancer Institute, P.A. + Robin Lenz + rlenz930&gmail.com +44362 + Universidade Federal de Uberlandia + Divisao de Redes + dr&cti.ufu.br +44363 + CloudFlare + Noah Garrett Wallach + noc&cloudflare.com +44364 + AVEA + Huseyin Firat Kose + huseyinfirat.kose&avea.com.tr +44365 + DR. CHRISTOPHER T. SOPRENUK, M.D. P.A. + BETH SOPRENUK + zkstevens&hotmail.com +44366 + Essex Oncology of North Jersey PA + Denise Johnstone + dj&essexoncology.com +44367 + Highland Solutions + Stu Heiss + sheiss&highlandsolutions.com +44368 + Unmukti Technology Private Limited + Nishant Sharma + nishant&unmukti.in +44369 + NeoTerra Systems Inc. + Lam Nguyen + lam.nguyen&neoterra.ca +44370 + Utelisys Communications B.V. + Michiel Timmers + mtimmers&utelisys.com +44371 + Jay Steel + Jason Mallory + steelurban&yahoo.com +44372 + Valley Medical Oncology Consultants, A Medical Group, A Professional Corp + Arose Bey-Molina + abeymolina&vmoc.com +44373 + Regional Cancer Care Associates- Central Jersey Division + Eileen Peng + epeng®ionalcancercare.org +44374 + New England Hematology Oncology Associatesd + Amy Carlton + acarlton&neho.org +44375 + Eastern Long Island Hematology Oncology + Wayne Burgess + wburgess&optonline.net +44376 + Opus One Winery, LLC + Chris Dillon + noc&opusonewinery.com +44377 + Hudson Hematology Oncology + Barry Downer + barry24361838&yahoo.com +44378 + Stephan Gogler + Stephan Gogler + pen&gogler.at +44379 + Meanwave GmbH + Heiko Vachek + Heiko&Vachek.de +44380 + Desert Hematology Oncology Medical Group Inc. + Rita Flores + ritadho&aol.com +44381 + Medical Oncology Associates, PS + Sherry Cleveland + clevels&nwrm.com +44382 + Intec Pacific Pty. Ltd. + Spiro Asarloglou + spiro&intecpacific.com.au +44383 + Ascent Co.,Ltd + Tsutomu Asami + t.asami&ascent-jp.com +44384 + Harbour IT Pty Ltd + Brendan Thompson + ianaregistry&harbourit.com.au +44385 + BONSONINFO SYSTEM CO.,LTD + haobo.wang + wanghb&bonsoninfo.com +44386 + 3 Gen d.o.o. + Henrik Udovc + henrik.udovc&3gen.si +44387 + Conway Hematology Oncology + Priscilla Klosky + pklosky&conwaycorp.net +44388 + Medical and Surgical Clinic of Irving + Dorothy Ellis + dellis&mscitx.com +44389 + Max Planck Institute for Metabolism Research + Dr. Stefan Vollmar + vollmar&nf.mpg.de +44390 + Skootr.com + Scott Stephens + scott&skootr.com +44391 + Polytechnic West + Nat Hansen + icthelpdesk&polytechnic.wa.edu.au +44392 + Xperterra + Igor Sirkovich + info&xperterra.com +44393 + Pinellas Hematology &Oncology PA. + Iliana Bolton + iboltonhemonc&gmail.com +44394 + Province Nord - Nouvelle Calédonie + DSI Province Nord (Bernard Sautet) + pen_dsi_provincenord&province-nord.nc +44395 + Pierre Decazes + Pierre Decazes + pierre.decazes&gmail.com +44396 + Hilberling GmbH + Stefan Schmahl + sschmahl&hilberling.de +44397 + OTP Bank Plc. + David Attila + david.attila&otpbank.hu +44398 + SAITEL Telecomunicazioni s.r.l. + Carlo Banfi + support&saitel.it +44399 + Masgalor + Julian Röder + registration&masgalor.de +44400 + Eagle Investment Systems LLC + James Baker + jbaker&eagleinvsys.com +44401 + Meeting House Lane Medical Practice PC + Michelle Mullin + mmullin&southamptonhospital.org +44402 + Singh & Arora Oncology/Hematology, P.C. + Heather Decker + pheather76&hotmail.com +44403 + STUART ONCOLOGY ASSOCIATES + JAIMINI PATEL + pate7773&comcast.net +44404 + Climate-control NN, Ltd. + Marat Cheremhin + marcher&list.ru +44405 + Shenzhen Wintop Photoelectric Technology Co., Ltd + Jeff Ji + jeff&wintoptec.com +44406 + SMT S.A. + Tomasz Gąska + tomasz.gaska&smtsa.pl +44407 + Vidder, Inc. + Scott Shackleton + operations&vidder.com +44408 + Ventus Technologies S.L. + Joan Balagueró Valls + joan.balaguero&ventusproxy.com +44409 + OSNA Research + Dr. Michael Schukat + michael.schukat&osna-solutions.com +44410 + Versilis Inc + Jean-Francois Menier + jfmenier&versilis.com +44411 + Universidad Mariano Gálvez de Guatemala + Juan Manuel Lemus + jlemus&umg.edu.gt +44412 + Markus Froehlich + Markus Froehlich + pen.iana&marfr.de +44413 + Studievereniging A-Eskwadraat + Jitse Klomp + sysop&a-eskwadraat.nl +44414 + Aldazar LLC + David Marques + Bills&aldazar.com +44415 + Mikeji d.o.o. + Miha PIhler + miha.pihler&telnet.si +44416 + China Electronics Technology Group Corporation No.7 Research Institute + kinglee + kinglee_gci&139.com +44417 + Lazy Mountain Computers + Greg Jetter + greg&lazymountain.com +44418 + Shenzhen Haipengxin Electronics Co., Ltd. + Ms.Coco Zhou + cocozhou&hpxin.com +44419 + South County Hematology Oncology + Elena Lankford + elankford.scho&yahoo.com +44420 + Fairfax Media + Joe McNamara + jmcnamara&fairfaxmedia.com.au +44421 + Shen zhen huaptec co.,ltd + xieyanlin + 2580557001&qq.com +44422 + CloudGate Systems India Pvt Ltd + Abhik Biswas + abhik&cloudgate.in +44423 + Frederick G. Barr, MD + Mary Mcneal + mmcneal&cchealthcare.net +44424 + Nelson G.N. Kalil, MD PC + Mary McNeal + mmcneal&cchealthcare.net End of Document diff -Nru wireshark-1.12.0+git+4fab41a1/epan/ftypes/ftype-time.c wireshark-1.12.1+g01b65bf/epan/ftypes/ftype-time.c --- wireshark-1.12.0+git+4fab41a1/epan/ftypes/ftype-time.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/ftypes/ftype-time.c 2014-09-16 12:09:03.000000000 -0400 @@ -324,21 +324,27 @@ } static int -absolute_val_repr_len(fvalue_t *fv, ftrepr_t rtype _U_) +absolute_val_repr_len(fvalue_t *fv, ftrepr_t rtype) { gchar *rep; rep = abs_time_to_ep_str(&fv->value.time, ABSOLUTE_TIME_LOCAL, - rtype == FTREPR_DISPLAY); - return (int)strlen(rep) + 2; /* 2 for opening and closing quotes */ + rtype == FTREPR_DISPLAY); + return (int)strlen(rep) + ((rtype == FTREPR_DFILTER) ? 2 : 0); /* 2 for opening and closing quotes */ } static void -absolute_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, char *buf) +absolute_val_to_repr(fvalue_t *fv, ftrepr_t rtype, char *buf) { - sprintf(buf, "\"%s\"", - abs_time_to_ep_str(&fv->value.time, ABSOLUTE_TIME_LOCAL, - rtype == FTREPR_DISPLAY)); + gchar *rep; + + rep = abs_time_to_ep_str(&fv->value.time, ABSOLUTE_TIME_LOCAL, + rtype == FTREPR_DISPLAY); + if (rtype == FTREPR_DFILTER) { + sprintf(buf, "\"%s\"", rep); + } else { + strcpy(buf, rep); + } } static int diff -Nru wireshark-1.12.0+git+4fab41a1/epan/Makefile.am wireshark-1.12.1+g01b65bf/epan/Makefile.am --- wireshark-1.12.0+git+4fab41a1/epan/Makefile.am 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/Makefile.am 2014-09-16 12:09:03.000000000 -0400 @@ -54,7 +54,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 5:0:0 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 5:1:0 @LDFLAGS_SHAREDLIB@ include Makefile.common diff -Nru wireshark-1.12.0+git+4fab41a1/epan/nlpid.h wireshark-1.12.1+g01b65bf/epan/nlpid.h --- wireshark-1.12.0+git+4fab41a1/epan/nlpid.h 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/nlpid.h 2014-09-16 12:09:03.000000000 -0400 @@ -47,6 +47,7 @@ #define NLPID_ISO11577 0x8d /* X.273 */ #define NLPID_IP6 0x8e #define NLPID_COMPRESSED 0xb0 /* "Data compression protocol" */ +#define NLPID_TRILL 0xc0 #define NLPID_SNDCF 0xc1 /* "SubNetwork Dependent Convergence Function */ #define NLPID_IEEE_8021AQ 0xc1 /* IEEE 802.1aq (draft-ietf-isis-ieee-aq-05.txt); defined in context of ISIS "supported protocols" TLV */ #define NLPID_IP 0xcc diff -Nru wireshark-1.12.0+git+4fab41a1/epan/proto.c wireshark-1.12.1+g01b65bf/epan/proto.c --- wireshark-1.12.0+git+4fab41a1/epan/proto.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/proto.c 2014-09-16 12:09:03.000000000 -0400 @@ -99,7 +99,7 @@ since dissectors that want to do proto_item_set_len() or \ other operations that dereference this would crash. \ We fake FT_PROTOCOL unless some clients have requested us \ - not to do so. \ + not to do so. \ */ \ if (!tree) { \ free_block; \ @@ -139,13 +139,22 @@ /** See inlined comments. @param pi the created protocol item we're about to return */ -#define TRY_TO_FAKE_THIS_REPR(pi) \ +#define TRY_TO_FAKE_THIS_REPR(pi) \ g_assert(pi); \ if (!(PTREE_DATA(pi)->visible)) { \ /* If the tree (GUI) isn't visible it's pointless for us to generate the protocol \ * items string representation */ \ return pi; \ } +/* Same as above but returning void */ +#define TRY_TO_FAKE_THIS_REPR_VOID(pi) \ + if (!pi) \ + return; \ + if (!(PTREE_DATA(pi)->visible)) { \ + /* If the tree (GUI) isn't visible it's pointless for us to generate the protocol \ + * items string representation */ \ + return; \ + } static const char *hf_try_val_to_str(guint32 value, const header_field_info *hfinfo); @@ -4409,9 +4418,7 @@ field_info *fi = NULL; va_list ap; - if (pi == NULL) { - return; - } + TRY_TO_FAKE_THIS_REPR_VOID(pi); fi = PITEM_FINFO(pi); if (fi == NULL) @@ -4435,9 +4442,7 @@ size_t curlen; va_list ap; - if (pi == NULL) { - return; - } + TRY_TO_FAKE_THIS_REPR_VOID(pi); fi = PITEM_FINFO(pi); if (fi == NULL) { @@ -4472,9 +4477,7 @@ char representation[ITEM_LABEL_LENGTH]; va_list ap; - if (pi == NULL) { - return; - } + TRY_TO_FAKE_THIS_REPR_VOID(pi); fi = PITEM_FINFO(pi); if (fi == NULL) { @@ -4505,8 +4508,7 @@ { field_info *fi; - if (pi == NULL) - return; + TRY_TO_FAKE_THIS_REPR_VOID(pi); fi = PITEM_FINFO(pi); if (fi == NULL) @@ -4536,8 +4538,7 @@ { field_info *fi; - if (pi == NULL) - return; + TRY_TO_FAKE_THIS_REPR_VOID(pi); fi = PITEM_FINFO(pi); if (fi == NULL) diff -Nru wireshark-1.12.0+git+4fab41a1/epan/sminmpec.c wireshark-1.12.1+g01b65bf/epan/sminmpec.c --- wireshark-1.12.0+git+4fab41a1/epan/sminmpec.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/sminmpec.c 2014-09-16 12:09:03.000000000 -0400 @@ -107,7 +107,7 @@ { 84, "Pirelli Focom Ltd." }, { 85, "Datability Software Systems" }, { 86, "Network Application Technology" }, - { 87, "Institute of Telematics, University of Karlsruhe" }, + { 87, "Institute of Telematics, Karlsruhe Institute of Technology (KIT)" }, { 88, "New York University" }, { 89, "RND" }, { 90, "InterCon Systems Corporation" }, @@ -17459,7 +17459,7 @@ { 17436, "Worlight International" }, { 17437, "Insurance Corporation of British Columbia" }, { 17438, "Novannet, LLC" }, - { 17439, "Matsushita Avionics Systems Corporation" }, + { 17439, "Panasonic Avionics Corporation (previous was 'Matsushita Avionics Systems Corporation')" }, { 17440, "Omnipod, Inc." }, { 17441, "Unholy.org" }, { 17442, "Iter8 Inc." }, @@ -23142,7 +23142,7 @@ { 23119, "Shevchenko Didkovskiy & Partners" }, { 23120, "BFE Studio and Media Systems GmbH" }, { 23121, "Saint-Petersburg Certification Authority" }, - { 23122, "Bluewin AG" }, + { 23122, "Swisscom Ltd. - formely Bluewin AG" }, { 23123, "gedas deutschland GmbH" }, { 23124, "Dickey Rural Telephone Cooperative" }, { 23125, "Spring Lake Consulting, LLC" }, @@ -23540,7 +23540,7 @@ { 23517, "Leviton Voice And Data" }, { 23518, "Tomas Zoufaly" }, { 23519, "Regal-Beloit Corporation" }, - { 23520, "NotJustHosting GbR" }, + { 23520, "Unassigned" }, { 23521, "Amherst County Public Schools" }, { 23522, "Volicon, Inc." }, { 23523, "MT Consulting S.A." }, @@ -28625,7 +28625,7 @@ { 28602, "LogicBox, Inc." }, { 28603, "MEDNETWorld.com, Inc (previously was 'MEDNET USA, Inc')" }, { 28604, "Factory Creative Studio Ltd." }, - { 28605, "Minters GmbH" }, + { 28605, "Logicalis GmbH (previous was 'Minters GmbH')" }, { 28606, "TheFind, Inc." }, { 28607, "coforum" }, { 28608, "Technomonk Industries" }, @@ -31653,7 +31653,7 @@ { 31630, "media concept GmbH" }, { 31631, "Conseil R\0303\0251gional Nord - Pas de Calais" }, { 31632, "Shanghai Titan Technology Co., Ltd." }, - { 31633, "EBM Telecom AG" }, + { 31633, "Quickline Business AG (previous was 'EBM Telecom AG')" }, { 31634, "ICT Embedded b.v." }, { 31635, "TextFunnel" }, { 31636, "Shanghai Colorful Magnetic Resonance Technology Co. Ltd." }, @@ -36614,7 +36614,7 @@ { 36591, "Prefeitura Municipal de Fortaleza" }, { 36592, "The CBORD Group, Inc." }, { 36593, "Paul De Audney" }, - { 36594, "Telistar Solutions Pte Ltd" }, + { 36594, "Certi Networks Sdn Bhd (previous was 'Telistar Solutions Pte Ltd')" }, { 36595, "Ena Tecnologia, S.L." }, { 36596, "Dachser GmbH & Co. KG" }, { 36597, "PRDS" }, @@ -41475,7 +41475,7 @@ { 41452, "LUISLAIN.COM" }, { 41453, "Decura IM LLP" }, { 41454, "Globig Consulting" }, - { 41455, "Chrisso Technologies, LLC" }, + { 41455, "International Radio and Electronics Corporation (previous was 'Chrisso Technologies, LLC')" }, { 41456, "Tintri Inc." }, { 41457, "Bauman Moscow State Technical University (BMSTU)" }, { 41458, "Ensoft Ltd" }, @@ -43501,7 +43501,7 @@ { 43478, "Jonathon Anderson (civilfritz)" }, { 43479, "Ecole nationale Sup\0303\0251rieure d'Informatique" }, { 43480, "Canine Creche" }, - { 43481, "Innovaatik Grupp O\0303\0234" }, + { 43481, "Innovaatik O\0303\0234 " }, { 43482, "GlobalSensing Technologies" }, { 43483, "AIPHONE CO., LTD." }, { 43484, "Fundaci\0303\0263n Fulgor" }, @@ -44128,7 +44128,7 @@ { 44105, "BHS tabletop AG" }, { 44106, "IMSWorkX, Inc." }, { 44107, "Rivada Networks, LLC" }, - { 44108, "Telecom S.A." }, + { 44108, "Telecom Argentina S.A." }, { 44109, "FAA National Airspace Systems" }, { 44110, "Nowa Era Sp. z o.o." }, { 44111, "Guangzhou Younghead Electronic Technology Co.,Ltd" }, @@ -44149,6 +44149,302 @@ { 44126, "Lookhere Design" }, { 44127, "Borderlight AB" }, { 44128, "MapGear" }, + { 44129, "beijing yunzheng telecommunication technology Co, LTD" }, + { 44130, "Michael Ghazi" }, + { 44131, "Nanjing DunLei Network Technology Co.,Ltd." }, + { 44132, "OpsVision Solutions" }, + { 44133, "Commerce Technologies, Inc." }, + { 44134, "Bless Information & Communication Inc." }, + { 44135, "Jonkoping Energi AB" }, + { 44136, "Data Controls Inc." }, + { 44137, "KaiXiang" }, + { 44138, "NodeForge" }, + { 44139, "Vizury Interactive Solutions Pvt. Ltd" }, + { 44140, "Rapp Management AG" }, + { 44141, "Rosbank" }, + { 44142, "Edidin Group, Inc" }, + { 44143, "kazalo GmbH" }, + { 44144, "Symbolic IO" }, + { 44145, "Pokazz sp. z o.o." }, + { 44146, "INSYS K.Bartkowski, P.Czekala sp.j." }, + { 44147, "Diagnostic Imaging Associates" }, + { 44148, "Nanjing Tsinghua Novel Network Technology Co.,Ltd." }, + { 44149, "KouXianglong" }, + { 44150, "Intermarketing Oy" }, + { 44151, "Metrovision" }, + { 44152, "Kambio Company" }, + { 44153, "DreamCode S.A.S." }, + { 44154, "InfoStreet, Inc." }, + { 44155, "Sacred Heart Hospital of Allentown" }, + { 44156, "Computer Applications & Technical Services" }, + { 44157, "Stadtverwaltung Duebendorf" }, + { 44158, "Mediterranean Broadband Infrastructure s.r.l." }, + { 44159, "DK-Technologies" }, + { 44160, "Contra Costa Oncology" }, + { 44161, "Tri-County Hematology & Oncology Assoc." }, + { 44162, "CHAMPLAIN VALLEY HEMATOLOGY ONCOLOGY, PC" }, + { 44163, "University of SS. Cyril and Methodius in Trnava" }, + { 44164, "OutSmart Power Systems LLC" }, + { 44165, "Eduardo Miranda MD" }, + { 44166, "Andrews & Patel Associates, P.C" }, + { 44167, "North Texas Gynecologic Oncology" }, + { 44168, "NetCraft Australia Pty Ltd" }, + { 44169, "FIDA INTERNATIONAL (S) PTE LTD" }, + { 44170, "Decision Group Inc." }, + { 44171, "RogSibAl LLC" }, + { 44172, "Hangzhou Kuaiyue Mobile Technologies, Ltd." }, + { 44173, "InPhoSys Ltd" }, + { 44174, "Baptist Health Cancer Care & Blood Disorders" }, + { 44175, "Urology Cancer Center" }, + { 44176, "SOCIETE REUNIONNAISE DU RADIOTELEPHONE" }, + { 44177, "INSTITUTO DE HEMATOLOGIA Y ONCOLOGIA MEDICA, SRL" }, + { 44178, "Cancer Clinic" }, + { 44179, "Daniel Stensnes" }, + { 44180, "Oncology & Hematology Associates of West Broward, P.A." }, + { 44181, "Chitra Venkatraman, M.D., P.A." }, + { 44182, "Associates in Oncology/Hematology" }, + { 44183, "Security Confidence Corporation" }, + { 44184, "Ma-Ya IT Consult, e.U." }, + { 44185, "Horizon Medical Group, Inc" }, + { 44186, "Keats, Connelly & Associates, LLC" }, + { 44187, "Zirtual Inc" }, + { 44188, "Cancer Center Oncology Medical Group" }, + { 44189, "Pacific Cancer Care" }, + { 44190, "PostAR" }, + { 44191, "CLG Enterprises" }, + { 44192, "Remego Ltd." }, + { 44193, "Beijing DATAX Technology Co., Ltd." }, + { 44194, "EnGenius Networks, Inc." }, + { 44195, "Southern Oncology Specialists, PLLC" }, + { 44196, "SecureRF Corporation" }, + { 44197, "Piedmont Cancer Institute" }, + { 44198, "Cancer and Hematology Centers of Western Michigan" }, + { 44199, "University of New South Wales" }, + { 44200, "Markit Ltd" }, + { 44201, "Micromation.Net" }, + { 44202, "American Energy Partners, LP" }, + { 44203, "Global 3R Ltd." }, + { 44204, "Medical Oncology Associates of Long Island, PC" }, + { 44205, "BandRich, Inc." }, + { 44206, "Fujitsu Isotec Limited" }, + { 44207, "Proxee Solutions" }, + { 44208, "Telecom Personal Paraguay" }, + { 44209, "fsis GmbH" }, + { 44210, "Robadey Network" }, + { 44211, "GGR Communications Ltd" }, + { 44212, "Oncology Hematology Care of Connecticut, LLC" }, + { 44213, "Happy Gears Inc" }, + { 44214, "Erie Indemnity Company" }, + { 44215, "Arsslensoft" }, + { 44216, "FUYOH VIDEO INDUSTRY CO.,LTD." }, + { 44217, "FiberRoad" }, + { 44218, "Buffalo Boots GmbH" }, + { 44219, "Beijing Raytight Technologies, Co" }, + { 44220, "Netzin Technology Corporation,.Ltd." }, + { 44221, "Primary Oncology Network, PLLC" }, + { 44222, "Fox Valley Hematology Oncology/Illinois Cancer Specialists" }, + { 44223, "GE AVIC Civil Avionics Systems Company Limited" }, + { 44224, "MATTHEW TAUB MD PA" }, + { 44225, "Mr.yassine hamraoui" }, + { 44226, "sonoran hematology oncology" }, + { 44227, "Pulse Secure" }, + { 44228, "port GmbH" }, + { 44229, "Wanco Inc" }, + { 44230, "Bundesamt f\0303\0274r Seeschifffahrt und Hydrographie" }, + { 44231, "Queens Medical Associates, PC" }, + { 44232, "Ing. B\0303\0274ro Mann" }, + { 44233, "Balluff GmbH" }, + { 44234, "VIT S.A." }, + { 44235, "Ospero Pty. Ltd." }, + { 44236, "Compassionate Oncology Medical Group" }, + { 44237, "Allegro Packets GmbH" }, + { 44238, "Esense Embeded" }, + { 44239, "Centro de cancer de la mujer de Puerto Rico" }, + { 44240, "Rocket Internet AG" }, + { 44241, "LotusCom Inc." }, + { 44242, "Radomir LLC" }, + { 44243, "NSTEK Inc." }, + { 44244, "Gardens Regional Hospital and Medical Center, Inc." }, + { 44245, "Fazion Sistemas Ltda" }, + { 44246, "St. Louis Cancer Care, LLC" }, + { 44247, "CLEAR SRL" }, + { 44248, "Simula Research Laboratory" }, + { 44249, "Florida Cancer Specialists & Research Institute" }, + { 44250, "Coastal Integrative Cancer Care" }, + { 44251, "IMT Services Corp" }, + { 44252, "Iceotope" }, + { 44253, "HANKYUNG I-NET" }, + { 44254, "LuckyBulldozer" }, + { 44255, "Medical Oncology Associates of San Diego" }, + { 44256, "Kootenai Cancer Center" }, + { 44257, "Teraoka Weigh-System Pte Ltd" }, + { 44258, "Hello World Ltd" }, + { 44259, "Xstream Flow (Pty) Ltd" }, + { 44260, "BALLY WULFF Games & Entertainment GmbH" }, + { 44261, "CARBOGEN AMCIS AG" }, + { 44262, "BJ's Wholesale Club" }, + { 44263, "Cancer Center of Sarasota Manatee" }, + { 44264, "SurfCrew, Inc." }, + { 44265, "Grotex OOO" }, + { 44266, "Luna-78 LLC" }, + { 44267, "Hematology & Oncology Associates of Alabama, LLC" }, + { 44268, "DynaScan Technology, Inc." }, + { 44269, "Beamly" }, + { 44270, "Barnardsoft Co., Ltd." }, + { 44271, "Nuage Networks" }, + { 44272, "PRO-PflegeBeratung" }, + { 44273, "Gernert-Net" }, + { 44274, "Trit Networks LLC" }, + { 44275, "Illumio, Inc." }, + { 44276, "TANABIKI Inc." }, + { 44277, "Mike Tennant" }, + { 44278, "ShangHai RealCom Communication Technology Co.,Ltd." }, + { 44279, "ZheJiang University PRESS" }, + { 44280, "F E T Elettronica snc" }, + { 44281, "Blood & Marrow Transplant Group of Georgia" }, + { 44282, "Microware Computing & Consulting Pvt Ltd" }, + { 44283, "Appnovation Technologies Inc" }, + { 44284, "Time4 Systems Ltd." }, + { 44285, "New England Cancer Specialists" }, + { 44286, "Working Distributors, Inc." }, + { 44287, "JConcept Open Solutions" }, + { 44288, "greaty" }, + { 44289, "Beijing Cyber Greatwall Information Technology Co., Ltd." }, + { 44290, "Sajeev Anand, M.D., LLC" }, + { 44291, "New London Cancer Center" }, + { 44292, "emplus Networks Inc." }, + { 44293, "Unwired Networks GmbH" }, + { 44294, "Quanta-Computing" }, + { 44295, "SSE - Stuellein Software Engineering" }, + { 44296, "HelmetHub" }, + { 44297, "Alliance Cancer Specialists, PC" }, + { 44298, "CogVis GmbH" }, + { 44299, "I.M. Dauntless" }, + { 44300, "Cyber1st R&D Ltd." }, + { 44301, "Alexander Maier GmbH" }, + { 44302, "Clearview Cancer Institute" }, + { 44303, "Netz-AG Emil-Figgestra\0303\0237e 15-39" }, + { 44304, "HEMATOLOGY ONCOLOGY LIFE CENTER LLC" }, + { 44305, "Oncology Hematology Associates of Springfield, MD, PC" }, + { 44306, "CAROLINA ONCOLOGY ASSOCIATES, P.A." }, + { 44307, "LP Technologies, Inc." }, + { 44308, "Centripetal Networks, Inc." }, + { 44309, "Center for Cancer Care" }, + { 44310, "SiteSpect, Inc." }, + { 44311, "Budapesti Fazekas Mihaly Gyakorlo Altalanos Iskola es Gimnazium" }, + { 44312, "Amundson Partners, Inc." }, + { 44313, "Johan Grip (ogun.org)" }, + { 44314, "Democritus University of Thrace" }, + { 44315, "Guido Di Fazio" }, + { 44316, "Softneta UAB" }, + { 44317, "Kanton Zug (www.zg.ch)" }, + { 44318, "PT. Telekomunikasi Indonesia" }, + { 44319, "Tulsa Cancer Institute PLLC" }, + { 44320, "Lake Norman Hematology Oncology" }, + { 44321, "TrilioData, Inc" }, + { 44322, "Shenzhen Mailian Electronics Co.,Ltd" }, + { 44323, "SmartRG, Inc." }, + { 44324, "EstiNet Technologies Inc." }, + { 44325, "TangoME, Inc." }, + { 44326, "Kwartzlab Makerspace" }, + { 44327, "Ardexa Pty Ltd" }, + { 44328, "tmon" }, + { 44329, "Elektronik Art" }, + { 44330, "Xeneta AS" }, + { 44331, "ZHAW Z\0303\0274rcher Hochschule f\0303\0274r Angewandte Wissenschaften" }, + { 44332, "Wallarm, Inc" }, + { 44333, "artdecode.de" }, + { 44334, "Saint Vincent Physician Services, Inc." }, + { 44335, "Waverules LLC" }, + { 44336, "Oncology Hematology Associates of Saginaw Valley, P.C." }, + { 44337, "ONCOLOGY ASSOCIATES OF MONROE" }, + { 44338, "Low Country Cancer Care Associates, P.C." }, + { 44339, "Low Country Cancer Care Associates, P.C." }, + { 44340, "Mid-Illinois Hematology & Oncology Associates, Ltd." }, + { 44341, "GreatCall, Inc." }, + { 44342, "Regional Cancer Care Associates LLC" }, + { 44343, "Jackson Oncology Associates, PLLC" }, + { 44344, "CANCER CENTER ASSOCIATES" }, + { 44345, "LLC, Sintek" }, + { 44346, "JSC \"Promstroikontrakt\"" }, + { 44347, "IK SATPROF LLC" }, + { 44348, "NIL KSA" }, + { 44349, "Highland Clinic, APMC" }, + { 44350, "Cancer Care Centers of Brevard" }, + { 44351, "greglearns (Greg Edwards)" }, + { 44352, "North Shore Hematology & Oncology Associates P.C." }, + { 44353, "Cancer Center of Central Connecticut, LLC" }, + { 44354, "Grace Hematology and Oncology" }, + { 44355, "Oncology Hematology Associates of Northern PA, PC" }, + { 44356, "Trust Medical and Oncology Center" }, + { 44357, "Birchbox Inc." }, + { 44358, "Nashat Y Gabrail, MD Inc " }, + { 44359, "Frederick P. Smith, MD PC" }, + { 44360, "EAST SIDE ONCOLOGY ASSOCIATES, PLLC" }, + { 44361, "Dabas Cancer Institute, P.A." }, + { 44362, "Universidade Federal de Uberlandia" }, + { 44363, "CloudFlare" }, + { 44364, "AVEA" }, + { 44365, "DR. CHRISTOPHER T. SOPRENUK, M.D. P.A." }, + { 44366, "Essex Oncology of North Jersey PA" }, + { 44367, "Highland Solutions" }, + { 44368, "Unmukti Technology Private Limited" }, + { 44369, "NeoTerra Systems Inc." }, + { 44370, "Utelisys Communications B.V." }, + { 44371, "Jay Steel" }, + { 44372, "Valley Medical Oncology Consultants, A Medical Group, A Professional Corp" }, + { 44373, "Regional Cancer Care Associates- Central Jersey Division" }, + { 44374, "New England Hematology Oncology Associatesd" }, + { 44375, "Eastern Long Island Hematology Oncology " }, + { 44376, "Opus One Winery, LLC" }, + { 44377, "Hudson Hematology Oncology " }, + { 44378, "Stephan Gogler" }, + { 44379, "Meanwave GmbH" }, + { 44380, "Desert Hematology Oncology Medical Group Inc." }, + { 44381, "Medical Oncology Associates, PS" }, + { 44382, "Intec Pacific Pty. Ltd." }, + { 44383, "Ascent Co.,Ltd" }, + { 44384, "Harbour IT Pty Ltd" }, + { 44385, "BONSONINFO SYSTEM CO.,LTD" }, + { 44386, "3 Gen d.o.o." }, + { 44387, "Conway Hematology Oncology" }, + { 44388, "Medical and Surgical Clinic of Irving" }, + { 44389, "Max Planck Institute for Metabolism Research" }, + { 44390, "Skootr.com" }, + { 44391, "Polytechnic West" }, + { 44392, "Xperterra" }, + { 44393, "Pinellas Hematology &Oncology PA." }, + { 44394, "Province Nord - Nouvelle Cal\0303\0251donie" }, + { 44395, "Pierre Decazes" }, + { 44396, "Hilberling GmbH" }, + { 44397, "OTP Bank Plc." }, + { 44398, "SAITEL Telecomunicazioni s.r.l." }, + { 44399, "Masgalor" }, + { 44400, "Eagle Investment Systems LLC" }, + { 44401, "Meeting House Lane Medical Practice PC" }, + { 44402, "Singh & Arora Oncology/Hematology, P.C." }, + { 44403, "STUART ONCOLOGY ASSOCIATES" }, + { 44404, "Climate-control NN, Ltd." }, + { 44405, "Shenzhen Wintop Photoelectric Technology Co., Ltd" }, + { 44406, "SMT S.A." }, + { 44407, "Vidder, Inc." }, + { 44408, "Ventus Technologies S.L." }, + { 44409, "OSNA Research" }, + { 44410, "Versilis Inc" }, + { 44411, "Universidad Mariano G\0303\0241lvez de Guatemala" }, + { 44412, "Markus Froehlich" }, + { 44413, "Studievereniging A-Eskwadraat" }, + { 44414, "Aldazar LLC" }, + { 44415, "Mikeji d.o.o." }, + { 44416, "China Electronics Technology Group Corporation No.7 Research Institute" }, + { 44417, "Lazy Mountain Computers" }, + { 44418, "Shenzhen Haipengxin Electronics Co., Ltd." }, + { 44419, "South County Hematology Oncology" }, + { 44420, "Fairfax Media" }, + { 44421, "Shen zhen huaptec co.,ltd" }, + { 44422, "CloudGate Systems India Pvt Ltd" }, + { 44423, "Frederick G. Barr, MD" }, + { 44424, "Nelson G.N. Kalil, MD PC" }, { 0, NULL} }; diff -Nru wireshark-1.12.0+git+4fab41a1/epan/wmem/wmem_core.h wireshark-1.12.1+g01b65bf/epan/wmem/wmem_core.h --- wireshark-1.12.0+git+4fab41a1/epan/wmem/wmem_core.h 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/wmem/wmem_core.h 2014-09-16 12:09:03.000000000 -0400 @@ -88,6 +88,9 @@ #define wmem_new(allocator, type) \ ((type*)wmem_alloc((allocator), sizeof(type))) +#define wmem_safe_mult(A, B) \ + ((((A) <= 0) || ((B) <= 0) || ((gsize)(A) > (G_MAXSSIZE / (gsize)(B)))) ? 0 : ((A) * (B))) + /** Allocate memory sufficient to hold n objects of the given type. * * @param allocator The allocator object to use to allocate the memory. @@ -96,7 +99,7 @@ * @return A void pointer to the newly allocated memory. */ #define wmem_alloc_array(allocator, type, num) \ - ((type*)wmem_alloc((allocator), sizeof(type) * (num))) + ((type*)wmem_alloc((allocator), wmem_safe_mult(sizeof(type), num))) /** Allocate the requested amount of memory in the given pool. Initializes the * allocated memory with zeroes. @@ -129,7 +132,7 @@ * @return A void pointer to the newly allocated and zeroed memory. */ #define wmem_alloc0_array(allocator, type, num) \ - ((type*)wmem_alloc0((allocator), sizeof(type) * (num))) + ((type*)wmem_alloc0((allocator), wmem_safe_mult(sizeof(type), (num)))) /** Returns the allocated memory to the allocator. This function should only * be called directly by allocators when the allocated block is sufficiently diff -Nru wireshark-1.12.0+git+4fab41a1/epan/wslua/lrexlib_algo.h wireshark-1.12.1+g01b65bf/epan/wslua/lrexlib_algo.h --- wireshark-1.12.0+git+4fab41a1/epan/wslua/lrexlib_algo.h 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/wslua/lrexlib_algo.h 2014-09-16 12:09:03.000000000 -0400 @@ -294,16 +294,16 @@ freelist_init (&freelist); /*------------------------------------------------------------------*/ if (argE.reptype == LUA_TSTRING) { - buffer_init (&BufRep, 256, L, &freelist); + tagbuffer_init (&BufRep, 256, L, &freelist); BUFFERZ_PUTREPSTRING (&BufRep, argE.funcpos, ALG_NSUB(ud)); } /*------------------------------------------------------------------*/ if (argE.maxmatch == GSUB_CONDITIONAL) { - buffer_init (&BufTemp, 1024, L, &freelist); + tagbuffer_init (&BufTemp, 1024, L, &freelist); pBuf = &BufTemp; } /*------------------------------------------------------------------*/ - buffer_init (&BufOut, 1024, L, &freelist); + tagbuffer_init (&BufOut, 1024, L, &freelist); SET_RETRY (retry, 0); while ((argE.maxmatch < 0 || n_match < argE.maxmatch) && st <= (int)argE.textlen) { int from, to, res; @@ -313,7 +313,7 @@ #ifdef ALG_USERETRY if (retry) { if (st < (int)argE.textlen) { /* advance by 1 char (not replaced) */ - buffer_addlstring (&BufOut, argE.text + st, ALG_CHARSIZE); + tagbuffer_addlstring (&BufOut, argE.text + st, ALG_CHARSIZE); st += ALG_CHARSIZE; retry = 0; continue; @@ -330,7 +330,7 @@ from = ALG_BASE(st) + ALG_SUBBEG(ud,0); to = ALG_BASE(st) + ALG_SUBEND(ud,0); if (st < from) { - buffer_addlstring (&BufOut, argE.text + st, from - st); + tagbuffer_addlstring (&BufOut, argE.text + st, from - st); #ifdef ALG_PULL st = from; #endif @@ -341,9 +341,9 @@ const char *str; while (bufferZ_next (&BufRep, &iter, &num, &str)) { if (str) - buffer_addlstring (pBuf, str, num); + tagbuffer_addlstring (pBuf, str, num); else if (num == 0 || ALG_SUBVALID (ud,(int)num)) - buffer_addlstring (pBuf, argE.text + ALG_BASE(st) + ALG_SUBBEG(ud,(int)num), ALG_SUBLEN(ud,(int)num)); + tagbuffer_addlstring (pBuf, argE.text + ALG_BASE(st) + ALG_SUBBEG(ud,(int)num), ALG_SUBLEN(ud,(int)num)); } curr_subst = 1; } @@ -374,16 +374,16 @@ } /*----------------------------------------------------------------*/ else if (argE.reptype == LUA_TNIL || argE.reptype == LUA_TBOOLEAN) { - buffer_addlstring (pBuf, argE.text + from, to - from); + tagbuffer_addlstring (pBuf, argE.text + from, to - from); } /*----------------------------------------------------------------*/ if (argE.reptype == LUA_TTABLE || argE.reptype == LUA_TFUNCTION) { if (lua_tostring (L, -1)) { - buffer_addvalue (pBuf, -1); + tagbuffer_addvalue (pBuf, -1); curr_subst = 1; } else if (!lua_toboolean (L, -1)) - buffer_addlstring (pBuf, argE.text + from, to - from); + tagbuffer_addlstring (pBuf, argE.text + from, to - from); else { freelist_free (&freelist); luaL_error (L, "invalid replacement value (a %s)", luaL_typename (L, -1)); @@ -398,7 +398,7 @@ lua_pushinteger (L, from/ALG_CHARSIZE + 1); lua_pushinteger (L, to/ALG_CHARSIZE); if (argE.reptype == LUA_TSTRING) - buffer_pushresult (&BufTemp); + tagbuffer_pushresult (&BufTemp); else { lua_pushvalue (L, -4); lua_remove (L, -5); @@ -409,13 +409,13 @@ } /* Handle the 1-st return value */ if (lua_isstring (L, -2)) { /* coercion is allowed here */ - buffer_addvalue (&BufOut, -2); /* rep2 */ + tagbuffer_addvalue (&BufOut, -2); /* rep2 */ curr_subst = 1; } else if (lua_toboolean (L, -2)) - buffer_addbuffer (&BufOut, &BufTemp); /* rep1 */ + tagbuffer_addbuffer (&BufOut, &BufTemp); /* rep1 */ else { - buffer_addlstring (&BufOut, argE.text + from, to - from); /* "no" */ + tagbuffer_addlstring (&BufOut, argE.text + from, to - from); /* "no" */ curr_subst = 0; } /* Handle the 2-nd return value */ @@ -428,7 +428,7 @@ else if (lua_toboolean (L, -1)) /* "yes to all" */ argE.maxmatch = GSUB_UNLIMITED; else - buffer_clear (&BufTemp); + tagbuffer_clear (&BufTemp); lua_pop (L, 2); if (argE.maxmatch != GSUB_CONDITIONAL) @@ -445,15 +445,15 @@ retry = 1; #else /* advance by 1 char (not replaced) */ - buffer_addlstring (&BufOut, argE.text + st, ALG_CHARSIZE); + tagbuffer_addlstring (&BufOut, argE.text + st, ALG_CHARSIZE); st += ALG_CHARSIZE; #endif } else break; } /*------------------------------------------------------------------*/ - buffer_addlstring (&BufOut, argE.text + st, argE.textlen - st); - buffer_pushresult (&BufOut); + tagbuffer_addlstring (&BufOut, argE.text + st, argE.textlen - st); + tagbuffer_pushresult (&BufOut); lua_pushinteger (L, n_match); lua_pushinteger (L, n_subst); freelist_free (&freelist); diff -Nru wireshark-1.12.0+git+4fab41a1/epan/wslua/lrexlib.c wireshark-1.12.1+g01b65bf/epan/wslua/lrexlib.c --- wireshark-1.12.0+git+4fab41a1/epan/wslua/lrexlib.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/wslua/lrexlib.c 2014-09-16 12:09:03.000000000 -0400 @@ -128,7 +128,7 @@ void freelist_free (TFreeList *fl) { while (fl->top > 0) - buffer_free (fl->list[--fl->top]); + tagbuffer_free (fl->list[--fl->top]); } /* @@ -137,15 +137,15 @@ * Auto-extensible array of characters for building long strings incrementally. * * Differs from luaL_Buffer in that: * * its operations do not change Lua stack top position - * * buffer_addvalue does not extract the value from Lua stack - * * buffer_pushresult does not have to be the last operation + * * tagbuffer_addvalue does not extract the value from Lua stack + * * tagbuffer_pushresult does not have to be the last operation * * Uses TFreeList class: * * for inserting itself into a TFreeList instance for future clean-up * * calls freelist_free prior to calling luaL_error. * * Has specialized "Z-operations" for maintaining mixed string/integer * array: bufferZ_addlstring, bufferZ_addnum and bufferZ_next. * * if the array is intended to be "mixed", then the methods - * buffer_addlstring and buffer_addvalue must not be used + * tagbuffer_addlstring and tagbuffer_addvalue must not be used * (the application will crash on bufferZ_next). * * conversely, if the array is not intended to be "mixed", * then the method bufferZ_next must not be used. @@ -153,7 +153,7 @@ enum { ID_NUMBER, ID_STRING }; -void buffer_init (TBuffer *buf, size_t sz, lua_State *L, TFreeList *fl) { +void tagbuffer_init (TBuffer *buf, size_t sz, lua_State *L, TFreeList *fl) { buf->arr = (char *)Lmalloc(L, sz); if (!buf->arr) { freelist_free (fl); @@ -167,23 +167,23 @@ freelist_add (fl, buf); } -void buffer_free (TBuffer *buf) { +void tagbuffer_free (TBuffer *buf) { Lfree(buf->L, buf->arr, buf->size); } -void buffer_clear (TBuffer *buf) { +void tagbuffer_clear (TBuffer *buf) { buf->top = 0; } -void buffer_pushresult (TBuffer *buf) { +void tagbuffer_pushresult (TBuffer *buf) { lua_pushlstring (buf->L, buf->arr, buf->top); } -void buffer_addbuffer (TBuffer *trg, TBuffer *src) { - buffer_addlstring (trg, src->arr, src->top); +void tagbuffer_addbuffer (TBuffer *trg, TBuffer *src) { + tagbuffer_addlstring (trg, src->arr, src->top); } -void buffer_addlstring (TBuffer *buf, const void *src, size_t sz) { +void tagbuffer_addlstring (TBuffer *buf, const void *src, size_t sz) { size_t newtop = buf->top + sz; if (newtop > buf->size) { char *p = (char*) Lrealloc (buf->L, buf->arr, buf->size, 2 * newtop); /* 2x expansion */ @@ -200,26 +200,26 @@ buf->top = newtop; } -void buffer_addvalue (TBuffer *buf, int stackpos) { +void tagbuffer_addvalue (TBuffer *buf, int stackpos) { size_t len; const char *p = lua_tolstring (buf->L, stackpos, &len); - buffer_addlstring (buf, p, len); + tagbuffer_addlstring (buf, p, len); } void bufferZ_addlstring (TBuffer *buf, const void *src, size_t len) { int n; size_t header[2] = { ID_STRING }; header[1] = len; - buffer_addlstring (buf, header, sizeof (header)); - buffer_addlstring (buf, src, len); + tagbuffer_addlstring (buf, header, sizeof (header)); + tagbuffer_addlstring (buf, src, len); n = (int)(len % N_ALIGN); - if (n) buffer_addlstring (buf, NULL, N_ALIGN - n); + if (n) tagbuffer_addlstring (buf, NULL, N_ALIGN - n); } void bufferZ_addnum (TBuffer *buf, size_t num) { size_t header[2] = { ID_NUMBER }; header[1] = num; - buffer_addlstring (buf, header, sizeof (header)); + tagbuffer_addlstring (buf, header, sizeof (header)); } /* 1. When called repeatedly on the same TBuffer, its existing data diff -Nru wireshark-1.12.0+git+4fab41a1/epan/wslua/lrexlib.h wireshark-1.12.1+g01b65bf/epan/wslua/lrexlib.h --- wireshark-1.12.0+git+4fab41a1/epan/wslua/lrexlib.h 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/epan/wslua/lrexlib.h 2014-09-16 12:09:03.000000000 -0400 @@ -116,13 +116,13 @@ void freelist_add (TFreeList *fl, TBuffer *buf); void freelist_free (TFreeList *fl); -void buffer_init (TBuffer *buf, size_t sz, lua_State *L, TFreeList *fl); -void buffer_free (TBuffer *buf); -void buffer_clear (TBuffer *buf); -void buffer_addbuffer (TBuffer *trg, TBuffer *src); -void buffer_addlstring (TBuffer *buf, const void *src, size_t sz); -void buffer_addvalue (TBuffer *buf, int stackpos); -void buffer_pushresult (TBuffer *buf); +void tagbuffer_init (TBuffer *buf, size_t sz, lua_State *L, TFreeList *fl); +void tagbuffer_free (TBuffer *buf); +void tagbuffer_clear (TBuffer *buf); +void tagbuffer_addbuffer (TBuffer *trg, TBuffer *src); +void tagbuffer_addlstring (TBuffer *buf, const void *src, size_t sz); +void tagbuffer_addvalue (TBuffer *buf, int stackpos); +void tagbuffer_pushresult (TBuffer *buf); void bufferZ_putrepstring (TBuffer *buf, int reppos, int nsub); int bufferZ_next (TBuffer *buf, size_t *iter, size_t *len, const char **str); diff -Nru wireshark-1.12.0+git+4fab41a1/filetap/Makefile.am wireshark-1.12.1+g01b65bf/filetap/Makefile.am --- wireshark-1.12.0+git+4fab41a1/filetap/Makefile.am 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/filetap/Makefile.am 2014-09-16 12:09:03.000000000 -0400 @@ -27,7 +27,7 @@ lib_LTLIBRARIES = libfiletap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libfiletap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ +libfiletap_la_LDFLAGS = -version-info 0:1:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL diff -Nru wireshark-1.12.0+git+4fab41a1/Makefile.am wireshark-1.12.1+g01b65bf/Makefile.am --- wireshark-1.12.0+git+4fab41a1/Makefile.am 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/Makefile.am 2014-09-16 12:09:03.000000000 -0400 @@ -725,19 +725,77 @@ colorfilters \ config.h.win32 \ config.nmake \ + debian/README.Debian \ + debian/README.Debian.security \ debian/changelog \ debian/compat \ debian/control \ debian/copyright \ debian/dirs \ + debian/ethereal-common.NEWS \ debian/headers-check.c \ + debian/libwireshark-data.install \ + debian/libwireshark-dev.install \ + debian/libwireshark5.install \ + debian/libwireshark5.symbols \ + debian/libwiretap-dev.install \ + debian/libwiretap4.docs \ + debian/libwiretap4.install \ + debian/libwiretap4.symbols \ + debian/libwsutil-dev.install \ + debian/libwsutil4.install \ + debian/libwsutil4.symbols \ + debian/license-text-about-dialog \ + debian/patches/01_Disable-building-documentation-in-PDF-and-release-no.patch \ + debian/patches/04_asn2wrs_ply.patch \ + debian/patches/05_note-README-when-running-as-root.patch \ + debian/patches/06_release-version.patch \ + debian/patches/08_wireshark-desktop-menu.patch \ + debian/patches/09_idl2wrs.patch \ + debian/patches/16_licence_about_location.patch \ + debian/patches/series \ + debian/po/POTFILES.in \ + debian/po/cs.po \ + debian/po/da.po \ + debian/po/de.po \ + debian/po/es.po \ + debian/po/eu.po \ + debian/po/fi.po \ + debian/po/fr.po \ + debian/po/hu.po \ + debian/po/id.po \ + debian/po/it.po \ + debian/po/ja.po \ + debian/po/ko.po \ + debian/po/nl.po \ + debian/po/pt.po \ + debian/po/pt_BR.po \ + debian/po/ru.po \ + debian/po/sk.po \ + debian/po/sv.po \ + debian/po/templates.pot \ + debian/po/vi.po \ debian/postinst \ debian/rules \ + debian/source/format \ + debian/templates \ + debian/tshark.docs \ + debian/tshark.install \ debian/tshark.manpages \ + debian/wireshark-common.config \ + debian/wireshark-common.install \ debian/wireshark-common.manpages \ + debian/wireshark-common.postinst \ + debian/wireshark-common.postrm \ debian/wireshark-dev.docs \ + debian/wireshark-dev.install \ debian/wireshark-dev.manpages \ debian/wireshark-dev.prerm \ + debian/wireshark-doc.docs \ + debian/wireshark-qt.docs \ + debian/wireshark-qt.install \ + debian/wireshark.docs \ + debian/wireshark.install \ debian/wireshark.manpages \ debian/wireshark.menu \ dfilters \ @@ -985,6 +1043,7 @@ services \ wireshark.desktop \ wireshark-mime-package.xml \ + wireshark.pc.in \ wka.tmpl \ CMakeLists.txt \ cmakeconfig.h.in \ @@ -993,16 +1052,25 @@ wiretap/CMakeLists.txt \ README.cmake \ ConfigureChecks.cmake \ + cmake/TestFileOffsetBits.c \ + cmake/TestLargeFiles.c.cmakein \ + cmake/TestWindowsFSeek.c \ cmake/modules/CMakeInstallDirs.cmake \ cmake/modules/COPYING-CMAKE-SCRIPTS \ + cmake/modules/CheckCCompilerFlag.cmake \ cmake/modules/CheckCLinkerFlag.cmake \ cmake/modules/FeatureSummary.cmake \ cmake/modules/FindADNS.cmake \ + cmake/modules/FindAIRPCAP.cmake \ + cmake/modules/FindASCIIDOC.cmake \ cmake/modules/FindCAP.cmake \ cmake/modules/FindCARES.cmake \ cmake/modules/FindFOP.cmake \ cmake/modules/FindGCRYPT.cmake \ cmake/modules/FindGEOIP.cmake \ + cmake/modules/FindChocolatey.cmake \ + cmake/modules/FindDOXYGEN.cmake \ + cmake/modules/FindFreetype.cmake \ cmake/modules/FindGLIB2.cmake \ cmake/modules/FindGMODULE2.cmake \ cmake/modules/FindGNUTLS.cmake \ @@ -1019,18 +1087,26 @@ cmake/modules/FindPCAP.cmake \ cmake/modules/FindPOD.cmake \ cmake/modules/FindPORTAUDIO.cmake \ + cmake/modules/FindSBC.cmake \ cmake/modules/FindSED.cmake \ + cmake/modules/FindSETCAP.cmake \ cmake/modules/FindSH.cmake \ cmake/modules/FindSMI.cmake \ + cmake/modules/FindWSWinLibs.cmake \ cmake/modules/FindXMLLINT.cmake \ cmake/modules/FindXSLTPROC.cmake \ cmake/modules/FindYACC.cmake \ cmake/modules/FindYAPP.cmake \ cmake/modules/FindZLIB.cmake \ cmake/modules/LICENSE.txt \ + cmake/modules/UseABICheck.cmake \ + cmake/modules/UseAsn2Wrs.cmake \ + cmake/modules/UseCheckAPI.cmake \ cmake/modules/UseLemon.cmake \ cmake/modules/UseMakeDissectorReg.cmake \ cmake/modules/UseMakeTapReg.cmake \ + cmake/modules/UseWinLibs.cmake \ + cmake/modules/gmxTestLargeFiles.cmake \ cmake/modules/readme.txt \ ui/win32/Makefile.nmake \ ui/win32/console_win32.c \ diff -Nru wireshark-1.12.0+git+4fab41a1/Makefile.nmake wireshark-1.12.1+g01b65bf/Makefile.nmake --- wireshark-1.12.0+git+4fab41a1/Makefile.nmake 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/Makefile.nmake 2014-09-16 12:09:03.000000000 -0400 @@ -390,12 +390,13 @@ mergecap.exe : $(LIBS_CHECK) config.h $(mergecap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res @echo Linking $@ $(LINK) @<< - /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(mergecap_OBJECTS) $(mergecap_LIBS) image\mergecap.res + /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(mergecap_OBJECTS) $(mergecap_LIBS) setargv.obj image\mergecap.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "mergecap.exe.manifest" -outputresource:mergecap.exe;1 !ENDIF +# Linking with setargv.obj enables "wildcard expansion" of command-line arguments reordercap.exe : $(LIBS_CHECK) config.h reordercap.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\reordercap.res @echo Linking $@ $(LINK) @<< diff -Nru wireshark-1.12.0+git+4fab41a1/make-version.pl wireshark-1.12.1+g01b65bf/make-version.pl --- wireshark-1.12.0+git+4fab41a1/make-version.pl 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/make-version.pl 2014-09-16 12:09:03.000000000 -0400 @@ -76,7 +76,7 @@ my %version_pref = ( "version_major" => 1, "version_minor" => 12, - "version_micro" => 0, + "version_micro" => 1, "version_build" => 0, "enable" => 1, @@ -566,7 +566,7 @@ &update_config_nmake; &update_release_notes; &update_debian_changelog; - &update_debian_wcf; + #&update_debian_wcf; &update_lib_releases; } diff -Nru wireshark-1.12.0+git+4fab41a1/manuf wireshark-1.12.1+g01b65bf/manuf --- wireshark-1.12.0+git+4fab41a1/manuf 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/manuf 2014-09-16 12:09:03.000000000 -0400 @@ -225,7 +225,7 @@ 00:00:AC ConwareC # CONWARE COMPUTER CONSULTING 00:00:AD BrukerIn # BRUKER INSTRUMENTS INC. 00:00:AE Dassault # DASSAULT ELECTRONIQUE -00:00:AF NuclearD # NUCLEAR DATA INSTRUMENTATION +00:00:AF Canberra # Canberra Industries, Inc. 00:00:B0 Rnd-RadN # RND-RAD NETWORK DEVICES 00:00:B1 AlphaMic # ALPHA MICROSYSTEMS INC. 00:00:B2 Televide # TELEVIDEO SYSTEMS, INC. @@ -2630,7 +2630,7 @@ 00:0A:2D CabotCom # Cabot Communications Limited 00:0A:2E MapleNet # MAPLE NETWORKS CO., LTD 00:0A:2F Artnix # Artnix Inc. -00:0A:30 JohnsonC # Johnson Controls-ASG +00:0A:30 Visteon # Visteon Corporation 00:0A:31 HcvConsu # HCV Consulting 00:0A:32 Xsido # Xsido Corporation 00:0A:33 Emulex # Emulex Corporation @@ -4212,7 +4212,7 @@ 00:10:5B NetInsig # NET INSIGHT AB 00:10:5C QuantumD # QUANTUM DESIGNS (H.K.) LTD. 00:10:5D DraegerM # Draeger Medical -00:10:5E Hekimian # HEKIMIAN LABORATORIES, INC. +00:10:5E SpirentS # Spirent plc, Service Assurance Broadband 00:10:5F ZodiacDa # ZODIAC DATA SYSTEMS 00:10:60 Billiont # BILLIONTON SYSTEMS, INC. 00:10:61 Hostlink # HOSTLINK CORP. @@ -7644,7 +7644,7 @@ 00:1D:02 Cybertec # Cybertech Telecom Development 00:1D:03 DesignSo # Design Solutions Inc. 00:1D:04 ZipitWir # Zipit Wireless, Inc. -00:1D:05 Ilight +00:1D:05 Eaton # Eaton Corporation 00:1D:06 HmElectr # HM Electronics, Inc. 00:1D:07 Shenzhen # Shenzhen Sang Fei Consumer Communications Co.,Ltd 00:1D:08 JiangsuY # JIANGSU YINHE ELECTRONICS CO., LTD @@ -10489,6 +10489,7 @@ 00:33:6C Synapsen # SynapSense Corporation 00:34:F1 RadicomR # Radicom Research, Inc. 00:35:32 Electro- # Electro-Metrics Corporation +00:35:60 RosenAvi # Rosen Aviation 00:36:F8 ContiTem # Conti Temic microelectronic GmbH 00:36:FE Supervis # SuperVision 00:37:6D MurataMa # Murata Manufacturing Co., Ltd. @@ -12317,7 +12318,7 @@ 00:50:C2:55:F0:00/36 MoogBroa # Moog Broad Reach 00:50:C2:56:00:00/36 ProconEl # Procon Electronics 00:50:C2:56:10:00/36 SeitecEl # Seitec Elektronik GmbH -00:50:C2:56:20:00/36 C21Techn # C21 Technology Limited +00:50:C2:56:20:00/36 C21 # C21 Systems Limited 00:50:C2:56:30:00/36 OrtratSL # ORTRAT, S.L. 00:50:C2:56:40:00/36 LastMile # Last Mile Gear 00:50:C2:56:50:00/36 Workpowe # WORKPOWER TECNOLOGIA ELETRONICA LTDA-EPP @@ -16138,7 +16139,9 @@ 00:A0:FF TellabsO # TELLABS OPERATIONS, INC. 00:A1:DE Shenzhen # ShenZhen ShiHua Technology CO.,LTD 00:A2:DA Inat # INAT GmbH +00:A2:F5 Guangzho # Guangzhou Yuanyun Network Technology Co.,Ltd 00:A2:FF AbatecGr # abatec group AG +00:A5:09 Wigwag # WigWag Inc. 00:AA:00 Intel # INTEL CORPORATION 00:AA:01 Intel # INTEL CORPORATION 00:AA:02 Intel # INTEL CORPORATION @@ -16490,7 +16493,7 @@ 00:D0:1C SbsTechn # SBS TECHNOLOGIES, 00:D0:1D FurunoEl # FURUNO ELECTRIC CO., LTD. 00:D0:1E Pingtel # PINGTEL CORP. -00:D0:1F CtamPty # CTAM PTY. LTD. +00:D0:1F SenetasS # Senetas Security 00:D0:20 AimSyste # AIM SYSTEM, INC. 00:D0:21 RegentEl # REGENT ELECTRONICS CORP. 00:D0:22 Incredib # INCREDIBLE TECHNOLOGIES, INC. @@ -16813,7 +16816,7 @@ 00:E0:47 Infocus # InFocus Corporation 00:E0:48 SdlCommu # SDL COMMUNICATIONS, INC. 00:E0:49 MicrowiE # MICROWI ELECTRONIC GmbH -00:E0:4A Enhanced # ENHANCED MESSAGING SYSTEMS, INC +00:E0:4A ZxTechno # ZX Technologies, Inc 00:E0:4B JumpIndu # JUMP INDUSTRIELLE COMPUTERTECHNIK GmbH 00:E0:4C RealtekS # REALTEK SEMICONDUCTOR CORP. 00:E0:4D Internet # INTERNET INITIATIVE JAPAN, INC @@ -17000,11 +17003,14 @@ 00:E3:B2 SamsungE # Samsung Electronics Co.,Ltd 00:E6:66 ArimaCom # ARIMA Communications Corp. 00:E6:D3 NixdorfC # NIXDORF COMPUTER CORP. +00:E6:E8 NetzinTe # Netzin Technology Corporation,.Ltd. 00:E8:AB MeggittT # Meggitt Training Systems, Inc. 00:EB:2D SonyMobi # Sony Mobile Communications AB 00:EE:BD Htc # HTC Corporation 00:F0:51 Kwb # KWB Gmbh +00:F3:DB WooSport # WOO Sports 00:F4:03 OrbisOy # Orbis Systems Oy +00:F4:6F SamsungE # Samsung Elec Co.,Ltd 00:F4:B9 Apple 00:F7:6F Apple 00:F8:60 PtPanggu # PT. Panggung Electric Citrabuana @@ -17094,6 +17100,7 @@ 04:94:A1 CatchWin # CATCH THE WIND INC 04:98:F3 AlpsElec # ALPS Electric Co,. Ltd. 04:99:E6 Shenzhen # Shenzhen Yoostar Technology Co., Ltd +04:9B:9C Eadingco # Eadingcore Intelligent Technology Co., Ltd. 04:9C:62 BmtMedic # BMT Medical Technology s.r.o. 04:9F:06 Smobile # Smobile Co., Ltd. 04:9F:81 Netscout # Netscout Systems, Inc. @@ -17102,9 +17109,11 @@ 04:A8:2A Nokia # Nokia Corporation 04:B3:B6 SeamapUk # Seamap (UK) Ltd 04:B4:66 Bsp # BSP Co., Ltd. +04:BD:70 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 04:BF:A8 Isb # ISB Corporation 04:C0:5B TigoEner # Tigo Energy 04:C0:6F Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd +04:C0:9C Tellabs # Tellabs Inc. 04:C1:B9 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 04:C5:A4 Cisco # CISCO SYSTEMS, INC. 04:C8:80 Samtec # Samtec Inc @@ -17357,6 +17366,7 @@ 08:9E:01 QuantaCo # QUANTA COMPUTER INC. 08:9F:97 LeroyAut # LEROY AUTOMATION 08:A1:2B Shenzhen # ShenZhen EZL Technology Co., Ltd +08:A5:C8 SunnovoI # Sunnovo International Limited 08:A9:5A Azurewav # Azurewave 08:AC:A5 BenuVide # Benu Video, Inc. 08:AF:78 TotusSol # Totus Solutions, Inc. @@ -17379,11 +17389,15 @@ 08:DF:1F Bose # Bose Corporation 08:E5:DA NanjingF # NANJING FUJITSU COMPUTER PRODUCTS CO.,LTD. 08:E6:72 JebseeEl # JEBSEE ELECTRONICS CO.,LTD. +08:E8:4F HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 08:EA:44 Aerohive # Aerohive Networks, Inc. +08:EB:29 JiangsuH # Jiangsu Huitong Group Co.,Ltd. 08:EB:74 Humax 08:EB:ED WorldEli # World Elite Technology Co.,LTD 08:ED:B9 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. +08:EE:8B SamsungE # Samsung Elec Co.,Ltd 08:EF:3B McsLogic # MCS Logic Inc. +08:EF:AB SaymeWir # SAYME WIRELESS SENSOR NETWORK 08:F1:B7 Towerstr # Towerstream Corpration 08:F2:F4 NetOnePa # Net One Partners Co.,Ltd. 08:F6:F8 GetEngin # GET Engineering @@ -17465,6 +17479,7 @@ 0C:A6:94 SunitecE # Sunitec Enterprise Co.,Ltd 0C:AC:05 UnitendT # Unitend Technologies Inc. 0C:AF:5A GenusPow # GENUS POWER INFRASTRUCTURES LIMITED +0C:B3:19 SamsungE # Samsung Elec Co.,Ltd 0C:B4:EF Digience # Digience Co.,Ltd. 0C:BD:51 TctMobil # TCT Mobile Limited 0C:BF:15 Genetec @@ -17487,7 +17502,7 @@ 0C:D6:96 Amimon # Amimon Ltd 0C:D7:C2 AxiumTec # Axium Technologies, Inc. 0C:D9:96 Cisco # CISCO SYSTEMS, INC. -0C:D9:C1 JohnsonC # Johnson Controls-ASG +0C:D9:C1 Visteon # Visteon Corporation 0C:DA:41 Hangzhou # Hangzhou H3C Technologies Co., Limited 0C:DC:CC InalaTec # Inala Technologies 0C:DD:EF Nokia # Nokia Corporation @@ -17515,6 +17530,8 @@ 10:00:FD Laonpeop # LaonPeople 10:01:CA AshleyBu # Ashley Butterworth 10:05:CA Cisco +10:07:23 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. +10:08:B1 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 10:09:0C JanomeSe # Janome Sewing Machine Co., Ltd. 10:0B:A9 IntelCor # Intel Corporate 10:0C:24 Pomdevic # pomdevices, LLC @@ -17604,6 +17621,7 @@ 10:C3:7B AsustekC # ASUSTek COMPUTER INC. 10:C5:86 BioSound # BIO SOUND LAB CO., LTD. 10:C6:1F HuaweiTe # Huawei Technologies Co., Ltd +10:C6:7E Shenzhen # SHENZHEN JUCHIN TECHNOLOGY CO., LTD 10:C6:FC GarminIn # Garmin International 10:C7:3F MidasKla # Midas Klark Teknik Ltd 10:CA:81 Precia @@ -17623,8 +17641,10 @@ 10:F3:11 Cisco 10:F3:DB Gridco # Gridco Systems, Inc. 10:F4:9A T3Innova # T3 Innovation +10:F6:81 VivoMobi # vivo Mobile Communication Co., Ltd. 10:F9:6F LgElectr # LG Electronics 10:F9:EE Nokia # Nokia Corporation +10:FA:CE Reacheng # Reacheng Communication Technology Co.,Ltd 10:FB:F0 Kangshen # KangSheng LTD. 10:FC:54 ShanyEle # Shany Electronic Co., Ltd. 10:FE:ED Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. @@ -17651,6 +17671,7 @@ 14:35:8B Mediabri # Mediabridge Products, LLC. 14:35:B3 FutureDe # Future Designs, Inc. 14:36:05 Nokia # Nokia Corporation +14:36:C6 LenovoMo # Lenovo Mobile Communication Technology Ltd. 14:37:3B Procom # PROCOM Systems 14:3A:EA Dynapowe # Dynapower Company LLC 14:3D:F2 BeijingS # Beijing Shidai Hongyuan Network Communication Co.,Ltd @@ -17737,6 +17758,7 @@ 18:17:25 CameoCom # Cameo Communications, Inc. 18:19:3F TamtronO # Tamtron Oy 18:1B:EB Actionte # Actiontec Electronics, Inc +18:1E:78 Sagemcom 18:1E:B0 SamsungE # Samsung Electronics Co.,Ltd 18:20:12 AztechAs # Aztech Associates Inc. 18:20:32 Apple @@ -17771,6 +17793,7 @@ 18:5A:E8 Zenotech # Zenotech.Co.,Ltd 18:62:2C Sagemcom # SAGEMCOM SAS 18:64:72 ArubaNet # Aruba Networks +18:65:71 TopVicto # Top Victory Electronics (Taiwan) Co., Ltd. 18:66:E3 Veros # Veros Systems, Inc. 18:67:3F HanoverD # Hanover Displays Limited 18:67:51 KomegInd # KOMEG Industrielle Messtechnik GmbH @@ -17818,7 +17841,7 @@ 18:C8:E7 Shenzhen # Shenzhen Hualistone Technology Co.,Ltd 18:CC:23 PhilioTe # Philio Technology Corporation 18:CF:5E LiteonTe # Liteon Technology Corporation -18:D0:71 DasanSmc # DASAN SMC, Inc. +18:D0:71 Dasan # DASAN CO., LTD. 18:D5:B6 SmgHoldi # SMG Holdings LLC 18:D6:6A Inmarsat 18:D6:CF KurthEle # Kurth Electronic GmbH @@ -17898,6 +17921,7 @@ 1C:83:B0 LinkedIp # Linked IP GmbH 1C:84:64 FormosaW # FORMOSA WIRELESS COMMUNICATION CORP. 1C:86:AD Mct # MCT CO., LTD. +1C:8E:5C HuaweiTe # Huawei Technologies Co., Ltd 1C:8E:8E DbCommun # DB Communication & Systems Co., ltd. 1C:8F:8A PhaseMot # Phase Motion Control SpA 1C:91:79 Integrat # Integrated System Technologies Ltd @@ -17908,6 +17932,7 @@ 1C:97:3D PricomDe # PRICOM Design 1C:99:4C MurataMa # Murata Manufactuaring Co.,Ltd. 1C:9C:26 ZoovelTe # Zoovel Technologies +1C:9E:CB BeijingN # Beijing Nari Smartchip Microelectronics Company Limited 1C:A2:B1 RuwidoAu # ruwido austria gmbh 1C:A7:70 Shenzhen # SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LT 1C:AA:07 Cisco # CISCO SYSTEMS, INC. @@ -18051,6 +18076,7 @@ 24:01:C7 Cisco 24:05:0F MtnElect # MTN Electronic Co. Ltd 24:09:17 DevlinEl # Devlin Electronics Limited +24:09:95 HuaweiTe # Huawei Technologies Co., Ltd 24:0A:11 TctMobil # TCT Mobile Limited 24:0A:64 Azurewav # AzureWaveTechnologies,Inc 24:0B:2A ViettelG # Viettel Group @@ -18083,6 +18109,7 @@ 24:6A:AB It-IsInt # IT-IS International 24:76:7D CiscoSpv # Cisco SPVTG 24:77:03 IntelCor # Intel Corporate +24:7F:3C HuaweiTe # Huawei Technologies Co., Ltd 24:80:00 Westcont # Westcontrol AS 24:81:AA KshInter # KSH International Co., Ltd. 24:82:8A ProwaveT # Prowave Technologies Ltd. @@ -18237,6 +18264,7 @@ 28:D2:44 LcfcHefe # LCFC(HeFei) Electronics Technology Co., Ltd. 28:D5:76 PremierW # Premier Wireless, Inc. 28:D9:3E Telecor # Telecor Inc. +28:D9:8A Hangzhou # Hangzhou Konke Technology Co.,Ltd. 28:D9:97 YuduanMo # Yuduan Mobile Co., Ltd. 28:DB:81 Shanghai # Shanghai Guao Electronic Technology Co., Ltd 28:DE:F6 Biomerie # bioMerieux Inc. @@ -18277,6 +18305,7 @@ 2C:29:97 Microsof # Microsoft Corporation 2C:2D:48 BctElect # bct electronic GesmbH 2C:30:68 Pantech # Pantech Co.,Ltd +2C:33:7A HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 2C:34:27 ErcoGene # ERCO & GENER 2C:35:57 ElliyPow # ELLIY Power CO..Ltd 2C:36:A0 Capisco # Capisco Limited @@ -18294,6 +18323,7 @@ 2C:44:01 SamsungE # Samsung Electronics Co.,Ltd 2C:44:1B Spectrum # Spectrum Medical Limited 2C:44:FD HewlettP # Hewlett Packard +2C:50:89 Shenzhen # Shenzhen Kaixuan Visual Technology Co.,Limited 2C:53:4A Shenzhen # Shenzhen Winyao Electronic Limited 2C:54:2D Cisco # CISCO SYSTEMS, INC. 2C:54:CF LgElectr # LG Electronics @@ -18304,6 +18334,7 @@ 2C:5B:E1 Centripe # Centripetal Networks, Inc 2C:5D:93 RuckusWi # Ruckus Wireless 2C:5F:F3 Pertroni # Pertronic Industries +2C:60:0C QuantaCo # QUANTA COMPUTER INC. 2C:62:5A FinestSe # Finest Security Systems Co., Ltd 2C:62:89 Regeners # Regenersis (Glenrothes) Ltd 2C:67:FB Shenzhen # ShenZhen Zhengjili Electronics Co., LTD @@ -18413,6 +18444,7 @@ 30:6C:BE Skymotio # Skymotion Technology (HK) Limited 30:6E:5C ValidusT # Validus Technologies 30:71:B2 Hangzhou # Hangzhou Prevail Optoelectronic Equipment Co.,LTD. +30:73:50 InpecoSa # Inpeco SA 30:75:12 SonyMobi # Sony Mobile Communications AB 30:76:6F LgElectr # LG Electronics 30:77:CB MaikeInd # Maike Industry(Shenzhen)CO.,LTD @@ -18443,6 +18475,7 @@ 30:D1:7E HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 30:D3:57 Logosol # Logosol, Inc. 30:D4:6A Autosale # Autosales Incorporated +30:D5:87 SamsungE # Samsung Electronics Co.,Ltd 30:D6:C9 SamsungE # Samsung Electronics Co.,Ltd 30:DE:86 CedacSof # Cedac Software S.r.l. 30:E4:8E Vodafone # Vodafone UK @@ -18479,6 +18512,7 @@ 34:2F:6E Anywire # Anywire corporation 34:31:11 SamsungE # Samsung Electronics Co.,Ltd 34:31:C4 Avm # AVM GmbH +34:38:AF InlabSof # Inlab Software GmbH 34:40:B5 Ibm 34:46:6F HitemEng # HiTEM Engineering 34:4B:3D Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. @@ -18495,9 +18529,11 @@ 34:5D:10 Wytek 34:61:78 Boeing # The Boeing Company 34:62:88 Cisco +34:64:A9 HewlettP # Hewlett Packard 34:68:4A Terawork # Teraworks Co., Ltd. 34:6B:D3 HuaweiTe # Huawei Technologies Co., Ltd 34:6E:8A Ecosense +34:6F:90 Cisco 34:6F:92 WhiteRod # White Rodgers Division 34:75:C7 Avaya # Avaya, Inc 34:76:C5 I-ODataD # I-O DATA DEVICE, INC. @@ -18566,6 +18602,7 @@ 34:E2:FD Apple 34:E4:2A Automati # Automatic Bar Controls Inc. 34:E6:AD IntelCor # Intel Corporate +34:E6:D7 Dell # Dell Inc. 34:EF:44 2wire 34:EF:8B NttCommu # NTT Communications Corporation 34:F0:CA Shenzhen # Shenzhen Linghangyuan Digital Technology Co.,Ltd. @@ -18578,6 +18615,7 @@ 38:01:97 ToshibaS # Toshiba Samsung Storage Technolgoy Korea Corporation 38:06:B4 ADC # A.D.C. GmbH 38:08:FD Silca # Silca Spa +38:09:A4 FireflyI # Firefly Integrations 38:0A:0A Sky-City # Sky-City Communication and Electronics Limited Company 38:0A:94 SamsungE # Samsung Electronics Co.,Ltd 38:0B:40 SamsungE # Samsung Electronics Co.,Ltd @@ -18595,8 +18633,10 @@ 38:26:2B UtranTec # UTran Technology 38:26:CD Andtek 38:28:EA FujianNe # Fujian Netcom Technology Co., LTD +38:2C:4A AsustekC # ASUSTek COMPUTER INC. 38:2D:D1 SamsungE # Samsung Electronics Co.,Ltd 38:31:AC Weg +38:3B:C8 2wire 38:3F:10 DblTechn # DBL Technology Ltd. 38:42:33 Wildeboe # Wildeboer Bauteile GmbH 38:42:A6 Ingenieu # Ingenieurbuero Stahlkopf @@ -18613,6 +18653,7 @@ 38:5A:A8 BeijingZ # Beijing Zhongdun Security Technology Development Co. 38:5F:C3 YuJeongS # Yu Jeong System, Co.Ltd 38:60:77 Pegatron # PEGATRON CORPORATION +38:63:BB HewlettP # Hewlett Packard 38:63:F6 3nodMult # 3NOD MULTIMEDIA(SHENZHEN)CO.,LTD 38:66:45 OosicTec # OOSIC Technology CO.,Ltd 38:67:93 AsiaOpti # Asia Optical Co., Inc. @@ -18626,6 +18667,7 @@ 38:8A:B7 ItcNetwo # ITC Networks 38:8E:E7 Fanhatta # Fanhattan LLC 38:91:FB XenoxBv # Xenox Holding BV +38:94:96 SamsungE # Samsung Elec Co.,Ltd 38:95:92 BeijingT # Beijing Tendyron Corporation 38:9F:83 OtnNV # OTN Systems N.V. 38:A5:3C Veenstra # Veenstra Instruments @@ -18690,6 +18732,7 @@ 3C:1A:57 Cardiopu # Cardiopulmonary Corp 3C:1A:79 HuayuanT # Huayuan Technology CO.,LTD 3C:1C:BE JadakLlc # JADAK LLC +3C:1E:13 Hangzhou # HANGZHOU SUNRISE TECHNOLOGY CO., LTD 3C:25:D7 Nokia # Nokia Corporation 3C:26:D5 SoteraWi # Sotera Wireless 3C:27:63 SleQuali # SLE quality engineering GmbH & Co. KG @@ -18700,10 +18743,12 @@ 3C:36:E4 ArrisGro # Arris Group, Inc. 3C:38:88 Connectq # ConnectQuest, llc 3C:39:C3 JwElectr # JW Electronics Co., Ltd. +3C:39:E7 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. 3C:3A:73 Avaya # Avaya, Inc 3C:40:4F Guangdon # Guangdong Pisen Electronics Co. Ltd. 3C:43:8E ArrisGro # ARRIS Group, Inc. 3C:46:D8 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. +3C:49:37 AssmannE # ASSMANN Electronic GmbH 3C:4A:92 Hewlett- # Hewlett-Packard Company 3C:4C:69 Infinity # Infinity System S.L. 3C:4E:47 Etronic # Etronic A/S @@ -18746,8 +18791,10 @@ 3C:A9:F4 IntelCor # Intel Corporate 3C:AA:3F Ikey # iKey, Ltd. 3C:AB:8E Apple +3C:AE:69 EsaElekt # ESA Elektroschaltanlagen Grimma GmbH 3C:B1:5B Avaya # Avaya, Inc 3C:B1:7F Wattwatc # Wattwatchers Pty Ld +3C:B7:92 HitachiM # Hitachi Maxell, Ltd., Optronics Division 3C:B8:7A Private 3C:B9:A6 BeldenDe # Belden Deutschland GmbH 3C:BD:D8 LgElectr # LG ELECTRONICS INC @@ -18849,6 +18896,7 @@ 40:98:4C CasacomS # Casacom Solutions AG 40:98:4E TexasIns # Texas Instruments 40:98:7B Aisino # Aisino Corporation +40:9B:0D Shenzhen # Shenzhen Yourf Kwan Industrial Co., Ltd 40:9F:C7 Baekchun # BAEKCHUN I&C Co., Ltd. 40:A6:A4 Passivsy # PassivSystems Ltd 40:A6:D9 Apple @@ -19362,6 +19410,7 @@ 40:E2:30 Azurewav # AzureWave Technologies, Inc. 40:E7:30 DeyStora # DEY Storage Systems, Inc. 40:E7:93 Shenzhen # Shenzhen Siviton Technology Co.,Ltd +40:EA:CE FounderB # FOUNDER BROADBAND NETWORK SERVICE CO.,LTD 40:EC:F8 Siemens # Siemens AG 40:EF:4C Fihonest # Fihonest communication co.,Ltd 40:F0:2F LiteonTe # Liteon Technology Corporation @@ -19422,6 +19471,7 @@ 44:68:AB Juin # JUIN COMPANY, LIMITED 44:6C:24 ReallinE # Reallin Electronic Co.,Ltd 44:6D:57 LiteonTe # Liteon Technology Corporation +44:6D:6C SamsungE # Samsung Elec Co.,Ltd 44:70:0B Iffu 44:70:98 MingHong # MING HONG TECHNOLOGY (SHEN ZHEN) LIMITED 44:74:6C SonyMobi # Sony Mobile Communications AB @@ -19471,6 +19521,7 @@ 44:DC:91 PlanexCo # PLANEX COMMUNICATIONS INC. 44:DC:CB Semindia # SEMINDIA SYSTEMS PVT LTD 44:E0:8E CiscoSpv # Cisco SPVTG +44:E1:37 ArrisGro # ARRIS Group, Inc. 44:E4:9A Omnitron # OMNITRONICS PTY LTD 44:E4:D9 Cisco # CISCO SYSTEMS, INC. 44:E8:A5 MyrekaTe # Myreka Technologies Sdn. Bhd. @@ -19573,6 +19624,7 @@ 4C:07:C9 Computer # COMPUTER OFFICE Co.,Ltd. 4C:09:B4 Zte # zte corporation 4C:0B:3A TctMobil # TCT Mobile Limited +4C:0B:BE Microsof # Microsoft 4C:0D:EE JabilCir # JABIL CIRCUIT (SHANGHAI) LTD. 4C:0F:6E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 4C:0F:C7 EardaEle # Earda Electronics Co.,Ltd @@ -19748,6 +19800,7 @@ 50:A7:15 Aboundi # Aboundi, Inc. 50:A7:33 RuckusWi # Ruckus Wireless 50:AB:BF HoseoTel # Hoseo Telecom +50:AD:D5 Dynalec # Dynalec Corporation 50:AF:73 Shenzhen # Shenzhen Bitland Information Technology Co., Ltd. 50:B6:95 Micropoi # Micropoint Biotechnologies,Inc. 50:B7:C3 SamsungE # Samsung Electronics CO., LTD @@ -19773,6 +19826,7 @@ 50:ED:78 Changzho # Changzhou Yongse Infotech Co.,Ltd 50:ED:94 EgatelSl # Egatel SL 50:F0:03 OpenStac # Open Stack, Inc. +50:F4:3C Leeo # Leeo Inc 50:F5:20 SamsungE # Samsung Electronics Co.,Ltd 50:F6:1A KunshanJ # Kunshan JADE Technologies co., Ltd. 50:FA:AB L-TekDOO # L-tek d.o.o. @@ -19787,6 +19841,7 @@ 54:04:A6 AsustekC # ASUSTek COMPUTER INC. 54:05:36 VivagoOy # Vivago Oy 54:05:5F AlcatelL # Alcatel Lucent +54:09:8D DeisterE # deister electronic GmbH 54:11:2F SulzerPu # Sulzer Pump Solutions Finland Oy 54:11:5F AtamoPty # Atamo Pty Ltd 54:1B:5D Techno-I # Techno-Innov @@ -19813,6 +19868,7 @@ 54:4A:00 Cisco 54:4A:05 WenglorS # wenglor sensoric gmbh 54:4A:16 TexasIns # Texas Instruments +54:51:46 Amg # AMG Systems Ltd. 54:53:ED Sony # Sony Corporation 54:54:14 DigitalR # Digital RF Corea, Inc 54:5E:BD NlTechno # NL Technologies @@ -19889,6 +19945,7 @@ 58:17:0C SonyEric # Sony Ericsson Mobile Communications AB 58:1C:BD Affinegy 58:1D:91 Advanced # Advanced Mobile Telecom co.,ltd. +58:1F:28 HuaweiTe # Huawei Technologies Co., Ltd 58:1F:67 Open-MTe # Open-m technology limited 58:1F:AA Apple 58:1F:EF Tuttnaer # Tuttnaer LTD @@ -19920,6 +19977,7 @@ 58:67:7F ClareCon # Clare Controls Inc. 58:69:6C FujianRu # Fujian Ruijie Networks co, ltd 58:69:F9 FusionTr # Fusion Transactive Ltd. +58:6A:B1 Hangzhou # Hangzhou H3C Technologies Co., Limited 58:6D:8F Cisco-Li # Cisco-Linksys, LLC 58:6E:D6 Private 58:75:21 CjscRtso # CJSC RTSoft @@ -19995,7 +20053,9 @@ 5C:25:4C AvireGlo # Avire Global Pte Ltd 5C:26:0A Dell # Dell Inc. 5C:2A:EF OpenAcce # Open Access Pty Ltd +5C:2B:F5 Vivint 5C:2E:59 SamsungE # Samsung Electronics Co.,Ltd +5C:2E:D2 AbcXishe # ABC(XiSheng) Electronics Co.,Ltd 5C:31:3E TexasIns # Texas Instruments 5C:33:27 SpazioIt # Spazio Italia srl 5C:33:5C Swisspho # Swissphone Telecom AG @@ -20033,6 +20093,7 @@ 5C:8F:E0 ArrisGro # ARRIS Group, Inc. 5C:93:A2 LiteonTe # Liteon Technology Corporation 5C:95:AE Apple +5C:96:6A Rtnet 5C:96:9D Apple 5C:97:F3 Apple 5C:9A:D8 Fujitsu # Fujitsu Limited @@ -20059,6 +20120,7 @@ 5C:D9:98 D-Link # D-Link Corporation 5C:DA:D4 MurataMa # Murata Manufacturing Co., Ltd. 5C:DD:70 Hangzhou # Hangzhou H3C Technologies Co., Limited +5C:E0:C5 IntelCor # Intel Corporate 5C:E0:CA FeitianU # FeiTian United (Beijing) System Technology Co., Ltd. 5C:E0:F6 NicBr-Nu # NIC.br- Nucleo de Informacao e Coordenacao do Ponto BR 5C:E2:23 DelphinT # Delphin Technology AG @@ -20225,6 +20287,7 @@ 64:31:50 Hewlett- # Hewlett-Packard Company 64:31:7E Dexin # Dexin Corporation 64:34:09 BitwaveP # BITwave Pte Ltd +64:3E:8C HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 64:3F:5F Exablaze 64:42:14 Swisscom # Swisscom Energy Solutions AG 64:43:46 Guangdon # GuangDong Quick Network Computer CO.,LTD @@ -20272,6 +20335,7 @@ 64:87:88 JuniperN # Juniper Networks 64:87:D7 PirelliT # Pirelli Tyre S.p.A. 64:88:FF SichuanC # Sichuan Changhong Electric Ltd. +64:89:9A LgElectr # LG Electronics 64:8D:9E IvtElect # IVT Electronic Co.,Ltd 64:99:5D Lge 64:99:68 Elentec @@ -20290,10 +20354,12 @@ 64:A8:37 JuniKore # Juni Korea Co., Ltd 64:AE:0C Cisco # CISCO SYSTEMS, INC. 64:AE:88 Polytec # Polytec GmbH +64:B2:1D ChengduP # Chengdu Phycom Tech Co., Ltd. 64:B3:10 SamsungE # Samsung Electronics Co.,Ltd 64:B3:70 Powercom # PowerComm Solutons LLC 64:B4:73 Xiaomi # Xiaomi inc. 64:B6:4A Vivotech # ViVOtech, Inc. +64:B8:53 SamsungE # Samsung Elec Co.,Ltd 64:B9:E8 Apple 64:BA:BD SdjTechn # SDJ Technologies, Inc. 64:BC:11 Combiq # CombiQ AB @@ -20391,6 +20457,7 @@ 68:96:7B Apple 68:97:4B Shenzhen # Shenzhen Costar Electronics Co. Ltd. 68:97:E8 SocietyO # Society of Motion Picture & Television Engineers +68:99:CD Cisco 68:9C:5E AcsipTec # AcSiP Technology Corp. 68:9C:70 Apple 68:A0:F6 HuaweiTe # Huawei Technologies Co., Ltd @@ -20409,6 +20476,7 @@ 68:B8:D9 ActKde # Act KDE, Inc. 68:BC:0C Cisco # CISCO SYSTEMS, INC. 68:BD:AB Cisco # CISCO SYSTEMS, INC. +68:C9:0B TexasIns # Texas Instruments 68:CA:00 Octopus # Octopus Systems Limited 68:CC:9C MineSite # Mine Site Technologies 68:CD:0F UTek # U Tek Company Limited @@ -20431,12 +20499,14 @@ 68:EF:BD Cisco # CISCO SYSTEMS, INC. 68:F0:6D AlongInd # ALONG INDUSTRIAL CO., LIMITED 68:F1:25 DataCont # Data Controls Inc. +68:F7:28 LcfcHefe # LCFC(HeFei) Electronics Technology co., ltd 68:F8:95 Redflow # Redflow Limited 68:FB:95 Generalp # Generalplus Technology Inc. 68:FC:B3 NextLeve # Next Level Security Systems, Inc. 6C:02:73 Shenzhen # Shenzhen Jin Yun Video Equipment Co., Ltd. 6C:04:60 RbhAcces # RBH Access Technologies Inc. 6C:09:D6 Digiques # Digiquest Electronics LTD +6C:0B:84 Universa # Universal Global Scientific Industrial Co.,Ltd. 6C:0E:0D SonyEric # Sony Ericsson Mobile Communications AB 6C:0F:6A JdcTech # JDC Tech Co., Ltd. 6C:14:F7 Erhardt+ # Erhardt+Leimer GmbH @@ -20446,6 +20516,7 @@ 6C:20:56 Cisco 6C:22:AB Ainswort # Ainsworth Game Technology 6C:23:B9 SonyEric # Sony Ericsson Mobile Communications AB +6C:25:B9 BbkElect # BBK Electronics Corp., Ltd., 6C:29:95 IntelCor # Intel Corporate 6C:2C:06 OooNppSy # OOO NPP Systemotechnika-NN 6C:2E:33 Accelink # Accelink Technologies Co.,Ltd. @@ -20490,6 +20561,7 @@ 6C:8D:65 Wireless # Wireless Glue Networks, Inc. 6C:90:B1 Sanlogic # SanLogic Inc 6C:92:BF InspurEl # Inspur Electronic Information Industry Co.,Ltd. +6C:94:F8 Apple 6C:98:EB Ocedo # Ocedo GmbH 6C:99:89 Cisco 6C:9A:C9 Valentin # Valentine Research, Inc. @@ -20540,6 +20612,7 @@ 70:02:58 01db-Met # 01DB-METRAVIB 70:05:14 LgElectr # LG Electronics 70:0B:C0 DewavTec # Dewav Technology Company +70:0F:C7 Shenzhen # SHENZHEN IKINLOOP TECHNOLOGY CO.,LTD. 70:0F:EC Poindus # Poindus Systems Corp. 70:10:5C Cisco 70:11:24 Apple @@ -20566,6 +20639,7 @@ 70:38:EE Avaya # Avaya, Inc 70:3A:D8 Shenzhen # Shenzhen Afoundry Electronic Co., Ltd 70:3C:39 SeawingK # SEAWING Kft +70:3E:AC Apple 70:41:B7 EdwardsL # Edwards Lifesciences LLC 70:46:42 ChyngHon # CHYNG HONG ELECTRONIC CO., LTD. 70:4A:AE XstreamF # Xstream Flow (Pty) Ltd @@ -20600,6 +20674,7 @@ 70:76:30 Pace # Pace plc. 70:76:DD Oxyguard # Oxyguard International A/S 70:76:F0 Levelone # LevelOne Communications (India) Private Limited +70:76:FF Kerlink 70:7B:E8 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 70:7C:18 AdataTec # ADATA Technology Co., Ltd 70:7E:43 ArrisGro # ARRIS Group, Inc. @@ -20634,24 +20709,31 @@ 70:B3:D5:01:D0:00/36 WeiglEle # Weigl Elektronik & Mediaprojekte 70:B3:D5:02:50:00/36 ElsuhdNe # Elsuhd Net Ltd Co. 70:B3:D5:02:90:00/36 MarimoEl # Marimo electronics Co.,Ltd. +70:B3:D5:03:00:00/36 TresentT # Tresent Technologies 70:B3:D5:03:B0:00/36 Ssl-Elec # SSL - Electrical Aerospace Ground Equipment Section 70:B3:D5:04:40:00/36 DonElect # Don Electronics Ltd 70:B3:D5:05:20:00/36 SudoPrem # Sudo Premium Engineering 70:B3:D5:05:80:00/36 TelinkSe # Telink Semiconductor CO, Limtied, Taiwan +70:B3:D5:05:F0:00/36 UnisorMu # UNISOR MULTISYSTEMS LTD 70:B3:D5:06:20:00/36 RmMichae # RM Michaelides Software & Elektronik GmbH 70:B3:D5:07:70:00/36 Inaccess # InAccess Networks SA +70:B3:D5:07:D0:00/36 Panorami # PANORAMIC POWER 70:B3:D5:08:E0:00/36 BeijingC # Beijing CONvision Technology Co.,Ltd 70:B3:D5:09:00:00/36 Powercra # POWERCRAFT ELECTRONICS PVT. LTD. -70:B3:D5:09:10:00/36 EzelinkL # eZeLink LLC 70:B3:D5:09:20:00/36 InomedMe # inomed Medizintechnik GmbH +70:B3:D5:09:70:00/36 AvantTec # Avant Technologies 70:B3:D5:09:90:00/36 Schwer+K # Schwer+Kopka GmbH +70:B3:D5:0A:40:00/36 Communic # Communication Technology Ltd. +70:B3:D5:0A:50:00/36 Fuelcell # FUELCELLPOWER 70:B3:D5:0A:90:00/36 Proconne # ProConnections, Inc. 70:B3:D5:0A:A0:00/36 Wanco # Wanco Inc 70:B3:D5:0A:B0:00/36 KstTechn # KST technology 70:B3:D5:0B:30:00/36 ReonixAu # Reonix Automation 70:B3:D5:0C:00:00/36 MoluTech # Molu Technology Inc., LTD. +70:B3:D5:0C:10:00/36 NexusTec # Nexus Technologies Pty Ltd 70:B3:D5:0D:60:00/36 TattileS # TATTILE SRL 70:B3:D5:0E:00:00/36 Plcis +70:B3:D5:0E:C0:00/36 AcsMotio # ACS MOTION CONTROL 70:B3:D5:0F:00:00/36 Avionica 70:B3:D5:0F:B0:00/36 CygnusLl # Cygnus LLC 70:B3:D5:0F:F0:00/36 Internet # INTERNET PROTOCOLO LOGICA SL @@ -20659,6 +20741,9 @@ 70:B3:D5:10:90:00/36 DitestFa # DiTEST Fahrzeugdiagnose GmbH 70:B3:D5:11:20:00/36 DitestFa # DiTEST Fahrzeugdiagnose GmbH 70:B3:D5:13:90:00/36 Tunstall # Tunstall A/S +70:B3:D5:13:A0:00/36 Deuta-We # DEUTA-WERKE GmbH +70:B3:D5:16:40:00/36 TokyoDra # Tokyo Drawing Ltd. +70:B3:D5:18:10:00/36 TaskSist # Task Sistemas 70:B3:D5:18:20:00/36 KitronUa # Kitron UAB 70:B3:D5:18:30:00/36 EvcoSPA # Evco S.p.a. 70:B3:D5:18:40:00/36 Xv360Opt # XV360 Optical Information Systems Ltd. @@ -20675,11 +20760,14 @@ 70:B3:D5:23:C0:00/36 Quasonix # Quasonix, LLC 70:B3:D5:24:30:00/36 Rohde&Sc # Rohde&Schwarz Topex SA 70:B3:D5:25:00:00/36 DatumEle # Datum Electronics Limited +70:B3:D5:26:E0:00/36 Hi-TechS # HI-TECH SYSTEM Co. Ltd. 70:B3:D5:28:E0:00/36 TexCompu # TEX COMPUTER SRL 70:B3:D5:28:F0:00/36 Overline # Overline Systems 70:B3:D5:29:D0:00/36 Xtech2Si # XTech2 SIA 70:B3:D5:2A:50:00/36 Taitotek # Taitotekniikka +70:B3:D5:2B:E0:00/36 Coherent # Coherent Logix, Inc. 70:B3:D5:2D:40:00/36 Ct # CT Company +70:B3:D5:2D:50:00/36 TeucoGuz # Teuco Guzzini 70:B3:D5:2D:A0:00/36 SkywaveN # Skywave Networks Private Limited 70:B3:D5:2E:30:00/36 Meiknolo # Meiknologic GmbH 70:B3:D5:2F:00:00/36 Clock-O- # Clock-O-Matic @@ -20687,6 +20775,7 @@ 70:B3:D5:30:50:00/36 CaitronI # CAITRON Industrial Solutions GmbH 70:B3:D5:30:80:00/36 DsdMicro # DSD MICROTECHNOLOGY,INC. 70:B3:D5:32:30:00/36 TattileS # TATTILE SRL +70:B3:D5:32:70:00/36 Seneco # Seneco A/S 70:B3:D5:33:C0:00/36 Videri # Videri Inc. 70:B3:D5:34:40:00/36 IhiInspe # IHI Inspection & Instrumentation Co., Ltd. 70:B3:D5:34:60:00/36 Ultamati # Ultamation Limited @@ -20695,13 +20784,17 @@ 70:B3:D5:35:D0:00/36 FreshIde # Fresh Idea Factory BV 70:B3:D5:35:F0:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:36:20:00/36 Asiga +70:B3:D5:36:C0:00/36 SiconSrl # Sicon srl 70:B3:D5:36:D0:00/36 Cybertea # Cyberteam Sp z o o 70:B3:D5:39:A0:00/36 Videotre # Videotrend srl 70:B3:D5:39:B0:00/36 Iroc # IROC AB +70:B3:D5:39:C0:00/36 GeneralD # GENERAL DYNAMICS C4 SYSTEMS 70:B3:D5:3A:80:00/36 Jamhub # JamHub Corp. 70:B3:D5:3B:80:00/36 Nvideon # nVideon, Inc. 70:B3:D5:3C:20:00/36 Cellular # Cellular Specialties, Inc. 70:B3:D5:3C:E0:00/36 Aditec # Aditec GmbH +70:B3:D5:3D:90:00/36 AplexTec # Aplex Technology Inc. +70:B3:D5:3D:A0:00/36 LoopLabs # Loop Labs, Inc. 70:B3:D5:3D:E0:00/36 ElomacEl # ELOMAC Elektronik GmbH 70:B3:D5:3D:F0:00/36 Multidyn # MultiDyne 70:B3:D5:3E:10:00/36 Barnstor # Barnstormer Softworks @@ -20710,9 +20803,11 @@ 70:B3:D5:3E:F0:00/36 VtronPty # Vtron Pty Ltd 70:B3:D5:3F:10:00/36 OlympusN # Olympus NDT Canada 70:B3:D5:40:A0:00/36 MonroeEl # Monroe Electronics, Inc. +70:B3:D5:41:20:00/36 TattileS # TATTILE SRL 70:B3:D5:42:F0:00/36 Sintokog # SINTOKOGIO, LTD 70:B3:D5:43:30:00/36 Flexsolu # Flexsolution APS 70:B3:D5:43:D0:00/36 VeryxTec # Veryx Technologies Private Limited +70:B3:D5:44:B0:00/36 OpenSyst # Open System Solutions Limited 70:B3:D5:45:E0:00/36 Esol # eSOL Co.,Ltd. 70:B3:D5:48:D0:00/36 OmegaBil # OMEGA BILANCE SRL SOCIETA' UNIPERSONALE 70:B3:D5:4C:10:00/36 QuercusT # QUERCUS TECHNOLOGIES, S. L. @@ -20730,23 +20825,32 @@ 70:B3:D5:57:B0:00/36 Elamakat # ELAMAKATO GmbH 70:B3:D5:57:C0:00/36 Automata # Automata GmbH & Co. KG 70:B3:D5:58:70:00/36 IncaaCom # INCAA Computers +70:B3:D5:58:F0:00/36 Lsl # LSL systems 70:B3:D5:5A:80:00/36 Farmobil # Farmobile 70:B3:D5:5A:A0:00/36 ChugokuE # Chugoku Electric Manufacturing Co.,Inc 70:B3:D5:5B:50:00/36 LehighEl # Lehigh Electric Products Co +70:B3:D5:5C:50:00/36 Haag-Str # Haag-Streit AG +70:B3:D5:5E:40:00/36 DspDesig # DSP DESIGN 70:B3:D5:5E:80:00/36 Vitec +70:B3:D5:5E:90:00/36 Zehetner # Zehetner-Elektronik GmbH 70:B3:D5:5E:A0:00/36 Kys # KYS,INC 70:B3:D5:5F:00:00/36 Managee # managee GmbH & Co KG 70:B3:D5:60:B0:00/36 Edgeware # Edgeware AB 70:B3:D5:60:C0:00/36 IstElekt # IST ElektronikgesmbH +70:B3:D5:61:00:00/36 Polvisio # POLVISION 70:B3:D5:61:F0:00/36 Labotect # Labotect Labor-Technik-Göttingen GmbH 70:B3:D5:62:50:00/36 VxInstru # VX Instruments GmbH 70:B3:D5:63:40:00/36 Idaqs # idaqs Co.,Ltd. 70:B3:D5:65:50:00/36 AotSyste # AOT System GmbH +70:B3:D5:65:A0:00/36 AplexTec # Aplex Technology Inc. +70:B3:D5:65:B0:00/36 Roush +70:B3:D5:66:00:00/36 SmartSer # Smart Service Technologies CO., LTD 70:B3:D5:68:20:00/36 Rosslare # Rosslare Enterprises Limited 70:B3:D5:6B:60:00/36 Inradios # INRADIOS GmbH 70:B3:D5:6D:30:00/36 Deuta-We # DEUTA-WERKE GmbH 70:B3:D5:6D:60:00/36 Kmtronic # KMtronic Ltd. 70:B3:D5:6D:90:00/36 Vectare # VECTARE Inc +70:B3:D5:6E:40:00/36 Institut # Institute of Power Engineering, Gdansk Division 70:B3:D5:6E:50:00/36 Deuta-We # DEUTA-WERKE GmbH 70:B3:D5:6F:20:00/36 P&CMicro # P&C Micro's Pty Ltd 70:B3:D5:6F:30:00/36 Iungo @@ -20758,17 +20862,24 @@ 70:B3:D5:71:00:00/36 Guardian # Guardian Controls International Ltd 70:B3:D5:71:E0:00/36 MotecPty # Motec Pty Ltd 70:B3:D5:73:10:00/36 Phoniro # Phoniro Systems AB +70:B3:D5:73:20:00/36 Tofwerk # TOFWERK AG 70:B3:D5:75:10:00/36 Gnf 70:B3:D5:75:50:00/36 Landmark # LandmarkTech Systems Technology Co.,Ltd. +70:B3:D5:75:D0:00/36 NanjingM # Nanjing Magewell Electronics Co., Ltd. 70:B3:D5:76:E0:00/36 GrupoEpe # Grupo Epelsa S.L. +70:B3:D5:77:C0:00/36 HustyMSt # HUSTY M.Styczen J.Hupert sp.j. +70:B3:D5:79:60:00/36 GamptMbh # GAMPT mbH 70:B3:D5:79:A0:00/36 Innerspe # Innerspec Technologies Inc. 70:B3:D5:7A:90:00/36 Adidas # adidas AG 70:B3:D5:7B:30:00/36 Broadsof # BroadSoft Inc 70:B3:D5:7C:D0:00/36 Molekule # Molekuler Goruntuleme A.S. 70:B3:D5:7E:70:00/36 Atessa # Atessa, Inc. +70:B3:D5:7E:F0:00/36 Cravis # CRAVIS CO., LIMITED +70:B3:D5:7F:10:00/36 Aerovisi # AeroVision Avionics, Inc. 70:B3:D5:80:F0:00/36 Quickwar # Quickware Eng & Des LLC 70:B3:D5:81:40:00/36 Ingenieu # Ingenieurbuero SOMTRONIK 70:B3:D5:81:90:00/36 «Intelle # «Intellect module» LLC +70:B3:D5:82:00:00/36 BeckerNa # Becker Nachrichtentechnik GmbH 70:B3:D5:82:C0:00/36 Nels # NELS Ltd. 70:B3:D5:83:B0:00/36 Telefoni # Telefonix Incorporated 70:B3:D5:84:A0:00/36 MogLabor # MOG Laboratories Pty Ltd @@ -20794,18 +20905,23 @@ 70:B3:D5:98:60:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:99:40:00/36 KeffNetw # KeFF Networks 70:B3:D5:9A:70:00/36 Honeywel # Honeywell +70:B3:D5:9F:10:00/36 Rfel # RFEL Ltd 70:B3:D5:9F:40:00/36 TbandSrl # Tband srl 70:B3:D5:9F:50:00/36 VickersE # Vickers Electronics Ltd 70:B3:D5:A0:B0:00/36 Ambihome # ambiHome GmbH 70:B3:D5:A0:E0:00/36 Vetaphon # Vetaphone A/S 70:B3:D5:A1:50:00/36 Intercor # Intercore GmbH +70:B3:D5:A2:50:00/36 Pulsetor # PulseTor LLC 70:B3:D5:A2:F0:00/36 Botek # Botek Systems AB 70:B3:D5:A4:00:00/36 StrackLi # STRACK LIFT AUTOMATION GmbH +70:B3:D5:A5:50:00/36 EmbestTe # Embest Technology Co., Ltd 70:B3:D5:A5:70:00/36 Pcsc +70:B3:D5:A5:A0:00/36 RcsEnerg # RCS Energy Management Ltd 70:B3:D5:A5:B0:00/36 ChristEl # Christ Elektronik GmbH 70:B3:D5:A6:20:00/36 Environe # Environexus 70:B3:D5:A6:D0:00/36 MetekMet # Metek Meteorologische Messtechnik GmbH 70:B3:D5:A7:A0:00/36 FluidMan # Fluid Management Technology +70:B3:D5:A9:90:00/36 Bandelin # Bandelin electronic GmbH & Co. KG 70:B3:D5:AA:00:00/36 SimpleWo # Simple Works, Inc. 70:B3:D5:AB:70:00/36 Siglead # SIGLEAD INC 70:B3:D5:AB:C0:00/36 Bkm-Micr # BKM-Micronic Richtfunkanlagen GmbH @@ -20815,9 +20931,11 @@ 70:B3:D5:AE:20:00/36 TransasM # Transas Marine International 70:B3:D5:AE:90:00/36 CariElec # Cari Electronic 70:B3:D5:AE:E0:00/36 DitestFa # DiTEST Fahrzeugdiagnose GmbH +70:B3:D5:AF:A0:00/36 PowerSec # Power Security Systems Ltd. 70:B3:D5:B0:80:00/36 Secuinfo # Secuinfo Co. Ltd 70:B3:D5:B1:50:00/36 EtaBetaS # Eta Beta Srl 70:B3:D5:B1:60:00/36 XiAnShen # XI'AN SHENMING ELECTRON TECHNOLOGY CO.,LTD +70:B3:D5:B2:40:00/36 DatasatD # Datasat Digital Entertainment 70:B3:D5:B2:A0:00/36 MyroCont # Myro Control, LLC 70:B3:D5:B3:30:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:B3:90:00/36 MbConnec # MB Connect Line GmbH @@ -20829,6 +20947,8 @@ 70:B3:D5:B8:A0:00/36 NexusTec # Nexus Tech. VN 70:B3:D5:B8:C0:00/36 EpointEm # ePOINT Embedded Computing Limited 70:B3:D5:B8:D0:00/36 Jungwooe # JungwooEng Co., Ltd +70:B3:D5:B8:F0:00/36 Assembly # Assembly Contracts Ltd +70:B3:D5:B9:B0:00/36 Elektron # Elektronik Art 70:B3:D5:BA:40:00/36 EiwaGike # EIWA GIKEN INC. 70:B3:D5:BB:20:00/36 Mettler- # Mettler-Toledo Hi-Speed 70:B3:D5:BB:D0:00/36 Providiu # Providius Corp @@ -20836,12 +20956,18 @@ 70:B3:D5:BC:60:00/36 Hattelan # Hatteland Display AS 70:B3:D5:BC:A0:00/36 DeymedDi # Deymed Diagnostic 70:B3:D5:BD:A0:00/36 5-D # 5-D Systems, Inc. +70:B3:D5:BE:10:00/36 Fecon # FeCon GmbH 70:B3:D5:BE:C0:00/36 TokyoCom # Tokyo Communication Equipment MFG Co.,ltd. +70:B3:D5:C0:30:00/36 XaviTech # XAVi Technologies Corp. 70:B3:D5:C2:40:00/36 ElbitOfA # Elbit Systems of America +70:B3:D5:C2:50:00/36 Speedsig # speedsignal GmbH 70:B3:D5:C2:70:00/36 GeneralD # GENERAL DYNAMICS C4 SYSTEMS 70:B3:D5:C2:C0:00/36 DromontS # Dromont S.p.A. +70:B3:D5:C3:90:00/36 Meshwork # MeshWorks Wireless Oy 70:B3:D5:C4:30:00/36 FutureSk # Future Skies +70:B3:D5:C5:60:00/36 Teletask 70:B3:D5:C5:80:00/36 RmiLaser # RMI Laser LLC +70:B3:D5:C6:00:00/36 Aircell # Aircell Inc 70:B3:D5:C6:10:00/36 JcHunter # JC HUNTER TECHNOLOGIES 70:B3:D5:C6:D0:00/36 CyvizAs # Cyviz AS 70:B3:D5:C7:80:00/36 NetaElek # NETA Elektronik AS @@ -20854,9 +20980,11 @@ 70:B3:D5:CE:70:00/36 JuneAuto # June Automation Singapore Pte. Ltd. 70:B3:D5:CE:90:00/36 Kinemetr # KINEMETRICS 70:B3:D5:CF:10:00/36 Lightdec # LightDec GmbH & Co. KG +70:B3:D5:CF:30:00/36 MeshMoti # Mesh Motion Inc 70:B3:D5:CF:F0:00/36 DtechLab # DTECH Labs, Inc. 70:B3:D5:D0:C0:00/36 ConnorWi # Connor Winfield LTD 70:B3:D5:D1:E0:00/36 HoustonR # Houston Radar LLC +70:B3:D5:D1:F0:00/36 Embsec # Embsec AB 70:B3:D5:D3:B0:00/36 Nimbelin # NimbeLink Corp 70:B3:D5:D4:70:00/36 Yotascop # YotaScope Technologies Co., Ltd. 70:B3:D5:D4:E0:00/36 Flsmidth @@ -20866,9 +20994,13 @@ 70:B3:D5:D8:F0:00/36 MoluTech # Molu Technology Inc., LTD. 70:B3:D5:D9:E0:00/36 GrupoEpe # GRUPO EPELSA S.L. 70:B3:D5:DA:10:00/36 QprelSrl # Qprel srl +70:B3:D5:DA:D0:00/36 GeneralD # GENERAL DYNAMICS C4 SYSTEMS 70:B3:D5:DC:50:00/36 ExcelMed # Excel Medical Electronics LLC +70:B3:D5:DC:F0:00/36 KlsNethe # KLS Netherlands B.V. 70:B3:D5:DD:D0:00/36 BioRadLa # BIO RAD LABORATORIES +70:B3:D5:DE:70:00/36 Innomind # Innominds Software Private Limited 70:B3:D5:DE:C0:00/36 Condev-A # Condev-Automation GmbH +70:B3:D5:DF:00:00/36 AstoziCo # astozi consulting Tomasz Zieba 70:B3:D5:DF:30:00/36 SpcBiocl # SPC Bioclinicum 70:B3:D5:E0:70:00/36 BaaderPl # Baader Planetarium GmbH 70:B3:D5:E0:80:00/36 Olssen @@ -20879,14 +21011,19 @@ 70:B3:D5:E4:C0:00/36 Iai-Isra # IAI-Israel Aerospace Industries MBT 70:B3:D5:E5:30:00/36 Mi # MI INC. 70:B3:D5:E5:80:00/36 ThurlbyT # Thurlby Thandar Instruments LTD +70:B3:D5:E6:E0:00/36 LieronBv # Lieron BVBA 70:B3:D5:E7:40:00/36 Exfronti # Exfrontier Co., Ltd. +70:B3:D5:E7:50:00/36 Nke 70:B3:D5:E9:20:00/36 FujiData # FUJI DATA SYSTEM CO.,LTD. +70:B3:D5:E9:50:00/36 Broadsof # BroadSoft Inc 70:B3:D5:E9:90:00/36 Advitron # Advitronics telecom bv 70:B3:D5:E9:A0:00/36 MetaComp # Meta Computing Services, Corp +70:B3:D5:EA:30:00/36 Gridless # Gridless Power Corperation 70:B3:D5:EB:00:00/36 NautelLi # Nautel Limted 70:B3:D5:EB:20:00/36 ShooterD # Shooter Detection Systems 70:B3:D5:EC:10:00/36 XafaxNed # Xafax Nederland bv 70:B3:D5:EC:D0:00/36 Sbs-Fein # SBS-Feintechnik GmbH & Co. KG +70:B3:D5:EC:E0:00/36 Comm-Con # COMM-connect A/S 70:B3:D5:EC:F0:00/36 Ipitek 70:B3:D5:ED:C0:00/36 JDKoftin # J.D. Koftinoff Software, Ltd. 70:B3:D5:ED:D0:00/36 SolarNet # Solar Network & Partners @@ -20895,23 +21032,28 @@ 70:B3:D5:EF:30:00/36 Octoscop # octoScope 70:B3:D5:EF:90:00/36 Critical # Critical Link 70:B3:D5:EF:A0:00/36 NexteraE # NextEra Energy Resources, LLC +70:B3:D5:EF:E0:00/36 MeidenSy # MEIDEN SYSTEM SOLUTIONS 70:B3:D5:F2:A0:00/36 WibondIn # WIBOND Informationssysteme GmbH 70:B3:D5:F2:B0:00/36 Sensys # SENSYS GmbH 70:B3:D5:F3:40:00/36 MacgrayS # MacGray Services 70:B3:D5:F3:80:00/36 Scanvaeg # Scanvaegt Nordic A/S +70:B3:D5:F3:90:00/36 ZenrosAp # Zenros ApS 70:B3:D5:F6:10:00/36 PowerDia # Power Diagnostic Service 70:B3:D5:F6:20:00/36 Frs # FRS GmbH & Co. KG 70:B3:D5:F6:30:00/36 ArsProdu # Ars Products 70:B3:D5:F6:80:00/36 AlZajelM # AL ZAJEL MODERN TELECOMM 70:B3:D5:F8:C0:00/36 European # EUROPEAN ADVANCED TECHNOLOGIES +70:B3:D5:F9:20:00/36 Techone 70:B3:D5:FA:10:00/36 BbiEngin # BBI Engineering, Inc. 70:B3:D5:FB:00:00/36 Rohde&Sc # Rohde&Schwarz Topex SA 70:B3:D5:FC:50:00/36 Eltwin # Eltwin A/S +70:B3:D5:FC:60:00/36 TecnintH # Tecnint HTE Srl 70:B3:D5:FD:10:00/36 Redrat # RedRat Ltd 70:B3:D5:FD:30:00/36 AkisTech # AKIS technologies 70:B3:D5:FD:A0:00/36 AcdElekt # ACD Elektronik GmbH 70:B3:D5:FD:E0:00/36 Aeronaut # AERONAUTICAL & GENERAL INSTRUMENTS LTD. 70:B3:D5:FF:30:00/36 AplexTec # Aplex Technology Inc. +70:B3:D5:FF:50:00/36 ProlanPr # Prolan Process Control Co. 70:B5:99 Embedded # Embedded Technologies s.r.o. 70:B9:21 Fiberhom # FiberHome Telecommunication Technologies CO.,LTD 70:BA:EF Hangzhou # Hangzhou H3C Technologies Co., Limited @@ -20938,6 +21080,7 @@ 70:F3:95 Universa # Universal Global Scientific Industrial Co., Ltd. 70:F9:27 SamsungE # Samsung Electronics 70:F9:6D Hangzhou # Hangzhou H3C Technologies Co., Limited +70:FC:8C Oneacces # OneAccess SA 70:FF:5C Cheerzin # Cheerzing Communication(Xiamen)Technology Co.,Ltd 70:FF:76 TexasIns # Texas Instruments 74:0A:BC JsjsDesi # JSJS Designs (Europe) Limited @@ -20950,6 +21093,7 @@ 74:26:AC Cisco 74:27:3C Changyan # ChangYang Technology (Nanjing) Co., LTD 74:27:EA Elitegro # Elitegroup Computer Systems Co., Ltd. +74:29:AF HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 74:2B:0F Infinida # Infinidat Ltd. 74:2B:62 Fujitsu # Fujitsu Limited 74:2D:0A NorfolkE # Norfolk Elektronik AG @@ -20965,8 +21109,10 @@ 74:4B:E9 Explorer # EXPLORER HYPERTECH CO.,LTD 74:4D:79 Arrive # Arrive Systems Inc. 74:53:27 Commsen # COMMSEN CO., LIMITED +74:54:7D CiscoSpv # Cisco SPVTG 74:56:12 ArrisGro # ARRIS Group, Inc. 74:57:98 TrumpfLa # TRUMPF Laser GmbH + Co. KG +74:5C:9F TctMobil # TCT mobile ltd. 74:5E:1C Pioneer # PIONEER CORPORATION 74:5F:00 SamsungS # Samsung Semiconductor Inc. 74:5F:AE TslPpl # TSL PPL @@ -20993,6 +21139,7 @@ 74:8F:4D MenMikro # MEN Mikro Elektronik GmbH 74:90:50 RenesasE # Renesas Electronics Corporation 74:91:1A RuckusWi # Ruckus Wireless +74:91:BD Four # Four systems Co.,Ltd. 74:93:A4 ZebraTec # Zebra Technologies Corp. 74:94:3D Agjuncti # AgJunction 74:99:75 Ibm # IBM Corporation @@ -21062,6 +21209,7 @@ 78:2E:EF Nokia # Nokia Corporation 78:30:3B StephenT # Stephen Technologies Co.,Limited 78:30:E1 Ultracle # UltraClenz, LLC +78:31:2B Zte # zte corporation 78:31:C1 Apple 78:32:4F Millenni # Millennium Group, Inc. 78:3A:84 Apple @@ -21126,6 +21274,7 @@ 78:AB:BB SamsungE # Samsung Electronics Co.,LTD 78:AC:C0 Hewlett- # Hewlett-Packard Company 78:AE:0C FarSouth # Far South Networks +78:B3:B9 Shanghai # ShangHai sunup lighting CO.,LTD 78:B3:CE EloTouch # Elo touch solutions 78:B5:D2 EverTrea # Ever Treasure Industrial Limited 78:B6:C1 AoboTele # AOBO Telecom Co.,Ltd @@ -21160,6 +21309,7 @@ 78:E4:00 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 78:E7:D1 Hewlett- # Hewlett-Packard Company 78:E8:B6 Zte # zte corporation +78:EB:14 Shenzhen # SHENZHEN FAST TECHNOLOGIES CO.,LTD 78:EC:22 Shanghai # Shanghai Qihui Telecom Technology Co., LTD 78:EC:74 Kyland-U # Kyland-USA 78:EF:4C Unetconv # Unetconvergence Co., Ltd. @@ -21318,6 +21468,7 @@ 80:2E:14 AzetiNet # azeti Networks AG 80:2F:DE ZurichIn # Zurich Instruments AG 80:34:57 Ot # OT Systems Limited +80:37:73 Netgear # Netgear Inc 80:38:FD Leapfrog # LeapFrog Enterprises, Inc. 80:39:E5 Patlite # PATLITE CORPORATION 80:3B:9A Ghe-CesE # ghe-ces electronic ag @@ -21386,6 +21537,7 @@ 80:CE:B1 Theissen # Theissen Training Systems GmbH 80:CF:41 LenovoMo # Lenovo Mobile Communication Technology Ltd. 80:D0:19 Embed # Embed, Inc +80:D0:9B HuaweiTe # Huawei Technologies Co., Ltd 80:D1:8B Hangzhou # Hangzhou I'converge Technology Co.,Ltd 80:D2:1D Azurewav # AzureWave Technologies, Inc 80:D4:33 Lzlabs # LzLabs GmbH @@ -21421,6 +21573,7 @@ 84:25:DB SamsungE # Samsung Electronics Co.,Ltd 84:26:15 AdbBroad # ADB Broadband Italia 84:26:2B Alcatel- # Alcatel-Lucent +84:26:90 BeijingT # BEIJING THOUGHT SCIENCE CO.,LTD. 84:27:CE OfPresid # Corporation of the Presiding Bishop of The Church of Jesus Christ of Latter-day Saints 84:29:14 EmporiaT # EMPORIA TELECOM Produktions- und VertriebsgesmbH & Co KG 84:29:99 Apple @@ -21436,17 +21589,20 @@ 84:38:38 SamsungE # Samsung Electro Mechanics co., LTD. 84:3A:4B IntelCor # Intel Corporate 84:3F:4E Tri-Tech # Tri-Tech Manufacturing, Inc. +84:44:64 Serveru # ServerU Inc 84:48:23 WoxterTe # WOXTER TECHNOLOGY Co. Ltd 84:49:15 VarmourN # vArmour Networks, Inc. 84:4B:F5 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 84:4F:03 Ablelink # Ablelink Electronics Ltd 84:51:81 SamsungE # Samsung Electronics Co.,Ltd +84:55:A5 SamsungE # Samsung Elec Co.,Ltd 84:56:9C CohoData # Coho Data, Inc., 84:57:87 DvrC&C # DVR C&C Co., Ltd. 84:5C:93 Chabrier # Chabrier Services 84:5D:D7 Shenzhen # Shenzhen Netcom Electronics Co.,Ltd 84:62:23 Shenzhen # Shenzhen Coship Electronics Co., Ltd. 84:62:A6 EurocbPh # EuroCB (Phils), Inc. +84:63:D6 Microsof # Microsoft Corporation 84:6A:ED Wireless # Wireless Tsukamoto.,co.LTD 84:6E:B1 ParkAssi # Park Assist LLC 84:72:07 I&CTechn # I&C Technology @@ -21456,6 +21612,7 @@ 84:78:AC Cisco 84:7A:88 Htc # HTC Corporation 84:7E:40 TexasIns # Texas Instruments +84:80:2D Cisco 84:82:F4 BeijingH # Beijing Huasun Unicreate Technology Co., Ltd 84:83:36 Newrun 84:83:71 Avaya # Avaya, Inc @@ -21467,6 +21624,7 @@ 84:8D:C7 CiscoSpv # Cisco SPVTG 84:8E:0C Apple 84:8E:96 Embertec # Embertec Pty Ltd +84:8E:DF SonyMobi # Sony Mobile Communications AB 84:8F:69 Dell # Dell Inc. 84:90:00 ArnoldRi # Arnold & Richter Cine Technik 84:93:0C IncoaxNe # InCoax Networks Europe AB @@ -21476,6 +21634,7 @@ 84:97:B8 Memjet # Memjet Inc. 84:9C:A6 Arcadyan # Arcadyan Technology Corporation 84:9D:C5 CenteraP # Centera Photonics Inc. +84:A4:66 SamsungE # Samsung Electronics Co.,Ltd 84:A6:C8 IntelCor # Intel Corporate 84:A7:83 AlcatelL # Alcatel Lucent 84:A8:E4 Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd @@ -21492,7 +21651,9 @@ 84:D3:2A Ieee1905 # IEEE 1905.1 84:D9:C8 Unipatte # Unipattern Co., 84:DB:2F SierraWi # Sierra Wireless Inc +84:DB:AC HuaweiTe # Huawei Technologies Co., Ltd 84:DD:20 TexasIns # Texas Instruments +84:DD:B7 CilagInt # Cilag GmbH International 84:DE:3D CrystalV # Crystal Vision Ltd 84:DF:0C Net2grid # NET2GRID BV 84:E0:58 Pace # Pace plc @@ -21515,6 +21676,7 @@ 88:14:2B Protonic # Protonic Holland 88:15:44 Meraki # Meraki, Inc. 88:18:AE Tamron # Tamron Co., Ltd +88:1D:FC Cisco 88:1F:A1 Apple 88:20:12 LmiTechn # LMI Technologies 88:21:E3 Nebusens # Nebusens, S.L. @@ -21547,6 +21709,7 @@ 88:68:5C Shenzhen # Shenzhen ChuangDao & Perpetual Eternal Technology Co.,Ltd 88:6B:76 ChinaHop # CHINA HOPEFUL GROUP HOPEFUL ELECTRIC CO.,LTD 88:70:8C LenovoMo # Lenovo Mobile Communication Technology Ltd. +88:70:EF ScProfes # SC Professional Trading Co., Ltd. 88:73:98 K2eTekpo # K2E Tekpoint 88:75:56 Cisco 88:78:9C GameTech # Game Technologies SA @@ -21584,6 +21747,7 @@ 88:C6:63 Apple 88:C9:D0 LgElectr # LG Electronics 88:CB:87 Apple +88:CE:FA HuaweiTe # Huawei Technologies Co., Ltd 88:D7:BC Dep # DEP Company 88:D9:62 CanopusU # Canopus Systems US LLC 88:DC:96 SenaoNet # SENAO Networks, Inc. @@ -21605,6 +21769,7 @@ 88:FE:D6 Shanghai # ShangHai WangYong Software Co., Ltd. 8C:00:6D Apple 8C:04:FF Technico # Technicolor USA Inc. +8C:05:51 Koubachi # Koubachi AG 8C:07:8C FlowData # FLOW DATA INC 8C:08:8B RemoteSo # Remote Solution 8C:09:F4 ArrisGro # ARRIS Group, Inc. @@ -21667,6 +21832,7 @@ 8C:8A:6E EstunAut # ESTUN AUTOMATION TECHNOLOY CO., LTD 8C:8E:76 Taskit # taskit GmbH 8C:90:D3 AlcatelL # Alcatel Lucent +8C:91:09 Toyoshim # Toyoshima Electric Technoeogy(Suzhou) Co.,Ltd. 8C:92:36 AusLinxT # Aus.Linx Technology Co., Ltd. 8C:94:CF EncellTe # Encell Technology, Inc. 8C:A0:48 BeijingN # Beijing NeTopChip Technology Co.,LTD @@ -21699,6 +21865,7 @@ 8C:DF:9D Nec # NEC Corporation 8C:E0:81 Zte # zte corporation 8C:E7:48 Private +8C:E7:8C DkNetwor # DK Networks 8C:E7:B3 Sonardyn # Sonardyne International Ltd 8C:EE:C6 Precepsc # Precepscion Pty. Ltd. 8C:F8:13 OrangePo # ORANGE POLSKA @@ -21713,9 +21880,11 @@ 90:03:B7 Parrot 90:09:17 Far-Sigh # Far-sighted mobile 90:0A:3A PsgPlast # PSG Plastic Service GmbH +90:0C:B4 AlinketE # Alinket Electronic Technology Co., Ltd 90:0D:66 Digimore # Digimore Electronics Co., Ltd 90:0D:CB ArrisGro # ARRIS Group, Inc. 90:17:9B Nanomega # Nanomegas +90:17:AC HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 90:18:5E ApexTool # Apex Tool Group GmbH & Co OHG 90:18:7C SamsungE # Samsung Electro Mechanics co., LTD. 90:18:AE Shanghai # Shanghai Meridian Technologies, Co. Ltd. @@ -21761,6 +21930,7 @@ 90:67:17 AlphionI # Alphion India Private Limited 90:67:B5 Alcatel- # Alcatel-Lucent 90:67:F3 AlcatelL # Alcatel Lucent +90:68:C3 Motorola # Motorola Mobility LLC 90:6D:C8 DlgAutom # DLG Automação Industrial Ltda 90:6E:BB HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 90:70:25 GareaMic # Garea Microsys Co.,Ltd. @@ -21836,6 +22006,7 @@ 94:00:70 Nokia # Nokia Corporation 94:01:49 Autohotb # AutoHotBox 94:01:C2 SamsungE # Samsung Electronics Co.,Ltd +94:05:B6 LilingFu # Liling FullRiver Electronics & Technology Ltd 94:0B:2D NetviewT # NetView Technologies(Shenzhen) Co., Ltd 94:0B:D5 HimaxTec # Himax Technologies, Inc 94:0C:6D Tp-LinkT # TP-LINK Technologies Co.,Ltd. @@ -21880,6 +22051,7 @@ 94:88:54 TexasIns # Texas Instruments 94:8B:03 EagetInn # EAGET Innovation and Technology Co., Ltd. 94:8D:50 BeamexOy # Beamex Oy Ab +94:8E:89 Industri # INDUSTRIAS UNIDAS SA DE CV 94:8F:EE HughesTe # Hughes Telematics, Inc. 94:94:26 Apple 94:98:A2 Shanghai # Shanghai LISTEN TECH.LTD @@ -22024,6 +22196,7 @@ 98:F5:37 Zte # zte corporation 98:F8:C1 IdtTechn # IDT Technology Limited 98:F8:DB MariniIm # Marini Impianti Industriali s.r.l. +98:FA:E3 Xiaomi # Xiaomi inc. 98:FB:12 GrandEle # Grand Electronics (HK) Ltd 98:FC:11 Cisco-Li # Cisco-Linksys, LLC 98:FE:03 Ericsson # Ericsson - North America @@ -22123,6 +22296,7 @@ 9C:D2:4B Zte # zte corporation 9C:D3:6D Netgear # NETGEAR INC., 9C:D6:43 D-LinkIn # D-Link International +9C:D9:17 Motorola # Motorola Mobility LLC 9C:DF:03 Harman/B # Harman/Becker Automotive Systems GmbH 9C:E1:0E Nctech # NCTech Ltd 9C:E1:D6 JungerAu # Junger Audio-Studiotechnik GmbH @@ -22210,11 +22384,13 @@ A0:9B:BD TotalAvi # Total Aviation Solutions Pty Ltd A0:A1:30 DliTaiwa # DLI Taiwan Branch office A0:A2:3C Gpms +A0:A3:E2 Actionte # Actiontec Electronics, Inc A0:A7:63 Polytron # Polytron Vertrieb GmbH A0:A8:CD IntelCor # Intel Corporate A0:AA:FD Erathink # EraThink Technologies Corp. A0:B1:00 Shenzhen # ShenZhen Cando Electronics Co.,Ltd A0:B3:CC HewlettP # Hewlett Packard +A0:B4:A5 SamsungE # Samsung Elec Co.,Ltd A0:B5:DA Hongkong # HongKong THTF Co., Ltd A0:B6:62 Acutvist # Acutvista Innovation Co., Ltd. A0:B9:ED Skytap @@ -22314,6 +22490,7 @@ A4:99:81 FujianEl # FuJian Elite Power Tech CO.,LTD. A4:9A:58 SamsungE # Samsung Electronics Co.,Ltd A4:9B:13 Burrough # Burroughs Payment Systems, Inc. +A4:9D:49 Ketra # Ketra, Inc. A4:9E:DB Autocrib # AutoCrib, Inc. A4:9F:85 LyveMind # Lyve Minds, Inc A4:9F:89 Shanghai # Shanghai Rui Rui Communication Technology Co.Ltd. @@ -22376,6 +22553,7 @@ A8:17:58 Elektron # Elektronik System i Umeå AB A8:1B:18 Xts # XTS CORP A8:1B:5D FoxtelMa # Foxtel Management Pty Ltd +A8:1D:16 Azurewav # AzureWave Technologies, Inc A8:1F:AF KryptonP # KRYPTON POLSKA A8:20:66 Apple A8:24:EB ZaoNpoIn # ZAO NPO Introtest @@ -22398,6 +22576,7 @@ A8:62:A2 Jiwumedi # JIWUMEDIA CO., LTD. A8:63:DF Displair # DISPLAIRE CORPORATION A8:63:F2 TexasIns # Texas Instruments +A8:64:05 Nimbus9 # nimbus 9, Inc A8:65:B2 Dongguan # DONGGUAN YISHANG ELECTRONIC TECHNOLOGY CO., LIMITED A8:6A:6F Rim A8:70:A5 Unicomm # UniComm Inc. @@ -22405,6 +22584,7 @@ A8:75:E2 Aventura # Aventura Technologies, Inc. A8:77:6F Zonoff A8:7B:39 Nokia # Nokia Corporation +A8:7C:01 SamsungE # Samsung Elec Co.,Ltd A8:7E:33 NokiaDan # Nokia Danmark A/S A8:81:F1 BmeyeBV # BMEYE B.V. A8:86:DD Apple # Apple, Inc. @@ -22435,9 +22615,11 @@ A8:CB:95 EastBest # EAST BEST CO., LTD. A8:CC:C5 SaabPubl # Saab AB (publ) A8:CE:90 Cvc +A8:D0:E3 SystechE # Systech Electronics Ltd. A8:D0:E5 JuniperN # Juniper Networks A8:D2:36 Lightwar # Lightware Visual Engineering A8:D3:C8 Wachendo # Wachendorff Elektronik GmbH & Co. KG +A8:D8:8A Wyconn A8:E0:18 Nokia # Nokia Corporation A8:E3:EE SonyComp # Sony Computer Entertainment Inc. A8:E5:39 Moimston # Moimstone Co.,Ltd @@ -22476,6 +22658,7 @@ AC:34:CB ShanhaiG # Shanhai GBCOM Communication Technology Co. Ltd AC:36:13 SamsungE # Samsung Electronics Co.,Ltd AC:38:70 LenovoMo # Lenovo Mobile Communication Technology Ltd. +AC:3A:7A Roku AC:3C:0B Apple AC:3C:B4 Nilan # Nilan A/S AC:3D:05 Instores # Instorescreen Aisa @@ -22533,6 +22716,7 @@ AC:A9:A0 Audioeng # Audioengine, Ltd. AC:AB:8D LyngsoMa # Lyngso Marine A/S AC:B3:13 ArrisGro # ARRIS Group, Inc. +AC:B5:7D LiteonTe # Liteon Technology Corporation AC:B7:4F MetelSRO # METEL s.r.o. AC:B8:59 UnibandE # Uniband Electronic Corp, AC:BD:0B Imac # IMAC CO.,LTD @@ -22593,6 +22777,7 @@ B0:38:50 NanjingC # Nanjing CAS-ZDC IOT SYSTEM CO.,LTD B0:43:5D Nuleds # NuLEDs, Inc. B0:45:15 MiraFitn # mira fitness,LLC. +B0:45:19 TctMobil # TCT mobile ltd B0:45:45 YacoubAu # YACOUB Automation GmbH B0:46:FC Mitrasta # MitraStar Technology Corp. B0:48:7A Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. @@ -22627,6 +22812,7 @@ B0:8E:1A Uradio # URadio Systems Co., Ltd B0:90:74 FulanEle # Fulan Electronics Limited B0:91:34 Taleo +B0:91:37 IsisImag # ISis ImageStream Internet Solutions, Inc B0:97:3A E-Fuel # E-Fuel Corporation B0:98:9F LgCns # LG CNS B0:99:28 Fujitsu # Fujitsu Limited @@ -22697,11 +22883,13 @@ B4:2A:39 OrbitMer # ORBIT MERRET, spol. s r. o. B4:2C:92 Zhejiang # Zhejiang Weirong Electronic Co., Ltd B4:2C:BE DirectPa # Direct Payment Solutions Limited +B4:30:52 HuaweiTe # Huawei Technologies Co., Ltd B4:31:B8 Aviwest B4:34:6C Matsunic # MATSUNICHI DIGITAL TECHNOLOGY (HONG KONG) LIMITED B4:35:64 FujianTi # Fujian Tian Cheng Electron Science & Technical Development Co.,Ltd. B4:35:F7 Zhejiang # Zhejiang Pearmain Electronics Co.ltd. B4:37:41 Consert # Consert, Inc. +B4:39:34 PenGener # Pen Generations, Inc. B4:39:D6 Procurve # ProCurve Networking by HP B4:3A:28 SamsungE # Samsung Electronics Co.,Ltd B4:3D:B2 Degreane # Degreane Horizon @@ -22744,8 +22932,10 @@ B4:A4:B5 ZenEye # Zen Eye Co.,Ltd B4:A4:E3 Cisco # CISCO SYSTEMS, INC. B4:A5:A9 Modi # MODI GmbH +B4:A8:28 Shenzhen # Shenzhen Concox Information Technology Co., Ltd B4:A8:2B HistarDi # Histar Digital Electronics Co., Ltd. B4:A9:5A Avaya # Avaya, Inc +B4:A9:FE GhiaTech # GHIA Technology (Shenzhen) LTD B4:AA:4D Ensequen # Ensequence, Inc. B4:AB:2C MtmTechn # MtM Technology Corporation B4:AE:6F CircleRe # Circle Reliance, Inc. @@ -22914,6 +23104,7 @@ BC:14:EF ItonTech # ITON Technology Limited BC:15:A6 TaiwanJa # Taiwan Jantek Electronics,Ltd. BC:16:65 Cisco +BC:16:F5 Cisco BC:1A:67 YfTechno # YF Technology Co., Ltd BC:20:A4 SamsungE # Samsung Electronics BC:20:BA InspurSh # Inspur (Shandong) Electronic Information Co., Ltd @@ -22938,9 +23129,11 @@ BC:44:86 SamsungE # Samsung Electronics Co.,Ltd BC:47:60 SamsungE # Samsung Electronics Co.,Ltd BC:4B:79 Sensingt # SensingTek +BC:4D:FB HitronTe # Hitron Technologies. Inc BC:4E:3C CoreStaf # CORE STAFF CO., LTD. BC:4E:5D Zhongmia # ZhongMiao Technology Co., Ltd. BC:51:FE SwannCom # Swann Communications Pty Ltd +BC:52:B4 Alcatel- # Alcatel-Lucent BC:52:B7 Apple BC:5F:F4 AsrockIn # ASRock Incorporation BC:62:9F TelenetP # Telenet Systems P. Ltd. @@ -22954,6 +23147,7 @@ BC:6E:76 GreenEne # Green Energy Options Ltd BC:71:C1 Xtrillio # XTrillion, Inc. BC:72:B1 SamsungE # Samsung Electronics Co.,Ltd +BC:74:D7 Hangzhou # HangZhou JuRu Technology CO.,LTD BC:76:4E Rackspac # Rackspace US, Inc. BC:76:70 Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd BC:77:37 IntelCor # Intel Corporate @@ -22983,6 +23177,7 @@ BC:B8:52 Cybera # Cybera, Inc. BC:BA:E1 Arec # AREC Inc. BC:BB:C9 Kellendo # Kellendonk Elektronik GmbH +BC:BC:46 SksWeldi # SKS Welding Systems GmbH BC:C1:68 DinboxSv # DinBox Sverige AB BC:C2:3A ThomsonV # Thomson Video Networks BC:C3:42 Panasoni # Panasonic System Networks Co., Ltd. @@ -22999,6 +23194,7 @@ BC:E0:9D Eoslink BC:E5:9F Waterwor # WATERWORLD Technology Co.,LTD BC:EA:2B Citycom # CityCom GmbH +BC:EA:FA HewlettP # Hewlett Packard BC:EE:7B AsustekC # ASUSTek COMPUTER INC. BC:F2:AF Devolo # devolo AG BC:F5:AC LgElectr # LG Electronics @@ -23024,6 +23220,8 @@ C0:34:B4 Gigaston # Gigastone Corporation C0:35:80 A&RTech # A&R TECH C0:35:BD Velocyte # Velocytech Aps +C0:35:C5 Prosoft # Prosoft Systems LTD +C0:38:96 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. C0:38:F9 NokiaDan # Nokia Danmark A/S C0:3B:8F MinicomD # Minicom Digital Signage C0:3D:46 Shanghai # Shanghai Mochui Network Technology Co., Ltd @@ -23050,6 +23248,7 @@ C0:67:AF Cisco C0:6C:0F DobbsSta # Dobbs Stanford C0:6C:6D Magnemot # MagneMotion, Inc. +C0:70:09 HuaweiTe # Huawei Technologies Co., Ltd C0:7B:BC Cisco C0:7E:40 Shenzhen # SHENZHEN XDK COMMUNICATION EQUIPMENT CO.,LTD C0:81:70 EffigisG # Effigis GeoSolutions @@ -23061,6 +23260,7 @@ C0:8C:60 Cisco C0:91:32 PatriotM # Patriot Memory C0:91:34 Procurve # ProCurve Networking by HP +C0:98:79 Acer # Acer Inc. C0:98:E5 Universi # University of Michigan C0:9C:92 Coby C0:9D:26 TopiconH # Topicon HK Lmd. @@ -23108,6 +23308,7 @@ C4:04:15 Netgear # NETGEAR INC., C4:05:28 HuaweiTe # Huawei Technologies Co., Ltd C4:08:4A Alcatel- # Alcatel-Lucent +C4:08:80 Shenzhen # Shenzhen UTEPO Tech Co., Ltd. C4:09:38 FujianSt # Fujian Star-net Communication Co., Ltd C4:0A:CB Cisco # CISCO SYSTEMS, INC. C4:0E:45 AckNetwo # ACK Networks,Inc. @@ -23189,6 +23390,7 @@ C4:B5:12 GeneralE # General Electric Digital Energy C4:BA:99 I+MeActi # I+ME Actia Informatik und Mikro-Elektronik GmbH C4:BD:6A Skf # SKF GmbH +C4:BE:84 TexasIns # Texas Instruments. C4:C0:AE MidoriEl # MIDORI ELECTRONIC CO., LTD. C4:C1:9F National # National Oilwell Varco Instrumentation, Monitoring, and Optimization (NOV IMO) C4:C7:55 BeijingH # Beijing HuaqinWorld Technology Co.,Ltd @@ -23223,6 +23425,7 @@ C8:16:BD HisenseE # HISENSE ELECTRIC CO.,LTD. C8:19:F7 SamsungE # Samsung Electronics Co.,Ltd C8:1A:FE Dlogic # DLOGIC GmbH +C8:1B:6B InnovaSe # Innova Security C8:1E:8E AdvSecur # ADV Security (S) Pte Ltd C8:1F:66 Dell # Dell Inc C8:20:8E Storaged # Storagedata @@ -23409,6 +23612,7 @@ CC:B8:88 AnbSecur # AnB Securite s.a. CC:B8:F1 EagleKin # EAGLE KINGDOM TECHNOLOGIES LIMITED CC:BD:35 Steinel # Steinel GmbH +CC:BD:D3 Ultimake # Ultimaker B.V. CC:BE:71 Optilogi # OptiLogix BV CC:C1:04 AppliedT # Applied Technical Systems CC:C3:EA Motorola # Motorola Mobility LLC @@ -23454,6 +23658,7 @@ D0:17:6A SamsungE # Samsung Electronics Co.,Ltd D0:1A:A7 Uniprint D0:1C:BB BeijingC # Beijing Ctimes Digital Technology Co., Ltd. +D0:22:12 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. D0:22:BE SamsungE # Samsung Electro Mechanics co.,LTD. D0:23:DB Apple D0:27:88 HonHaiPr # Hon Hai Precision Ind.Co.Ltd @@ -23465,6 +23670,7 @@ D0:39:B3 ArrisGro # ARRIS Group, Inc. D0:46:DC Southwes # Southwest Research Institute D0:4C:C1 Sintrone # SINTRONES Technology Corp. +D0:4F:7E Apple D0:50:99 AsrockIn # ASRock Incorporation D0:51:62 SonyMobi # Sony Mobile Communications AB D0:52:A8 Physical # Physical Graph Corporation @@ -23477,6 +23683,7 @@ D0:59:E4 SamsungE # Samsung Electronics Co.,Ltd D0:5A:0F I-BtDigi # I-BT DIGITAL CO.,LTD D0:5A:F1 Shenzhen # Shenzhen Pulier Tech CO.,Ltd +D0:5B:A8 Zte # zte corporation D0:5F:B8 TexasIns # Texas Instruments D0:5F:CE HitachiD # Hitachi Data Systems D0:62:A0 ChinaEss # China Essence Technology (Zhumadian) Co., Ltd. @@ -23553,6 +23760,7 @@ D4:01:29 Broadcom # Broadcom Corporation D4:01:6D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. D4:02:4A Delphian # Delphian Systems LLC +D4:0B:1A Htc # HTC Corporation D4:0B:B9 SolidSem # Solid Semecs bv. D4:0F:B2 AppliedM # Applied Micro Electronics AME bv D4:10:90 Inform # iNFORM Systems AG @@ -23563,7 +23771,7 @@ D4:13:6F AsiaPaci # Asia Pacific Brands D4:1C:1C RcfSPA # RCF S.P.A. D4:1E:35 TohoElec # TOHO Electronics INC. -D4:1F:0C TviVisio # TVI Vision Oy +D4:1F:0C JaiOy # JAI Oy D4:20:6D Htc # HTC Corporation D4:21:22 Sercomm # Sercomm Corporation D4:22:3F LenovoMo # Lenovo Mobile Communication Technology Ltd. @@ -23574,6 +23782,7 @@ D4:2C:3D SkyLight # Sky Light Digital Limited D4:2F:23 AkenoriP # Akenori PTE Ltd D4:31:9D Sinwatec +D4:32:66 Fike # Fike Corporation D4:37:D7 Zte # zte corporation D4:3A:65 IgrsEngi # IGRS Engineering Lab Ltd. D4:3A:E9 Dongguan # DONGGUAN ipt INDUSTRIAL CO., LTD @@ -23613,6 +23822,7 @@ D4:87:D8 SamsungE # Samsung Electronics D4:88:90 SamsungE # Samsung Electronics Co.,Ltd D4:8C:B5 Cisco # CISCO SYSTEMS, INC. +D4:8D:D9 MeldTech # Meld Technology, Inc D4:8F:33 Microsof # Microsoft Corporation D4:8F:AA SogecamI # Sogecam Industrial, S.A. D4:91:AF Electroa # Electroacustica General Iberica, S.A. @@ -23667,6 +23877,7 @@ D4:F0:B4 NapcoSec # Napco Security Technologies D4:F1:43 Iproad # IPROAD.,Inc D4:F4:6F Apple +D4:F5:13 TexasIns # Texas Instruments D4:F6:3F IeaSRL # IEA S.R.L. D8:00:4D Apple D8:05:2E Skyviia # Skyviia Corporation @@ -23696,6 +23907,7 @@ D8:30:62 Apple D8:31:CF SamsungE # Samsung Electronics Co.,Ltd D8:33:7F OfficeFa # Office FA.com Co.,Ltd. +D8:3C:69 TinnoMob # Tinno Mobile Technology Corp D8:42:AC Shanghai # Shanghai Feixun Communication Co.,Ltd. D8:46:06 SiliconV # Silicon Valley Global Marketing D8:49:0B HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -23725,9 +23937,12 @@ D8:79:88 HonHaiPr # Hon Hai Precision Ind. Co., Ltd. D8:7C:DD Sanix # SANIX INCORPORATED D8:7E:B1 XOWare # x.o.ware, inc. +D8:80:39 Microchi # Microchip Technology Inc. D8:81:CE Ahn # AHN INC. +D8:84:66 ExtremeN # Extreme Networks D8:8A:3B Unit-Em D8:90:E8 SamsungE # Samsung Electronics Co.,Ltd +D8:93:41 GeneralE # General Electric Global Research D8:95:2F TexasIns # Texas Instruments D8:96:85 Gopro D8:96:95 Apple @@ -23735,6 +23950,7 @@ D8:97:3B ArtesynE # Artesyn Embedded Technologies D8:97:60 C2Develo # C2 Development, Inc. D8:97:7C GreyInno # Grey Innovation +D8:97:BA Pegatron # PEGATRON CORPORATION D8:9D:67 HewlettP # Hewlett Packard D8:9D:B9 Emegatec # eMegatech International Corp. D8:9E:3F Apple @@ -23751,12 +23967,14 @@ D8:B6:D6 BluTethe # Blu Tether Limited D8:B8:F6 Nantwork # Nantworks D8:B9:0E TripleDo # Triple Domain Vision Co.,Ltd. +D8:BB:2C Apple D8:BF:4C VictoryC # Victory Concept Electronics Limited D8:C0:68 Netgenet # Netgenetech.co.,ltd. D8:C3:FB Detracom D8:C6:91 HichanTe # Hichan Technology Corp. D8:C7:C8 ArubaNet # Aruba Networks D8:C9:9D EaDispla # EA DISPLAY LIMITED +D8:CB:8A Micro-St # Micro-Star INTL CO., LTD. D8:CF:9C Apple D8:D1:CB Apple D8:D2:7C JemaEner # JEMA ENERGY, SA @@ -23772,12 +23990,13 @@ D8:DF:0D Beronet # beroNet GmbH D8:E3:AE CirtecMe # CIRTEC MEDICAL SYSTEMS D8:E5:6D TctMobil # TCT Mobile Limited -D8:E7:2B OnpathTe # OnPATH Technologies +D8:E7:2B Netscout # NetScout Systems, Inc. D8:E7:43 Wush # Wush, Inc D8:E9:52 Keopsys D8:EB:97 Trendnet # TRENDnet, Inc. D8:EE:78 MoogProt # Moog Protokraft D8:F0:F2 Zeebo # Zeebo Inc +D8:F7:10 LibreWir # Libre Wireless Technologies Inc. D8:FB:11 Axacore D8:FC:93 IntelCor # Intel Corporate D8:FE:8F Idfone # IDFone Co., Ltd. @@ -23849,6 +24068,7 @@ DC:C0:DB Shenzhen # Shenzhen Kaiboer Technology Co., Ltd. DC:C1:01 SolidTec # SOLiD Technologies, Inc. DC:C4:22 Systemba # Systembase Limited +DC:C6:22 BuheungS # BUHEUNG SYSTEM DC:C7:93 Nokia # Nokia Corporation DC:CB:A8 ExploraT # Explora Technologies Inc DC:CE:41 FeGlobal # FE GLOBAL HONG KONG LIMITED @@ -23859,11 +24079,13 @@ DC:D3:21 HumaxTld # HUMAX co.,tld DC:D5:2A SunnyHea # Sunny Heart Limited DC:D8:7F Shenzhen # Shenzhen JoinCyber Telecom Equipment Ltd -DC:DA:4F GetTechn # GET Technology,INC +DC:DA:4F GetckTec # GETCK TECHNOLOGY, INC DC:DE:CA Akyllor +DC:E1:AD Shenzhen # Shenzhen Wintop Photoelectric Technology Co., Ltd DC:E2:AC LumensDi # Lumens Digital Optics Inc. DC:E5:78 Experime # Experimental Factory of Scientific Engineering and Special Design Department DC:E7:1C AugElekt # AUG Elektronik GmbH +DC:EC:06 HeimiNet # Heimi Network Technology Co., Ltd. DC:F0:5D LettaTek # Letta Teknoloji DC:F1:10 Nokia # Nokia Corporation DC:F7:55 Sitronik @@ -23878,6 +24100,7 @@ E0:10:7F RuckusWi # Ruckus Wireless E0:14:3E Modoosis # Modoosis Inc. E0:18:77 Fujitsu # Fujitsu Limited +E0:19:1D HuaweiTe # Huawei Technologies Co., Ltd E0:1C:41 Aerohive # Aerohive Networks Inc. E0:1C:EE BravoTec # Bravo Tech, Inc. E0:1D:38 BeijingH # Beijing HuaqinWorld Technology Co.,Ltd @@ -23896,6 +24119,7 @@ E0:36:E3 StageOne # Stage One International Co., Ltd. E0:39:D7 Plexxi # Plexxi, Inc. E0:3C:5B Shenzhen # SHENZHEN JIAXINJIE ELECTRON CO.,LTD +E0:3E:44 Broadcom # Broadcom Corporation E0:3E:4A Cavanagh # Cavanagh Group International E0:3E:7D Data-Com # data-complex GmbH E0:3F:49 AsustekC # ASUSTek COMPUTER INC. @@ -23920,6 +24144,7 @@ E0:7F:88 Evidence # EVIDENCE Network SIA E0:81:77 Greenbyt # GreenBytes, Inc. E0:87:B1 Nata-Inf # Nata-Info Ltd. +E0:88:5D Technico # Technicolor CH USA Inc E0:8A:7E Exponent E0:8F:EC Repotec # REPOTEC CO., LTD. E0:91:53 XaviTech # XAVi Technologies Corp. @@ -24038,6 +24263,7 @@ E4:83:99 ArrisGro # ARRIS Group, Inc. E4:8A:D5 RfWindow # RF WINDOW CO., LTD. E4:8B:7F Apple +E4:8C:0F Discover # Discovery Insure E4:90:69 Rockwell # Rockwell Automation E4:92:E7 Gridlink # Gridlink Tech. Co.,Ltd. E4:92:FB SamsungE # Samsung Electronics Co.,Ltd @@ -24051,6 +24277,7 @@ E4:AD:7D SclEleme # SCL Elements E4:AF:A1 Hes-So E4:B0:21 SamsungE # Samsung Electronics Co.,Ltd +E4:BA:D9 360Fly # 360 Fly Inc. E4:C1:46 Objetivo # Objetivos y Servicios de Valor A E4:C6:2B Airware E4:C6:3D Apple # Apple, Inc. @@ -24071,6 +24298,7 @@ E4:F3:E3 Shanghai # Shanghai iComhome Co.,Ltd. E4:F4:C6 Netgear E4:F7:A1 Datafox # Datafox GmbH +E4:F8:EF SamsungE # Samsung Elec Co.,Ltd E4:FA:1D PadPerip # PAD Peripheral Advanced Design Inc. E4:FF:DD Electron # ELECTRON INDIA E8:03:9A SamsungE # Samsung Electronics CO., LTD @@ -24089,10 +24317,12 @@ E8:13:24 Guangzho # GuangZhou Bonsoninfo System CO.,LTD E8:15:0E Nokia # Nokia Corporation E8:17:FC Nifty # NIFTY Corporation +E8:18:63 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. E8:28:77 Tmy # TMY Co., Ltd. E8:28:D5 CotsTech # Cots Technology E8:2A:EA IntelCor # Intel Corporate E8:2E:24 OutOfFog # Out of the Fog Research LLC +E8:33:81 ArrisGro # ARRIS Group, Inc. E8:39:35 HewlettP # Hewlett Packard E8:39:DF AskeyCom # Askey Computer E8:3A:97 OczTechn # OCZ Technology Group @@ -24128,9 +24358,11 @@ E8:7A:F3 S5TechSR # S5 Tech S.r.l. E8:80:2E Apple E8:80:D8 GntekEle # GNTEK Electronics Co.,Ltd. +E8:87:A3 LoxleyPu # Loxley Public Company Limited E8:89:2C ArrisGro # ARRIS Group, Inc. E8:8D:28 Apple E8:8D:F5 ZnyxNetw # ZNYX Networks, Inc. +E8:8E:60 Nsd # NSD Corporation E8:92:18 Arcontia # Arcontia International AB E8:92:A4 LgElectr # LG Electronics E8:94:4C CogentHe # Cogent Healthcare Systems Ltd @@ -24154,6 +24386,7 @@ E8:C2:29 H-Displa # H-Displays (MSC) Bhd E8:C3:20 AustcoCo # Austco Communication Systems Pty Ltd E8:CB:A1 Nokia # Nokia Corporation +E8:CC:18 D-LinkIn # D-Link International E8:CC:32 Micronet # Micronet LTD E8:CD:2D HuaweiTe # Huawei Technologies Co., Ltd E8:CE:06 Skyhawke # SkyHawke Technologies, LLC. @@ -24197,6 +24430,7 @@ EC:22:80 D-LinkIn # D-Link International EC:23:3D HuaweiTe # Huawei Technologies Co., Ltd EC:23:68 Intelliv # IntelliVoice Co.,Ltd. +EC:24:B8 TexasIns # Texas Instruments EC:2A:F0 Ypsomed # Ypsomed AG EC:2C:49 Universi # University of Tokyo EC:2E:4E Hitachi- # HITACHI-LG DATA STORAGE INC @@ -24217,6 +24451,7 @@ EC:4C:4D ZaoNpkRo # ZAO NPK RoTeK EC:54:2E Shanghai # Shanghai XiMei Electronic Technology Co. Ltd EC:55:F9 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. +EC:59:E7 Microsof # Microsoft Corporation EC:5C:69 Mitsubis # MITSUBISHI HEAVY INDUSTRIES MECHATRONICS SYSTEMS,LTD. EC:62:64 Global41 # Global411 Internet Services, LLC EC:63:E5 EpboardD # ePBoard Design LLC @@ -24225,6 +24460,7 @@ EC:71:DB Shenzhen # Shenzhen Baichuan Digital Technology Co., Ltd. EC:7C:74 JustoneT # Justone Technologies Co., Ltd. EC:7D:9D Mei +EC:80:09 Novaspar # NovaSparks EC:83:6C RmTech # RM Tech Co., Ltd. EC:85:2F Apple EC:88:8F Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. @@ -24282,6 +24518,7 @@ F0:13:C3 Shenzhen # SHENZHEN FENDA TECHNOLOGY CO., LTD F0:15:A0 Kyungdon # KyungDong One Co., Ltd. F0:1C:13 LgElectr # LG Electronics +F0:1C:2D JuniperN # Juniper Networks F0:1F:AF Dell # Dell Inc F0:21:9D Cal-Comp # Cal-Comp Electronics & Communications Company Ltd. F0:23:29 ShowaDen # SHOWA DENKI CO.,LTD. @@ -24375,6 +24612,7 @@ F0:EE:BB Vipar # VIPAR GmbH F0:F0:02 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. F0:F2:60 Mobitec # Mobitec AB +F0:F3:36 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD F0:F5:AE Adaptrum # Adaptrum Inc. F0:F6:1C Apple F0:F6:44 Whitesky # Whitesky Science & Technology Co.,Ltd. @@ -24384,6 +24622,7 @@ F0:F8:42 Keebox # KEEBOX, Inc. F0:F9:F7 Ies # IES GmbH & Co. KG F0:FD:A0 AcurixNe # Acurix Networks LP +F0:FE:6B Shanghai # Shanghai High-Flying Electronics Technology Co., Ltd F4:03:21 BenextBV # BeNeXt B.V. F4:04:4C Valencet # ValenceTech Limited F4:06:69 IntelCor # Intel Corporate @@ -24414,6 +24653,7 @@ F4:45:ED Portable # Portable Innovation Technology Ltd. F4:47:2A NanjingR # Nanjing Rousing Sci. and Tech. Industrial Co., Ltd F4:48:48 Amscreen # Amscreen Group Ltd +F4:4E:05 Cisco F4:4E:FD ActionsS # Actions Semiconductor Co.,Ltd.(Cayman Islands) F4:50:EB Telechip # Telechips Inc F4:52:14 Mellanox # Mellanox Technologies, Inc. @@ -24427,6 +24667,7 @@ F4:5F:F7 DqTechno # DQ Technology Inc. F4:60:0D Panoptic # Panoptic Technology, Inc F4:63:49 Diffon # Diffon Corporation +F4:64:5D Toshiba F4:6A:BC Adonit # Adonit Corp. Ltd. F4:6D:04 AsustekC # ASUSTek COMPUTER INC. F4:6D:E2 Zte # zte corporation @@ -24477,6 +24718,7 @@ F4:E6:D7 SolarPow # Solar Power Technologies, Inc. F4:EA:67 Cisco # CISCO SYSTEMS, INC. F4:EC:38 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. +F4:EE:14 Shenzhen # SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD. F4:F1:5A Apple F4:F1:E1 Motorola # Motorola Mobility LLC F4:F2:6D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. @@ -24518,6 +24760,7 @@ F8:3D:4E Softlink # Softlink Automation System Co., Ltd F8:3D:FF HuaweiTe # Huawei Technologies Co., Ltd F8:42:FB YasudaJo # Yasuda Joho Co.,ltd. +F8:43:60 Ingenico F8:45:AD KonkaGro # Konka Group Co., Ltd. F8:46:2D SyntecIn # SYNTEC Incorporation F8:47:2D X2genDig # X2gen Digital Corp. Ltd @@ -24570,8 +24813,10 @@ F8:AA:8A AxviewTe # Axview Technology (Shenzhen) Co.,Ltd F8:AC:6D Deltenna # Deltenna Ltd F8:B1:56 Dell # Dell Inc +F8:B2:F3 Guangzho # GUANGZHOU BOSMA TECHNOLOGY CO.,LTD F8:B5:99 Guangzho # Guangzhou CHNAVS Digital Technology Co.,Ltd F8:BC:12 Dell # Dell Inc +F8:BC:41 Rosslare # Rosslare Enterprises Limited F8:C0:01 JuniperN # Juniper Networks F8:C0:91 Highgate # Highgates Technology F8:C2:88 Cisco @@ -24657,9 +24902,11 @@ FC:58:FA ShenZhen # Shen Zhen Shi Xin Zhong Xin Technology Co.,Ltd. FC:5B:24 WeibelSc # Weibel Scientific A/S FC:5B:26 Mikrobit # MikroBits +FC:5B:39 Cisco FC:60:18 Zhejiang # Zhejiang Kangtai Electric Co., Ltd. FC:61:98 NecPerso # NEC Personal Products, Ltd FC:62:6E BeijingM # Beijing MDC Telecom +FC:62:B9 AlpsErec # ALPS ERECTRIC CO.,LTD FC:68:3E Directed # Directed Perception, Inc FC:6C:31 Lxinstru # LXinstruments GmbH FC:6D:C0 Bme # BME CORPORATION @@ -24685,6 +24932,7 @@ FC:AD:0F QtsNetwo # QTS NETWORKS FC:AF:6A Conemtec # Conemtech AB FC:B0:C4 Shanghai # Shanghai DareGlobal Technologies Co., Ltd +FC:B4:E6 AskeyCom # ASKEY COMPUTER CORP. FC:BB:A1 Shenzhen # Shenzhen Minicreate Technology Co.,Ltd FC:C2:3D Atmel # Atmel Corporation FC:C2:DE MurataMa # Murata Manufacturing Co., Ltd. @@ -24808,10 +25056,21 @@ 01-80-C2-00-00-10 Bridge-Management 01-80-C2-00-00-11 Load-Server 01-80-C2-00-00-12 Loadable-Device +01-80-C2-00-00-13 IEEE-1905.1-Control 01-80-C2-00-00-14 ISIS-all-level-1-IS's 01-80-C2-00-00-15 ISIS-all-level-2-IS's +01-80-C2-00-00-18 IEEE-802.1B-All-Manager-Stations +01-80-C2-00-00-19 IEEE-802.11aa-groupcast-with-retries +01-80-C2-00-00-1A IEEE-802.1B-All-Agent-Stations +01-80-C2-00-00-1B ESIS-all-multicast-capable-ES's +01-80-C2-00-00-1C ESIS-all-multicast-announcements +01-80-C2-00-00-1D ESIS-all-multicast-capable-IS's +01-80-C2-00-00-1E Token-Ring-all-DTR-Concentrators 01-80-C2-00-00-30/45 OAM-Multicast-DA-Class-1 01-80-C2-00-00-38/45 OAM-Multicast-DA-Class-2 +01-80-C2-00-00-40 All-RBridges +01-80-C2-00-00-41 All-IS-IS-RBridges +01-80-C2-00-00-42 All-ESADI-RBridges 01-80-C2-00-01-00 FDDI-RMT-Directed-Beacon 01-80-C2-00-01-10 FDDI-status-report-frame 01-DD-00-FF-FF-FF Ungermann-Bass-boot-me-requests diff -Nru wireshark-1.12.0+git+4fab41a1/NEWS wireshark-1.12.1+g01b65bf/NEWS --- wireshark-1.12.0+git+4fab41a1/NEWS 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/NEWS 2014-09-16 12:09:03.000000000 -0400 @@ -1,4 +1,4 @@ - Wireshark 1.12.0 Release Notes + Wireshark 1.12.1 Release Notes __________________________________________________________ What is Wireshark? @@ -13,171 +13,105 @@ Bug Fixes The following bugs have been fixed: - * "On-the-wire" packet lengths are limited to 65535 bytes. - ([1]Bug 8808, [2]Bug 9390) - * "Follow TCP Stream" shows only the first HTTP request and - response. ([3]Bug 9044) - * Files with pcap-ng Simple Packet Blocks can't be read. - ([4]Bug 9200) - * MPLS-over-PPP isn't recognized. ([5]Bug 9492) - New and Updated Features + The following vulnerabilities have been fixed. + * [1]wnpa-sec-2014-13 + MEGACO dissector infinite loop. ([2]Bug 10333) + [3]CVE-2014-6423 + * [4]wnpa-sec-2014-14 + Netflow dissector crash. ([5]Bug 10370) [6]CVE-2014-6424 + * [7]wnpa-sec-2014-15 + CUPS dissector crash. ([8]Bug 10353) [9]CVE-2014-6425 + * [10]wnpa-sec-2014-16 + HIP dissector infinite loop. [11]CVE-2014-6426 + * [12]wnpa-sec-2014-17 + RTSP dissector crash. ([13]Bug 10381) [14]CVE-2014-6427 + * [15]wnpa-sec-2014-18 + SES dissector crash. ([16]Bug 10454) [17]CVE-2014-6428 + * [18]wnpa-sec-2014-19 + Sniffer file parser crash. ([19]Bug 10461) + [20]CVE-2014-6429 [21]CVE-2014-6430 [22]CVE-2014-6431 + [23]CVE-2014-6432 - The following features are new or have been significantly - updated since version 1.10: - * The Windows installer now uninstalls the previous version - of Wireshark silently. You can still run the uninstaller - manually beforehand if you wish to run it interactively. - * Expert information is now filterable when the new API is in - use. - * The "Number" column shows related packets and protocol - conversation spans (Qt only). - * When manipulating packets with editcap using the -C - and/or -s options, it is now possible - to also adjust the original frame length using the -L - option. - * You can now pass the -C option to editcap - multiple times, which allows you to chop bytes from the - beginning of a packet as well as at the end of a packet in - a single step. - * You can now specify an optional offset to the -C option for - editcap, which allows you to start chopping from that - offset instead of from the absolute packet beginning or - end. - * "malformed" display filter has been renamed to - "_ws.malformed". A handful of other filters have been given - the "_ws." prefix to note they are Wireshark application - specific filters and not dissector filters. - * The Kerberos dissector has been replaced with an auto - generated one from ASN1 protocol description, changing a - lot of filter names. - - Additionally the Windows installers have an extra component: a - preview of the upcoming user interface for Wireshark 2.0. - - The following features are new (or have been significantly - updated) since version 1.11.3: - * Transport name resolution is now disabled by default. - * Support has been added for all versions of the DCBx - protocol. - * Cleanup of LLDP code, all dissected fields are now - navigable. - - The following features are new (or have been significantly - updated) since version 1.11.2: - * Qt port: - + The About dialog has been added - + The Capture Interfaces dialog has been added. - + The Decode As dialog has been added. It managed to - swallow up the User Specified Decodes dialog as well. - + The Export PDU dialog has been added. - + Several SCTP dialogs have been added. - + The statistics tree (the backend for many Statistics - and Telephony menu items) dialog has been added. - + The I/O Graph dialog has been added. - + French translation has updated. - - The following features are new (or have been significantly - updated) since version 1.11.1: - * Mac OS X packaging has been improved. - - The following features are new (or have been significantly - updated) since version 1.11.0: - * Dissector output may be encoded as UTF-8. This includes - TShark output. - * Qt port: - + The Follow Stream dialog now supports packet and TCP - stream selection. - + A Flow Graph (sequence diagram) dialog has been added. - + The main window now respects geometry preferences. - - Removed Dissectors - - * The ASN1 plugin has been removed as it's deemed obsolete. - * The GNM dissector has been removed as it was never used. - * The Kerberos hand made dissector has been replaced by one - generated from ASN1 code. - - Platform Support - - Support for Windows XP has been deprecated. We will make an - effort to support it for as long as possible but our ability to - do so depends on upstream packages and other factors beyond our - control. + The following bugs have been fixed: + * Wireshark can crash during remote capture (rpcap) + configuration. ([24]Bug 3554, [25]Bug 6922, + ws-buglink:7021) + * 802.11 capture does not decrypt/decode DHCP response. + ([26]Bug 8734) + * Extra quotes around date fields (FT_ABSOLUTE_TIME) when + using -E quote=d or s. ([27]Bug 10213) + * No progress line in "VOIP RTP Player". ([28]Bug 10307) + * MIPv6 Service Selection Identifier parse error. ([29]Bug + 10323) + * Probably wrong length check in proto_item_set_end. ([30]Bug + 10329) + * 802.11 BA sequence number decode is broken. ([31]Bug 10334) + * wmem_alloc_array() "succeeds" (and clobbers memory) when + requested to allocate 0xaaaaaaaa items of size 12. ([32]Bug + 10343) + * Different dissection results for same file. ([33]Bug 10348) + * Mergecap wildcard breaks in version 1.12.0. ([34]Bug 10354) + * Diameter TCP reassemble. ([35]Bug 10362) + * TRILL NLPID 0xc0 unknown to Wireshark. ([36]Bug 10382) + * BTLE advertising header flags (RxAdd/TxAdd) dissected + incorrectly. ([37]Bug 10384) + * Ethernet OAM (CFM) frames including TLV's are wrongly + decoded as malformed. ([38]Bug 10385) + * BGP4: Wireshark skipped some potion of AS_PATH. ([39]Bug + 10399) + * MAC address name resolution is broken. ([40]Bug 10344) + * Wrong decoding of RPKI RTR End of Data PDU. ([41]Bug 10411) + * SSL/TLS dissector incorrectly interprets length for + status_request_v2 hello extension. ([42]Bug 10416) + * Misparsed NTP control assignments with empty values. + ([43]Bug 10417) + * 6LoWPAN multicast address decompression problems. ([44]Bug + 10426) + * Netflow v9 flowset not decoded if options template has + zero-length scope section. ([45]Bug 10432) + * GUI Hangs when Selecting Path to GeoIP Files. ([46]Bug + 10434) + * AX.25 dissector prints unprintable characters. ([47]Bug + 10439) + * 6LoWPAN context handling not working. ([48]Bug 10443) + * SIP: When export to a CSV, Info is changed to differ. + ([49]Bug 10453) + * Typo in packet-netflow.c. ([50]Bug 10458) + * Incorrect MPEG-TS decoding (OPCR field). ([51]Bug 10446) - U3 packages are no longer supported or provided. + New and Updated Features - This is the last major release that will support 32-bit - versions of Mac OS X. + There are no new features in this release. New Protocol Support - 29West, 802.1AE Secure tag, A21, ACR122, ADB Client-Server, - AllJoyn, Apple PKTAP, Aruba Instant AP, ASTERIX, ATN, Bencode, - Bluetooth 3DS, Bluetooth HSP, Bluetooth Linux Monitor - Transport, Bluetooth Low Energy, Bluetooth Low Energy RF Info, - CARP, CFDP, Cisco MetaData, DCE/RPC MDSSVC, DeviceNet, ELF file - format, Ethernet Local Management Interface (E-LMI), Ethernet - Passive Optical Network (EPON), EXPORTED PDU, FINGER, HDMI, - High-Speed LAN Instrument Protocol (HiSLIP), HTTP2, IDRP, IEEE - 1722a, ILP, iWARP Direct Data Placement and Remote Direct - Memory Access Protocol, Kafka, Kyoto Tycoon, Landis & Gyr - Telegyr 8979, LBM, LBMC, LBMPDM, LBMPDM-TCP, LBMR, LBT-RM, - LBT-RU, LBT-TCP, Lightweight Mesh (v1.1.1), Link16, Linux - netlink, Linux netlink netfilter, Linux netlink sock diag, - Linux rtnetlink (route netlink), Logcat, MBIM, Media Agnostic - USB (MA USB), MiNT, MP4 / ISOBMFF file format, MQ Telemetry - Transport Protocol, MS NLB (Rewrite), Novell PKIS certificate - extensions, NXP PN532 HCI, Open Sound Control, OpenFlow, - Pathport, PDC, Picture Transfer Protocol Over IP, PKTAP, - Private Data Channel, QUIC (Quick UDP Internet Connections), - SAE J1939, SEL RTAC (Real Time Automation Controller) EIA-232 - Serial-Line Dissection, Sippy RTPproxy, SMB-Direct, SPDY, - STANAG 4607, STANAG 5066 DTS, STANAG 5066 SIS, Tinkerforge, - Ubertooth, UDT, URL Encoded Form Data, USB Communications and - CDC Control, USB Device Firmware Upgrade, VP8, WHOIS, Wi-Fi - Display, and ZigBee Green Power profile + There are no new protocols in this release. Updated Protocol Support - Too many protocols have been updated to list here. + 6LoWPAN, A21, ACR122, Art-Net, AX.25, BGP, BTLE, CAPWAP, + DIAMETER, DICOM, DVB-CI, Ethernet OAM, HIP, HiSLIP, HTTP2, IEEE + 802.11, MAUSB, MEGACO, MIPv6, MP2T, Netflow, NTP, openSAFETY, + OSI, RDM, RPKI RTR, RTSP, SES, SIP, TLS, and Token Ring MAC New and Updated Capture File Support - Netscaler 2.6, STANAG 4607, and STANAG 5066 Data Transfer - Sublayer - - Major API Changes - - The libwireshark API has undergone some major changes: - * A more flexible, modular memory manager (wmem) has been - added. It was available experimentally in 1.10 but is now - mature and has mostly replaced the old emem API (which is - deprecated). - * A new API for expert information has been added, replacing - the old one. - * The tvbuff API has been cleaned up: tvb_length has been - renamed to tvb_captured_length for clarity, and - tvb_get_string and tvb_get_stringz have been deprecated in - favour of tvb_get_string_enc and tvb_get_stringz_enc. - * dissector_try_heuristic() signature has been changed to - return heur_dtbl_entry_t to make it possible to save it and - use it in subsequent calls to avoid the overhead of going - trough the heuristics list. + DOS Sniffer, and NetScaler __________________________________________________________ Getting Wireshark Wireshark source code and installation packages are available - from [6]http://www.wireshark.org/download.html. + from [52]http://www.wireshark.org/download.html. Vendor-supplied Packages Most Linux and Unix vendors supply their own Wireshark packages. You can usually install or upgrade Wireshark using the package management system specific to that platform. A list - of third-party packages can be found on the [7]download page on - the Wireshark web site. + of third-party packages can be found on the [53]download page + on the Wireshark web site. __________________________________________________________ File Locations @@ -190,81 +124,127 @@ Known Problems - Dumpcap might not quit if Wireshark or TShark crashes. ([8]Bug + Dumpcap might not quit if Wireshark or TShark crashes. ([54]Bug 1419) - The BER dissector might infinitely loop. ([9]Bug 1516) + The BER dissector might infinitely loop. ([55]Bug 1516) Capture filters aren't applied when capturing from named pipes. (ws-buglink:1814) Filtering tshark captures with read filters (-R) no longer - works. ([10]Bug 2234) + works. ([56]Bug 2234) The 64-bit Windows installer does not support Kerberos - decryption. ([11]Win64 development page) + decryption. ([57]Win64 development page) - Resolving ([12]Bug 9044) reopens ([13]Bug 3528) so that + Resolving ([58]Bug 9044) reopens ([59]Bug 3528) so that Wireshark no longer automatically decodes gzip data when following a TCP stream. - Application crash when changing real-time option. ([14]Bug + Application crash when changing real-time option. ([60]Bug 4035) - Hex pane display issue after startup. ([15]Bug 4056) + Hex pane display issue after startup. ([61]Bug 4056) - Packet list rows are oversized. ([16]Bug 4357) + Packet list rows are oversized. ([62]Bug 4357) Summary pane selected frame highlighting not maintained. - ([17]Bug 4445) + ([63]Bug 4445) Wireshark and TShark will display incorrect delta times in some - cases. ([18]Bug 4985) + cases. ([64]Bug 4985) The 64-bit Mac OS X installer doesn't support Mac OS X 10.9 - ([19]Bug 9242) + ([65]Bug 9242) __________________________________________________________ Getting Help - Community support is available on [20]Wireshark's Q&A site and + Community support is available on [66]Wireshark's Q&A site and on the wireshark-users mailing list. Subscription information and archives for all of Wireshark's mailing lists can be found - on [21]the web site. + on [67]the web site. Official Wireshark training and certification are available - from [22]Wireshark University. + from [68]Wireshark University. __________________________________________________________ Frequently Asked Questions - A complete FAQ is available on the [23]Wireshark web site. + A complete FAQ is available on the [69]Wireshark web site. __________________________________________________________ - Last updated 2014-07-31 11:36:04 PDT + Last updated 2014-09-16 08:49:14 PDT References - 1. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8808 - 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9390 - 3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 - 4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9200 - 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492 - 6. http://www.wireshark.org/download.html - 7. http://www.wireshark.org/download.html#thirdparty - 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 - 9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 - 10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 - 11. https://wiki.wireshark.org/Development/Win64 - 12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 - 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 - 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 - 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 - 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 - 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 - 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 - 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9242 - 20. http://ask.wireshark.org/ - 21. http://www.wireshark.org/lists/ - 22. http://www.wiresharktraining.com/ - 23. http://www.wireshark.org/faq.html + 1. https://www.wireshark.org/security/wnpa-sec-2014-13.html + 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10333 + 3. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-6423 + 4. https://www.wireshark.org/security/wnpa-sec-2014-14.html + 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10370 + 6. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-6424 + 7. https://www.wireshark.org/security/wnpa-sec-2014-15.html + 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10353 + 9. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-6425 + 10. https://www.wireshark.org/security/wnpa-sec-2014-16.html + 11. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-6426 + 12. https://www.wireshark.org/security/wnpa-sec-2014-17.html + 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10381 + 14. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-6427 + 15. https://www.wireshark.org/security/wnpa-sec-2014-18.html + 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10454 + 17. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-6428 + 18. https://www.wireshark.org/security/wnpa-sec-2014-19.html + 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10461 + 20. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-6429 + 21. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-6430 + 22. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-6431 + 23. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-6432 + 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3554 + 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6922 + 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8734 + 27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10213 + 28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10307 + 29. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10323 + 30. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10329 + 31. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10334 + 32. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10343 + 33. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10348 + 34. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10354 + 35. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10362 + 36. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10382 + 37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10384 + 38. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10385 + 39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10399 + 40. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10344 + 41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10411 + 42. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10416 + 43. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10417 + 44. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10426 + 45. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10432 + 46. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10434 + 47. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10439 + 48. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10443 + 49. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10453 + 50. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10458 + 51. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10446 + 52. http://www.wireshark.org/download.html + 53. http://www.wireshark.org/download.html#thirdparty + 54. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 + 55. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 + 56. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 + 57. https://wiki.wireshark.org/Development/Win64 + 58. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 + 59. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 + 60. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 + 61. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 + 62. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 + 63. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 + 64. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 + 65. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9242 + 66. http://ask.wireshark.org/ + 67. http://www.wireshark.org/lists/ + 68. http://www.wiresharktraining.com/ + 69. http://www.wireshark.org/faq.html diff -Nru wireshark-1.12.0+git+4fab41a1/packaging/nsis/wireshark.nsi wireshark-1.12.1+g01b65bf/packaging/nsis/wireshark.nsi --- wireshark-1.12.0+git+4fab41a1/packaging/nsis/wireshark.nsi 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/packaging/nsis/wireshark.nsi 2014-09-16 12:09:03.000000000 -0400 @@ -204,6 +204,44 @@ ${EndIf} !endif + ; Get the Windows version + Call GetWindowsVersion + Pop $R0 ; Windows Version + + ; Check if we're able to run with this version + StrCmp $R0 '95' lbl_winversion_unsupported + StrCmp $R0 '98' lbl_winversion_unsupported + StrCmp $R0 'ME' lbl_winversion_unsupported + StrCmp $R0 'NT 4.0' lbl_winversion_unsupported_nt4 + StrCmp $R0 '2000' lbl_winversion_unsupported_2000 + StrCmp $R0 'XP' lbl_winversion_warn_xp + Goto lbl_winversion_supported + +lbl_winversion_unsupported: + MessageBox MB_OK \ + "Windows $R0 is no longer supported.$\nPlease install Ethereal 0.99.0 instead." \ + /SD IDOK + Quit + +lbl_winversion_unsupported_nt4: + MessageBox MB_OK \ + "Windows $R0 is no longer supported.$\nPlease install Wireshark 0.99.4 instead." \ + /SD IDOK + Quit + +lbl_winversion_unsupported_2000: + MessageBox MB_OK \ + "Windows $R0 is no longer supported.$\nPlease install Wireshark 1.2 or 1.0 instead." \ + /SD IDOK + Quit + +lbl_winversion_warn_xp: + MessageBox MB_YESNO|MB_ICONINFORMATION \ + "This version of ${PROGRAM_NAME} may not work on Windows $R0.$\nWe recommend ${PROGRAM_NAME} 1.10 instead.$\nDo you want to continue?" \ + /SD IDYES IDYES lbl_winversion_supported + Quit + +lbl_winversion_supported: !insertmacro IsWiresharkRunning ; Copied from http://nsis.sourceforge.net/Auto-uninstall_old_before_installing_new @@ -1199,44 +1237,6 @@ WriteINIStr "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 10" "Flags" "" !endif - ; Get the Windows version - Call GetWindowsVersion - Pop $R0 ; Windows Version - - ; Check if we're able to run with this version - StrCmp $R0 '95' lbl_winversion_unsupported - StrCmp $R0 '98' lbl_winversion_unsupported - StrCmp $R0 'ME' lbl_winversion_unsupported - StrCmp $R0 'NT 4.0' lbl_winversion_unsupported_nt4 - StrCmp $R0 '2000' lbl_winversion_unsupported_2000 - StrCmp $R0 'XP' lbl_winversion_warn_xp - Goto lbl_winversion_supported - -lbl_winversion_unsupported: - MessageBox MB_OK \ - "Windows $R0 is no longer supported.$\nPlease install Ethereal 0.99.0 instead." \ - /SD IDOK - Quit - -lbl_winversion_unsupported_nt4: - MessageBox MB_OK \ - "Windows $R0 is no longer supported.$\nPlease install Wireshark 0.99.4 instead." \ - /SD IDOK - Quit - -lbl_winversion_unsupported_2000: - MessageBox MB_OK \ - "Windows $R0 is no longer supported.$\nPlease install Wireshark 1.2 or 1.0 instead." \ - /SD IDOK - Quit - -lbl_winversion_warn_xp: - MessageBox MB_OK \ - "This version of ${PROGRAM_NAME} may not work on Windows $R0.$\nWe recommend Wireshark 1.10 instead." \ - /SD IDOK - ; Don't quit. - -lbl_winversion_supported: ; detect if WinPcap should be installed WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap ${PCAP_DISPLAY_VERSION}" ReadRegStr $WINPCAP_NAME HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName" diff -Nru wireshark-1.12.0+git+4fab41a1/packaging/rpm/SPECS/wireshark.spec.in wireshark-1.12.1+g01b65bf/packaging/rpm/SPECS/wireshark.spec.in --- wireshark-1.12.0+git+4fab41a1/packaging/rpm/SPECS/wireshark.spec.in 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/packaging/rpm/SPECS/wireshark.spec.in 2014-09-16 12:09:03.000000000 -0400 @@ -134,8 +134,8 @@ Requires: hicolor-icon-theme BuildRequires: desktop-file-utils Requires(post): desktop-file-utils -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): /usr/sbin/update-alternatives +Requires(postun): /usr/sbin/update-alternatives %if 0%{?suse_version} # Need this for SuSE's suse_update_desktop_file macro BuildRequires: update-desktop-files @@ -171,8 +171,8 @@ Requires: hicolor-icon-theme BuildRequires: desktop-file-utils Requires(post): desktop-file-utils -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(post): /usr/sbin/update-alternatives +Requires(postun): /usr/sbin/update-alternatives BuildRequires: gcc-c++ %if 0%{?suse_version} # Need this for SuSE's suse_update_desktop_file macro @@ -246,10 +246,16 @@ %clean rm -rf $RPM_BUILD_ROOT -%if %{use_wireshark_group} %pre +%if %{use_wireshark_group} getent group wireshark >/dev/null || groupadd -r wireshark %endif +# If we have a pre-alternatives wireshark binary out there, get rid of it. +# (With 'alternatives' %{_bindir}/wireshark should be a symlink.) +if [ -f %{_bindir}/wireshark ] +then + rm -f %{_bindir}/wireshark +fi %post -p /sbin/ldconfig @@ -260,7 +266,7 @@ update-desktop-database &> /dev/null ||: update-mime-database /usr/share/mime &> /dev/null || : touch --no-create /usr/share/icons/hicolor &>/dev/null || : -%{_sbindir}/update-alternatives --install %{_bindir}/wireshark \ +/usr/sbin/update-alternatives --install %{_bindir}/wireshark \ %{name} %{_bindir}/wireshark-gtk 50 %postun gnome @@ -269,7 +275,7 @@ if [ $1 -eq 0 ] ; then touch --no-create /usr/share/icons/hicolor &>/dev/null || : gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || : - %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/wireshark-gtk + /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-gtk fi %endif @@ -278,7 +284,7 @@ update-desktop-database &> /dev/null ||: update-mime-database /usr/share/mime &> /dev/null || : touch --no-create /usr/share/icons/hicolor &>/dev/null || : -%{_sbindir}/update-alternatives --install %{_bindir}/wireshark \ +/usr/sbin/update-alternatives --install %{_bindir}/wireshark \ %{name} %{_bindir}/wireshark-qt 10 %postun qt @@ -287,7 +293,7 @@ if [ $1 -eq 0 ] ; then touch --no-create /usr/share/icons/hicolor &>/dev/null || : gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || : - %{_sbindir}/update-alternatives --remove %{name} %{_bindir}/wireshark-qt + /usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-qt fi %endif @@ -299,10 +305,8 @@ %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog INSTALL INSTALL.configure NEWS README* -# Don't pick up the wireshark (GUI) binary here -%exclude %{_bindir}/wireshark -%exclude %{_bindir}/wireshark-gtk -%exclude %{_bindir}/wireshark-qt +# Don't pick up any of the wireshark (GUI) binaries here +%exclude %{_bindir}/wireshark* %{_bindir}/* # This generates a warning because dumpcap is listed twice. That's @@ -367,6 +371,20 @@ %endif %changelog +* Mon Aug 4 2014 Jeff Morriss +- Fix RPM builds with a prefix other than /usr: The location of + update-alternatives does not depend on Wireshark's installation prefix: + it's always in /usr/sbin/. + +* Fri Aug 1 2014 Jeff Morriss +- Remove the old wireshark binary during RPM upgrades: this is needed because + we now declare wireshark to be %ghost so it doesn't get overwritten during an + upgrade (but in older RPMs it was the real program). + +* Tue Jul 1 2014 Jeff Morriss +- Get rid of rpath when we're building RPMs: Fedora prohibits it, we don't + need it, and it gets in the way some times. + * Tue Nov 26 2013 Jeff Morriss - Overhaul options handling to pull in the UI choice from ./configure. - Make it possible to not build the GNOME package. @@ -386,14 +404,14 @@ - Use SuSE's desktop-update macro. - Actually update MIME database when Wireshark's prefix is not /usr . -* Thu Mar 6 2013 Jeff Morriss +* Thu Mar 7 2013 Jeff Morriss - List more build dependencies. - Update to work on SuSE too: some of their package names are different. -* Thu Mar 6 2013 Gerald Combs +* Wed Mar 6 2013 Gerald Combs - Enable c-ares by default -* Mon Feb 6 2013 Jeff Morriss +* Thu Feb 7 2013 Jeff Morriss - Overhaul to make this file more useful/up to date. Many changes are based on Fedora's .spec file. Changes include: - Create a separate wireshark-gnome package (like Redhat). @@ -431,7 +449,7 @@ * Tue Aug 03 1999 Gilbert Ramirez - updated to 0.7.0 and changed gtk+ requirement -* Sun Jan 01 1999 Gerald Combs +* Sun Jan 03 1999 Gerald Combs - updated to 0.5.1 * Fri Nov 20 1998 FastJack diff -Nru wireshark-1.12.0+git+4fab41a1/plugins/opcua/opcua.c wireshark-1.12.1+g01b65bf/plugins/opcua/opcua.c --- wireshark-1.12.0+git+4fab41a1/plugins/opcua/opcua.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/plugins/opcua/opcua.c 2014-09-16 12:09:03.000000000 -0400 @@ -123,93 +123,6 @@ -/** plugin entry functions. - * This registers the OpcUa protocol. - */ -void proto_register_opcua(void) -{ - char *tmp; - - static hf_register_info hf[] = - { - {&hf_opcua_fragments, - {"Message fragments", "opcua.fragments", - FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - {&hf_opcua_fragment, - {"Message fragment", "opcua.fragment", - FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - {&hf_opcua_fragment_overlap, - {"Message fragment overlap", "opcua.fragment.overlap", - FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } }, - {&hf_opcua_fragment_overlap_conflicts, - {"Message fragment overlapping with conflicting data", - "opcua.fragment.overlap.conflicts", - FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } }, - {&hf_opcua_fragment_multiple_tails, - {"Message has multiple tail fragments", - "opcua.fragment.multiple_tails", - FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } }, - {&hf_opcua_fragment_too_long_fragment, - {"Message fragment too long", "opcua.fragment.too_long_fragment", - FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } }, - {&hf_opcua_fragment_error, - {"Message defragmentation error", "opcua.fragment.error", - FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - {&hf_opcua_fragment_count, - {"Message fragment count", "opcua.fragment.count", - FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, - {&hf_opcua_reassembled_in, - {"Reassembled in", "opcua.reassembled.in", - FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - {&hf_opcua_reassembled_length, - {"Reassembled length", "opcua.reassembled.length", - FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } } - }; - - /** Setup protocol subtree array */ - static gint *ett[] = - { - &ett_opcua_extensionobject, - &ett_opcua_nodeid, - &ett_opcua_transport, - &ett_opcua_fragment, - &ett_opcua_fragments - }; - - module_t *opcua_module; - - proto_opcua = proto_register_protocol( - "OpcUa Binary Protocol", /* name */ - "OpcUa", /* short name */ - "opcua" /* abbrev */ - ); - - registerTransportLayerTypes(proto_opcua); - registerSecurityLayerTypes(proto_opcua); - registerApplicationLayerTypes(proto_opcua); - registerSimpleTypes(proto_opcua); - registerEnumTypes(proto_opcua); - registerComplexTypes(); - registerServiceTypes(); - registerFieldTypes(proto_opcua); - - proto_register_subtree_array(ett, array_length(ett)); - - tmp = g_strdup_printf("%d", OPCUA_PORT); - range_convert_str(&global_tcp_ports_opcua, tmp, 65535); - g_free(tmp); - - reassembly_table_init(&opcua_reassembly_table, - &addresses_reassembly_table_functions); - proto_register_field_array(proto_opcua, hf, array_length(hf)); - - /* register user preferences */ - opcua_module = prefs_register_protocol(proto_opcua, proto_reg_handoff_opcua); - prefs_register_range_preference(opcua_module, "tcp_ports", - "OPC UA TCP Ports", - "The TCP ports for the OPC UA TCP Binary Protocol", - &global_tcp_ports_opcua, 65535); -} /** header length that is needed to compute * the pdu length. @@ -362,7 +275,7 @@ opcua_seqid, /* ID for fragments belonging together */ NULL, opcua_seqnum, /* fragment sequence number */ - tvb_length_remaining(tvb, offset), /* fragment length - to the end */ + tvb_captured_length_remaining(tvb, offset), /* fragment length - to the end */ bMoreFragments); /* More fragments? */ new_tvb = process_reassembled_data(tvb, @@ -439,7 +352,7 @@ } } - return tvb_length(tvb); + return tvb_reported_length(tvb); } /** The main OpcUa dissector functions. @@ -450,7 +363,7 @@ { tcp_dissect_pdus(tvb, pinfo, tree, TRUE, FRAME_HEADER_LEN, get_opcua_message_len, dissect_opcua_message, data); - return tvb_length(tvb); + return tvb_reported_length(tvb); } static void register_tcp_port(guint32 port) @@ -465,6 +378,102 @@ dissector_delete_uint("tcp.port", port, opcua_handle); } +static void +init_opcua(void) +{ + reassembly_table_init(&opcua_reassembly_table, + &addresses_reassembly_table_functions); +} + +/** plugin entry functions. + * This registers the OpcUa protocol. + */ +void proto_register_opcua(void) +{ + char *tmp; + + static hf_register_info hf[] = + { + {&hf_opcua_fragments, + {"Message fragments", "opcua.fragments", + FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + {&hf_opcua_fragment, + {"Message fragment", "opcua.fragment", + FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + {&hf_opcua_fragment_overlap, + {"Message fragment overlap", "opcua.fragment.overlap", + FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } }, + {&hf_opcua_fragment_overlap_conflicts, + {"Message fragment overlapping with conflicting data", + "opcua.fragment.overlap.conflicts", + FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } }, + {&hf_opcua_fragment_multiple_tails, + {"Message has multiple tail fragments", + "opcua.fragment.multiple_tails", + FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } }, + {&hf_opcua_fragment_too_long_fragment, + {"Message fragment too long", "opcua.fragment.too_long_fragment", + FT_BOOLEAN, 0, NULL, 0x00, NULL, HFILL } }, + {&hf_opcua_fragment_error, + {"Message defragmentation error", "opcua.fragment.error", + FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + {&hf_opcua_fragment_count, + {"Message fragment count", "opcua.fragment.count", + FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, + {&hf_opcua_reassembled_in, + {"Reassembled in", "opcua.reassembled.in", + FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, + {&hf_opcua_reassembled_length, + {"Reassembled length", "opcua.reassembled.length", + FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } } + }; + + /** Setup protocol subtree array */ + static gint *ett[] = + { + &ett_opcua_extensionobject, + &ett_opcua_nodeid, + &ett_opcua_transport, + &ett_opcua_fragment, + &ett_opcua_fragments + }; + + module_t *opcua_module; + + proto_opcua = proto_register_protocol( + "OpcUa Binary Protocol", /* name */ + "OpcUa", /* short name */ + "opcua" /* abbrev */ + ); + + registerTransportLayerTypes(proto_opcua); + registerSecurityLayerTypes(proto_opcua); + registerApplicationLayerTypes(proto_opcua); + registerSimpleTypes(proto_opcua); + registerEnumTypes(proto_opcua); + registerComplexTypes(); + registerServiceTypes(); + registerFieldTypes(proto_opcua); + + proto_register_subtree_array(ett, array_length(ett)); + + tmp = g_strdup_printf("%d", OPCUA_PORT); + range_convert_str(&global_tcp_ports_opcua, tmp, 65535); + g_free(tmp); + + proto_register_field_array(proto_opcua, hf, array_length(hf)); + + register_init_routine(&init_opcua); + + /* register user preferences */ + opcua_module = prefs_register_protocol(proto_opcua, proto_reg_handoff_opcua); + prefs_register_range_preference(opcua_module, "tcp_ports", + "OPC UA TCP Ports", + "The TCP ports for the OPC UA TCP Binary Protocol", + &global_tcp_ports_opcua, 65535); + +} + void proto_reg_handoff_opcua(void) { static gboolean opcua_initialized = FALSE; diff -Nru wireshark-1.12.0+git+4fab41a1/services wireshark-1.12.1+g01b65bf/services --- wireshark-1.12.0+git+4fab41a1/services 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/services 2014-09-16 12:09:03.000000000 -0400 @@ -2846,6 +2846,7 @@ h323gatestat 1719/udp # H.323 Unicast Gatekeeper Signaling [ITU-T] [ITU-T_TSB] 2013-01-31 h323hostcall 1720/tcp # H.323 Call Control Signalling [ITU-T] [ITU-T_TSB] 2013-01-31 h323hostcall 1720/udp # H.323 Call Control Signalling [ITU-T] [ITU-T_TSB] 2013-01-31 +h323hostcall 1720/sctp # H.323 Call Control [ITU-T] 2014-07-30 caicci 1721/tcp # caicci [Sylvia_Scheuren] [Sylvia_Scheuren] caicci 1721/udp # caicci [Sylvia_Scheuren] [Sylvia_Scheuren] hks-lm 1722/tcp # HKS License Manager [Michael_Wood] [Michael_Wood] @@ -3571,7 +3572,7 @@ infowave 2082/tcp # Infowave Mobility Server [Kaz_Kylheku] [Kaz_Kylheku] infowave 2082/udp # Infowave Mobility Server [Kaz_Kylheku] [Kaz_Kylheku] radsec 2083/tcp # Secure Radius Service [IESG] [IETF_Chair] 2005-05 [RFC6614] The TCP port 2083 was already previously assigned by IANA for "RadSec", an early implementation of RADIUS/TLS, prior to issuance of this RFC. This early implementation can be configured to be compatible to RADIUS/TLS as specified by the IETF. See [RFC6614], Appendix A for details. -radsec 2083/udp # Secure Radius Service [IESG] [IETF_Chair] 2005-05 2014-07-14 [RFC-ietf-radext-dtls-13] The UDP port 2083 was already previously assigned by IANA for "RadSec", an early implementation of RADIUS/TLS, prior to issuance of this RFC. +radsec 2083/udp # Secure Radius Service [IESG] [IETF_Chair] 2005-05 2014-07-14 [RFC7360] The UDP port 2083 was already previously assigned by IANA for "RadSec", an early implementation of RADIUS/TLS, prior to issuance of this RFC. sunclustergeo 2084/tcp # SunCluster Geographic [Oracle_2] [Steve_McKinty] 2005-11 2013-08-14 sunclustergeo 2084/udp # SunCluster Geographic [Oracle_2] [Steve_McKinty] 2005-11 2013-08-14 ada-cip 2085/tcp # ADA Control [Eugene_Frenkel] [Eugene_Frenkel] 2005-11 @@ -6295,8 +6296,8 @@ asam 3451/udp # ASAM Services [Mike_Gossett] [Mike_Gossett] 2002-04 sabp-signal 3452/tcp # SABP-Signalling Protocol [Brendan_McWilliams] [Brendan_McWilliams] 2002-04 sabp-signal 3452/udp # SABP-Signalling Protocol [Brendan_McWilliams] [Brendan_McWilliams] 2002-04 -pscupd 3453/tcp # PSC Update Port [Reid_B_Ligon] [Reid_B_Ligon] -pscupd 3453/udp # PSC Update Port [Reid_B_Ligon] [Reid_B_Ligon] +pscupd 3453/tcp # PSC Update [Datalogic_ADC_Inc] [Reid_B_Ligon] 2001-11-10 2014-07-31 +pscupd 3453/udp # PSC Update [Datalogic_ADC_Inc] [Reid_B_Ligon] 2001-11-10 2014-07-31 mira 3454/tcp # Apple Remote Access Protocol [Mike_Alexander] [Mike_Alexander] mira 3454/udp # Apple Remote Access Protocol [Mike_Alexander] [Mike_Alexander] prsvp 3455/tcp # RSVP Port [Bob_Braden] [Bob_Braden] @@ -7066,8 +7067,7 @@ amx-rms 3839/udp # AMX Resource Management Suite [Ron_Barber] [Ron_Barber] 2003-11 flirtmitmir 3840/tcp # www.FlirtMitMir.de [Carsten_Falticska] [Carsten_Falticska] 2003-11 flirtmitmir 3840/udp # www.FlirtMitMir.de [Carsten_Falticska] [Carsten_Falticska] 2003-11 -zfirm-shiprush3 3841/tcp # Z-Firm ShipRush v3 [Rafael_Zimberoff] [Rafael_Zimberoff] 2003-11 -zfirm-shiprush3 3841/udp # Z-Firm ShipRush v3 [Rafael_Zimberoff] [Rafael_Zimberoff] 2003-11 +shiprush-db-svr 3841/tcp # ShipRush Database Server [Z-Firm_LLC] [Rafael_Zimberoff] 2003-11 2014-08-22 nhci 3842/tcp # NHCI status port [Eric_Welch_2] [Eric_Welch_2] 2003-11 nhci 3842/udp # NHCI status port [Eric_Welch_2] [Eric_Welch_2] 2003-11 quest-agent 3843/tcp # Quest Common Agent [Peter_Maher] [Peter_Maher] 2003-11 @@ -8056,7 +8056,8 @@ piranha2 4601/udp # Piranha2 [Primark_Corporation] [Primark_Corporation] mtsserver 4602/tcp # EAX MTS Server [Pedro_A_Rodriguez] [Pedro_A_Rodriguez] 2008-08-06 menandmice-upg 4603/tcp # Men & Mice Upgrade Agent [Eggert_Thorlacius_2] [Eggert_Thorlacius_2] 2010-01-27 -irp 4604/tcp # Identity Registration Protocol [Sixscape_Communications_Ltd] [Lawrence_E._Hughes] 2014-03-17 +irp 4604/tcp # Identity Registration Protocol [Sixscape_Communications_Pte_Ltd] [Lawrence_E._Hughes] 2014-03-17 2014-08-26 +sixchat 4605/tcp # Direct End to End Secure Chat Protocol [Sixscape_Communications_Pte_Ltd] [Lawrence_E._Hughes] 2014-09-11 playsta2-app 4658/tcp # PlayStation2 App Port playsta2-app 4658/udp # PlayStation2 App Port playsta2-lob 4659/tcp # PlayStation2 Lobby Port [Noam_Rimon] [Noam_Rimon] 2004-12 @@ -8185,7 +8186,8 @@ smart-install 4786/tcp # Smart Install Service [Amit_Nigam] [Amit_Nigam] 2009-08-24 sia-ctrl-plane 4787/tcp # Service Insertion Architecture (SIA) Control-Plane [Shree_Murthy] [Shree_Murthy] 2009-10-29 xmcp 4788/tcp # eXtensible Messaging Client Protocol [Cisco] [Glenn_Matthews] 2011-05-23 2011-10-25 Defined TXT keys: txtvers=1 (as described in the draft) protovers=(examples: "protovers=1.0" "protovers=1.1,2.0" -vxlan 4789/udp # Virtual eXtensible Local Area Network (VXLAN) [Lawrence_Kreeger] [Lawrence_Kreeger] 2013-04-19 2014-06-17 [RFC-mahalingam-dutt-dcops-vxlan-09] +vxlan 4789/udp # Virtual eXtensible Local Area Network (VXLAN) [Lawrence_Kreeger] [Lawrence_Kreeger] 2013-04-19 2014-06-17 [RFC7348] +vxlan-gpe 4790/udp # Generic Protocol Extension for Virtual eXtensible Local Area Network (VXLAN) [Lawrence_Kreeger] [Lawrence_Kreeger] 2014-08-26 iims 4800/tcp # Icona Instant Messenging System iims 4800/udp # Icona Instant Messenging System iwec 4801/tcp # Icona Web Embedded Chat @@ -8543,6 +8545,9 @@ perfd 5227/tcp # HP System Performance Metric Service [Chris_Bertin] [Chris_Bertin] 2009-05-19 perfd 5227/udp # HP System Performance Metric Service [Chris_Bertin] [Chris_Bertin] 2009-05-19 hpvroom 5228/tcp # HP Virtual Room Service [Scott_Levin] [Scott_Levin] 2009-03-19 +jaxflow 5229/tcp # Netflow/IPFIX/sFlow Collector and Forwarder Management [JaxMP] [Stephen_Hull] 2014-08-15 +jaxflow-data 5230/tcp # JaxMP RealFlow application and protocol data [JaxMP] [Stephen_Hull] 2014-08-15 +crusecontrol 5231/tcp # Remote Control of Scan Software for Cruse Scanners [Cruse_Spezialmaschinen_GmbH] [Christof_J._Reetz_2] 2014-08-15 csedaemon 5232/tcp # Cruse Scanning System Service [Christof_J_Reetz] [Christof_J_Reetz] 2011-03-09 enfs 5233/tcp # Etinnae Network File Service [Chris_Peel] [Chris_Peel] 2011-03-09 eenet 5234/tcp # EEnet communications [Helmut_Giritzer] [Helmut_Giritzer] 2005-11 @@ -8627,9 +8632,9 @@ xkotodrcp 5344/tcp # xkoto DRCP [Jeff_Heisz] [Jeff_Heisz] 2006-02 xkotodrcp 5344/udp # xkoto DRCP [Jeff_Heisz] [Jeff_Heisz] 2006-02 stuns 5349/tcp # STUN over TLS [RFC5389] -stuns 5349/udp # STUN over DTLS [IESG] [IETF_Chair] 2014-07-03 [RFC-ietf-tram-stun-dtls-05] This service name was initially created by [RFC5389]. +stuns 5349/udp # STUN over DTLS [IESG] [IETF_Chair] 2014-07-03 [RFC7350] This service name was initially created by [RFC5389]. turns 5349/tcp # TURN over TLS [RFC5766] -turns 5349/udp # TURN over DTLS [IESG] [IETF_Chair] 2014-07-03 [RFC-ietf-tram-stun-dtls-05] This service name was initially created by [RFC5766]. +turns 5349/udp # TURN over DTLS [IESG] [IETF_Chair] 2014-07-03 [RFC7350] This service name was initially created by [RFC5766]. stun-behaviors 5349/tcp # STUN Behavior Discovery over TLS [RFC5780] stun-behaviors 5349/udp # Reserved for a future enhancement of STUN-BEHAVIOR [RFC5780] pcp-multicast 5350/udp # Port Control Protocol Multicast [IESG] [IETF_Chair] [RFC6887] @@ -8808,6 +8813,7 @@ bis-web 5584/udp # BeInSync-Web [Adi_Ruppin] [Adi_Ruppin] 2005-08 bis-sync 5585/tcp # BeInSync-sync [Adi_Ruppin] [Adi_Ruppin] 2005-08 bis-sync 5585/udp # BeInSync-sync [Adi_Ruppin] [Adi_Ruppin] 2005-08 +att-mt-sms 5586/tcp # Planning to send mobile terminated SMS to the specific port so that the SMS is not visible to the client [ATT] [Dhillesh_Sigilipelli] 2014-08-21 ininmessaging 5597/tcp # inin secure messaging [Mike_Gagle_2] [Mike_Gagle_2] 2006-05 ininmessaging 5597/udp # inin secure messaging [Mike_Gagle_2] [Mike_Gagle_2] 2006-05 mctfeed 5598/tcp # MCT Market Data Feed [Stephane_Touizer] [Stephane_Touizer] 2006-05 @@ -8878,6 +8884,7 @@ brightcore 5682/udp # BrightCore control & data transfer exchange [Marko_Bjelac] [Marko_Bjelac] 2010-06-10 coap 5683/udp # Constrained Application Protocol [IESG] [IETF_Chair] 2011-06-13 2013-07-25 [RFC7252] coaps 5684/udp # DTLS-secured CoAP [IESG] [IETF_Chair] 2013-07-25 [RFC7252] +gog-multiplayer 5687/udp # GOG RakNet Game protocol on Galaxy service [GOG.com] [Michal_Gruchala] 2014-07-31 ggz 5688/tcp # GGZ Gaming Zone [Josef_Spillner] [Josef_Spillner] 2003-01 ggz 5688/udp # GGZ Gaming Zone [Josef_Spillner] [Josef_Spillner] 2003-01 qmvideo 5689/tcp # QM video network management protocol [Jamie_Lokier] [Jamie_Lokier] 2006-05 @@ -8972,6 +8979,7 @@ icmpd 5813/udp # ICMPD [Shane_O_Donnell] [Shane_O_Donnell] spt-automation 5814/tcp # Support Automation [Joshua_Hawkins] [Joshua_Hawkins] 2003-11 spt-automation 5814/udp # Support Automation [Joshua_Hawkins] [Joshua_Hawkins] 2003-11 +shiprush-d-ch 5841/tcp # Z-firm ShipRush interface for web access and bidirectional data [Z-Firm_LLC] [Rafael_Zimberoff] 2014-08-22 reversion 5842/tcp # Reversion Backup/Restore [Cameo_Systems_Inc] [Craig_Nelson] 2011-09-26 wherehoo 5859/tcp # WHEREHOO [Jim_Youll] [Jim_Youll] wherehoo 5859/udp # WHEREHOO [Jim_Youll] [Jim_Youll] @@ -9370,7 +9378,7 @@ tsa 6689/tcp # Tofino Security Appliance [Scott_Howard] [Scott_Howard] 2009-10-13 tsa 6689/udp # Tofino Security Appliance [Scott_Howard] [Scott_Howard] 2009-10-13 babel 6696/udp # Babel Routing Protocol 2011-08-15 [RFC6126] -ircs-u 6697/tcp # Internet Relay Chat via TLS/SSL 2014-02-11 [RFC-hartmann-default-port-for-irc-via-tls-ssl-09] +ircs-u 6697/tcp # Internet Relay Chat via TLS/SSL 2014-02-11 [RFC7194] kti-icad-srvr 6701/tcp # KTI/ICAD Nameserver [Stanley_Knutson] [Stanley_Knutson] kti-icad-srvr 6701/udp # KTI/ICAD Nameserver [Stanley_Knutson] [Stanley_Knutson] e-design-net 6702/tcp # e-Design network [Janos_Lerch] [Janos_Lerch] 2006-02 @@ -9450,6 +9458,7 @@ swispol 6966/udp # swispol [Yutaka_Ono] [Yutaka_Ono] acmsoda 6969/tcp # acmsoda [Daniel_Simms] [Daniel_Simms] acmsoda 6969/udp # acmsoda [Daniel_Simms] [Daniel_Simms] +conductor-mpx 6970/sctp # conductor for multiplex [George_Neville-Neil] [George_Neville-Neil] 2014-07-29 MobilitySrv 6997/tcp # Mobility XE Protocol [Joseph_T_Savarese] [Joseph_T_Savarese] 2007-06 MobilitySrv 6997/udp # Mobility XE Protocol [Joseph_T_Savarese] [Joseph_T_Savarese] 2007-06 iatp-highpri 6998/tcp # IATP-highPri [John_Murphy] [John_Murphy] @@ -10460,6 +10469,7 @@ documentum_s 10003/udp # EMC-Documentum Content Server Product [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 This entry is an alias to "documentum-s".This entry is now historic, not usable for use with manycommon service discovery mechanisms. emcrmirccd 10004/tcp # EMC Replication Manager Client [Robert_Boudrie] [Robert_Boudrie] 2008-06-09 emcrmird 10005/tcp # EMC Replication Manager Server [Robert_Boudrie] [Robert_Boudrie] 2008-06-09 +netapp-sync 10006/tcp # Sync replication protocol among different NetApp platforms [NetApp_2] [Paul_Mu] 2014-08-07 mvs-capacity 10007/tcp # MVS Capacity [Donna_Dillenberger] [Donna_Dillenberger] mvs-capacity 10007/udp # MVS Capacity [Donna_Dillenberger] [Donna_Dillenberger] octopus 10008/tcp # Octopus Multiplexer [Chris_Koeritz_2] [Chris_Koeritz_2] 2002-10 @@ -11035,6 +11045,8 @@ tonidods 24465/udp # Tonido Domain Server [Madhan_Kanagavel] [Madhan_Kanagavel] 2008-07-18 binkp 24554/tcp # BINKP [Max_Masyutin] [Max_Masyutin] binkp 24554/udp # BINKP [Max_Masyutin] [Max_Masyutin] +bilobit 24577/tcp # bilobit Service [bilobit_GmbH] [Martin_Schmuker] 2014-08-15 +bilobit-update 24577/udp # bilobit Service Update [bilobit_GmbH] [Martin_Schmuker] 2014-08-15 canditv 24676/tcp # Canditv Message Service [Gary_Aston] [Gary_Aston] 2009-03-10 canditv 24676/udp # Canditv Message Service [Gary_Aston] [Gary_Aston] 2009-03-10 flashfiler 24677/tcp # FlashFiler [Ben_Oram] [Ben_Oram] diff -Nru wireshark-1.12.0+git+4fab41a1/tshark.c wireshark-1.12.1+g01b65bf/tshark.c --- wireshark-1.12.0+git+4fab41a1/tshark.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/tshark.c 2014-09-16 12:09:03.000000000 -0400 @@ -325,7 +325,7 @@ #endif /*fprintf(output, "\n");*/ fprintf(output, "Input file:\n"); - fprintf(output, " -r set the filename to read from (no stdin!)\n"); + fprintf(output, " -r set the filename to read from (- to read from stdin)\n"); fprintf(output, "\n"); fprintf(output, "Processing:\n"); diff -Nru wireshark-1.12.0+git+4fab41a1/ui/decode_as_utils.c wireshark-1.12.1+g01b65bf/ui/decode_as_utils.c --- wireshark-1.12.0+git+4fab41a1/ui/decode_as_utils.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/ui/decode_as_utils.c 2014-09-16 12:09:03.000000000 -0400 @@ -133,8 +133,19 @@ if (IS_FT_STRING(selector_type)) { dissector_change_string(values[0], values[1], lookup.handle); } else { - dissector_change_uint(values[0], atoi(values[1]), lookup.handle); + char *p; + long long_value; + + long_value = strtol(values[1], &p, 0); + if (p == values[0] || *p != '\0' || long_value < 0 || + (unsigned long)long_value > UINT_MAX) { + retval = PREFS_SET_SYNTAX_ERR; + is_valid = FALSE; + } else + dissector_change_uint(values[0], (guint)long_value, lookup.handle); } + } + if (is_valid) { decode_build_reset_list(g_strdup(values[0]), selector_type, g_strdup(values[1]), NULL, NULL); } diff -Nru wireshark-1.12.0+git+4fab41a1/ui/gtk/rtp_player.c wireshark-1.12.1+g01b65bf/ui/gtk/rtp_player.c --- wireshark-1.12.0+git+4fab41a1/ui/gtk/rtp_player.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/ui/gtk/rtp_player.c 2014-09-16 12:09:03.000000000 -0400 @@ -829,6 +829,23 @@ g_hash_table_destroy(decoders_hash); } +#if !PORTAUDIO_API_1 +/* returns monotonically increasing clock in seconds */ +static PaTime +getMonoTime(PaStream *stream _U_) +{ +#if GLIB_CHECK_VERSION(2, 28, 0) + return g_get_monotonic_time() * 1e-6; +#else + /* TODO: this is broken for sure, but maybe such old glibs do not even + * use pulseaudio so we do not have to care? */ + return Pa_GetStreamTime(stream); +#endif +} + +static PaTime (*getCurrentTime)(PaStream *stream); +#endif + /****************************************************************************/ static gint h_scrollbar_changed(GtkWidget *widget _U_, gpointer user_data) @@ -915,7 +932,14 @@ #if PORTAUDIO_API_1 idx = Pa_StreamTime( pa_stream ) - rtp_channels->pause_duration - rtp_channels->out_diff_time - start_index; #else /* PORTAUDIO_API_1 */ - idx = ((guint32)(sample_rate) * (Pa_GetStreamTime(pa_stream)-rtp_channels->pa_start_time))- rtp_channels->pause_duration - rtp_channels->out_diff_time - start_index; + /* frames since start button was pressed minus latency, from time */ + idx = (guint32) sample_rate + * (getCurrentTime(pa_stream) - rtp_channels->pa_start_time + - rtp_channels->out_diff_time); + /* frames spent in pause state or seek correction */ + idx -= rtp_channels->pause_duration; + /* frame where the bar starts getting drawn */ + idx -= start_index; #endif /* PORTAUDIO_API_1 */ @@ -1121,12 +1145,12 @@ static int paCallback( void *inputBuffer _U_, void *outputBuffer, unsigned long framesPerBuffer, - PaTimestamp outTime _U_, void *userData) + PaTimestamp outTime, void *userData) { #else /* PORTAUDIO_API_1 */ static int paCallback( const void *inputBuffer _U_, void *outputBuffer, unsigned long framesPerBuffer, - const PaStreamCallbackTimeInfo* outTime _U_, + const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags _U_, void *userData) { @@ -1150,9 +1174,9 @@ } #if PORTAUDIO_API_1 - rpci->out_diff_time = outTime - Pa_StreamTime(pa_stream) ; + rpci->out_diff_time = outTime - Pa_StreamTime(pa_stream); #else /* PORTAUDIO_API_1 */ - rpci->out_diff_time = (guint32)(sample_rate) * (outTime->outputBufferDacTime - Pa_GetStreamTime(pa_stream)) ; + rpci->out_diff_time = outTime->outputBufferDacTime - outTime->currentTime; #endif /* PORTAUDIO_API_1 */ @@ -2038,6 +2062,16 @@ } #if !PORTAUDIO_API_1 rtp_channels->pa_start_time = Pa_GetStreamTime(pa_stream); + if (rtp_channels->pa_start_time == 0) { + /* PortAudio has a broken Pa_GetStreamTime + * implementation for ALSA on top of PulseAudio. + * https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10307 + */ + getCurrentTime = getMonoTime; + rtp_channels->pa_start_time = getCurrentTime(pa_stream); + } else { + getCurrentTime = Pa_GetStreamTime; + } #endif /* PORTAUDIO_API_1 */ rtp_channels->stop = FALSE; @@ -2527,3 +2561,16 @@ } #endif /* HAVE_LIBPORTAUDIO */ + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=4 tabstop=8 noexpandtab: + * :indentSize=4:tabSize=8:noTabs=false: + */ diff -Nru wireshark-1.12.0+git+4fab41a1/ui/gtk/uat_gui.c wireshark-1.12.1+g01b65bf/ui/gtk/uat_gui.c --- wireshark-1.12.0+git+4fab41a1/ui/gtk/uat_gui.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/ui/gtk/uat_gui.c 2014-09-16 12:09:03.000000000 -0400 @@ -503,6 +503,7 @@ for ( colnum = 0; colnum < uat->ncols; colnum++ ) { GtkWidget *entry, *label, *event_box; char *text = fld_tostr(dd->rec, &(f[colnum])); + gchar *fc_filename; event_box = gtk_event_box_new(); @@ -522,6 +523,17 @@ if (! dd->is_new || copy) { gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(entry), text); } + + /* + * Some versions of GTK+ will crash if fc_filename is NULL. + * Make sure we have a valid location set. + */ + fc_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(entry)); + if (!fc_filename) { + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(entry), get_datafile_dir()); + } + g_free(fc_filename); + g_ptr_array_add(dd->entries, entry); ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), entry, 1, colnum, 1, 1); break; diff -Nru wireshark-1.12.0+git+4fab41a1/ui/qt/font_color_preferences_frame.cpp wireshark-1.12.1+g01b65bf/ui/qt/font_color_preferences_frame.cpp --- wireshark-1.12.0+git+4fab41a1/ui/qt/font_color_preferences_frame.cpp 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/ui/qt/font_color_preferences_frame.cpp 2014-09-16 12:09:03.000000000 -0400 @@ -81,9 +81,15 @@ { int margin = style()->pixelMetric(QStyle::PM_LayoutLeftMargin); +#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0) ui->fontPushButton->setText( - cur_font_.family() + " "/* + cur_font_.styleName() + " "*/ + + cur_font_.family() + " " + QString::number(cur_font_.pointSizeF(), 'f', 1)); +#else + ui->fontPushButton->setText( + cur_font_.family() + " " + cur_font_.styleName() + " " + + QString::number(cur_font_.pointSizeF(), 'f', 1)); +#endif ui->fontSampleLineEdit->setFont(cur_font_); QString line_edit_ss = QString("QLineEdit { margin-left: %1px; }").arg(margin); diff -Nru wireshark-1.12.0+git+4fab41a1/ui/qt/qt_ui_utils.cpp wireshark-1.12.1+g01b65bf/ui/qt/qt_ui_utils.cpp --- wireshark-1.12.0+git+4fab41a1/ui/qt/qt_ui_utils.cpp 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/ui/qt/qt_ui_utils.cpp 2014-09-16 12:09:03.000000000 -0400 @@ -55,7 +55,11 @@ void smooth_font_size(QFont &font) { QFontDatabase fdb; +#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0) + QList size_list = fdb.smoothSizes(font.family(), ""); +#else QList size_list = fdb.smoothSizes(font.family(), font.styleName()); +#endif if (size_list.size() < 2) return; diff -Nru wireshark-1.12.0+git+4fab41a1/wiretap/file_access.c wireshark-1.12.1+g01b65bf/wiretap/file_access.c --- wireshark-1.12.0+git+4fab41a1/wiretap/file_access.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/wiretap/file_access.c 2014-09-16 12:09:03.000000000 -0400 @@ -360,7 +360,7 @@ { "Cosine", OPEN_INFO_HEURISTIC, cosine_open, "txt", NULL, NULL }, { "Hcidump", OPEN_INFO_HEURISTIC, hcidump_open, NULL, NULL, NULL }, { "Commview", OPEN_INFO_HEURISTIC, commview_open, "ncf", NULL, NULL }, - { "Nstrace", OPEN_INFO_HEURISTIC, nstrace_open, "txt", NULL, NULL }, + { "Nstrace", OPEN_INFO_HEURISTIC, nstrace_open, "cap", NULL, NULL }, { "Logcat ", OPEN_INFO_HEURISTIC, logcat_open, "logcat", NULL, NULL }, /* ASCII trace files from Telnet sessions. */ { "Ascend", OPEN_INFO_HEURISTIC, ascend_open, "txt", NULL, NULL }, diff -Nru wireshark-1.12.0+git+4fab41a1/wiretap/Makefile.am wireshark-1.12.1+g01b65bf/wiretap/Makefile.am --- wireshark-1.12.0+git+4fab41a1/wiretap/Makefile.am 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/wiretap/Makefile.am 2014-09-16 12:09:03.000000000 -0400 @@ -28,7 +28,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 4:0:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 4:1:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL diff -Nru wireshark-1.12.0+git+4fab41a1/wiretap/netscaler.c wireshark-1.12.1+g01b65bf/wiretap/netscaler.c --- wireshark-1.12.0+git+4fab41a1/wiretap/netscaler.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/wiretap/netscaler.c 2014-09-16 12:09:03.000000000 -0400 @@ -701,8 +701,7 @@ break; default: - *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("nstrace: file type %d unsupported", wth->file_type_subtype); + /* No known signature found, assume it's not NetScaler */ g_free(nstrace_buf); return 0; } @@ -801,10 +800,12 @@ nspm_signature_func(30) /* -** Check signature and return the version number of the signature. -** If not found, it returns 0. At the time of return from this function -** we might not be at the first page. So after a call to this function, there -** has to be a file seek to return to the start of the first page. +** Check signature and return the file type and subtype for files with +** that signature. If it finds no signature that it recognizes, it +** returns WTAP_FILE_TYPE_SUBTYPE_UNKNOWN. At the time of return from +** this function we might not be at the first page. So after a call to +** this function, there has to be a file seek to return to the start +** of the first page. */ static guint32 nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len) @@ -839,7 +840,7 @@ } } - return 0; /* no version found */ + return WTAP_FILE_TYPE_SUBTYPE_UNKNOWN; /* no version found */ } #define nspr_getv10recordtype(hdp) (pletoh16(&(hdp)->nsprRecordType)) diff -Nru wireshark-1.12.0+git+4fab41a1/wiretap/ngsniffer.c wireshark-1.12.1+g01b65bf/wiretap/ngsniffer.c --- wireshark-1.12.0+git+4fab41a1/wiretap/ngsniffer.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/wiretap/ngsniffer.c 2014-09-16 12:09:03.000000000 -0400 @@ -2242,7 +2242,8 @@ } bit_mask = 0; /* don't have any bits yet */ - while (1) + /* Process until we've consumed all the input */ + while (pin < pin_end) { /* Shift down the bit mask we use to see whats encoded */ bit_mask = bit_mask >> 1; @@ -2250,20 +2251,30 @@ /* If there are no bits left, time to get another 16 bits */ if ( 0 == bit_mask ) { - bit_mask = 0x8000; /* start with the high bit */ - bit_value = pletoh16(pin); /* get the next 16 bits */ - pin += 2; /* skip over what we just grabbed */ - if ( pin >= pin_end ) + /* make sure there are at least *three* bytes + available - the two bytes of the bit value, + plus one byte after it */ + if ( pin + 2 >= pin_end ) { - *err = WTAP_ERR_UNC_TRUNCATED; /* data was oddly truncated */ + *err = WTAP_ERR_UNC_TRUNCATED; return ( -1 ); } + bit_mask = 0x8000; /* start with the high bit */ + bit_value = pletoh16(pin); /* get the next 16 bits */ + pin += 2; /* skip over what we just grabbed */ } /* Use the bits in bit_value to see what's encoded and what is raw data */ if ( !(bit_mask & bit_value) ) { /* bit not set - raw byte we just copy */ + + /* If length would put us past end of output, avoid overflow */ + if ( pout + 1 > pout_end ) + { + *err = WTAP_ERR_UNC_OVERFLOW; + return ( -1 ); + } *(pout++) = *(pin++); } else @@ -2358,6 +2369,12 @@ *err = WTAP_ERR_UNC_OVERFLOW; return ( -1 ); } + /* Check if offset would cause us to copy on top of ourselves */ + if ( pout - offset + length > pout ) + { + *err = WTAP_ERR_UNC_BAD_OFFSET; + return ( -1 ); + } /* Copy the string from previous text to output position, advance output pointer */ @@ -2387,6 +2404,12 @@ *err = WTAP_ERR_UNC_OVERFLOW; return ( -1 ); } + /* Check if offset would cause us to copy on top of ourselves */ + if ( pout - offset + length > pout ) + { + *err = WTAP_ERR_UNC_BAD_OFFSET; + return ( -1 ); + } /* Copy the string from previous text to output position, advance output pointer */ @@ -2395,10 +2418,6 @@ break; } } - - /* If we've consumed all the input, we are done */ - if ( pin >= pin_end ) - break; } return (int) ( pout - outbuf ); /* return length of expanded text */ diff -Nru wireshark-1.12.0+git+4fab41a1/wka.tmpl wireshark-1.12.1+g01b65bf/wka.tmpl --- wireshark-1.12.0+git+4fab41a1/wka.tmpl 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/wka.tmpl 2014-09-16 12:09:03.000000000 -0400 @@ -88,10 +88,21 @@ 01-80-C2-00-00-10 Bridge-Management 01-80-C2-00-00-11 Load-Server 01-80-C2-00-00-12 Loadable-Device +01-80-C2-00-00-13 IEEE-1905.1-Control 01-80-C2-00-00-14 ISIS-all-level-1-IS's 01-80-C2-00-00-15 ISIS-all-level-2-IS's +01-80-C2-00-00-18 IEEE-802.1B-All-Manager-Stations +01-80-C2-00-00-19 IEEE-802.11aa-groupcast-with-retries +01-80-C2-00-00-1A IEEE-802.1B-All-Agent-Stations +01-80-C2-00-00-1B ESIS-all-multicast-capable-ES's +01-80-C2-00-00-1C ESIS-all-multicast-announcements +01-80-C2-00-00-1D ESIS-all-multicast-capable-IS's +01-80-C2-00-00-1E Token-Ring-all-DTR-Concentrators 01-80-C2-00-00-30/45 OAM-Multicast-DA-Class-1 01-80-C2-00-00-38/45 OAM-Multicast-DA-Class-2 +01-80-C2-00-00-40 All-RBridges +01-80-C2-00-00-41 All-IS-IS-RBridges +01-80-C2-00-00-42 All-ESADI-RBridges 01-80-C2-00-01-00 FDDI-RMT-Directed-Beacon 01-80-C2-00-01-10 FDDI-status-report-frame 01-DD-00-FF-FF-FF Ungermann-Bass-boot-me-requests diff -Nru wireshark-1.12.0+git+4fab41a1/wsutil/str_util.c wireshark-1.12.1+g01b65bf/wsutil/str_util.c --- wireshark-1.12.0+git+4fab41a1/wsutil/str_util.c 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/wsutil/str_util.c 2014-09-16 12:09:03.000000000 -0400 @@ -123,7 +123,9 @@ #endif /* Given a size, return its value in a human-readable format */ -gchar *format_size(gint64 size, format_size_flags_e flags) { +gchar * +format_size(gint64 size, format_size_flags_e flags) +{ GString *human_str = g_string_new(""); int power = 1000; int pfx_off = 0; @@ -172,3 +174,9 @@ g_string_free(human_str, FALSE); return ret_val; } + +gchar +printable_char_or_period(gchar c) +{ + return g_ascii_isprint(c) ? c : '.'; +} diff -Nru wireshark-1.12.0+git+4fab41a1/wsutil/str_util.h wireshark-1.12.1+g01b65bf/wsutil/str_util.h --- wireshark-1.12.0+git+4fab41a1/wsutil/str_util.h 2014-07-31 14:42:43.000000000 -0400 +++ wireshark-1.12.1+g01b65bf/wsutil/str_util.h 2014-09-16 12:09:03.000000000 -0400 @@ -107,6 +107,8 @@ WS_DLL_PUBLIC gchar *format_size(gint64 size, format_size_flags_e flags); +WS_DLL_PUBLIC +gchar printable_char_or_period(gchar c); #ifdef __cplusplus }