Commit Graph

51323 Commits

Author SHA1 Message Date
Guy Harris 833d315c02 Document {CODE,HEADER} {START,END}.
Clean up indentation.

svn path=/trunk/; revision=54721
2014-01-13 21:18:29 +00:00
Guy Harris a2979508d0 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
2014-01-13 21:05:44 +00:00
Guy Harris c463f6cc88 Make a routine not used outside this file static.
svn path=/trunk/; revision=54719
2014-01-13 20:17:20 +00:00
Guy Harris 7cff496408 Make a routine not used outside this file static.
svn path=/trunk/; revision=54718
2014-01-13 20:14:00 +00:00
Guy Harris 6df963eff0 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
2014-01-13 20:12:14 +00:00
Guy Harris aec280d874 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
2014-01-13 19:49:12 +00:00
Guy Harris 39fe54ac35 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
2014-01-13 19:32:10 +00:00
Guy Harris 7620abccdc Make routines not used outside packet-dcerpc-lsa.c static.
svn path=/trunk/; revision=54712
2014-01-13 19:29:21 +00:00
Guy Harris 61d5c458a0 Squelch some warnings.
svn path=/trunk/; revision=54711
2014-01-13 19:07:48 +00:00
Gerald Combs bfde80d3dc Make sure we point to the GPLv2.
svn path=/trunk/; revision=54710
2014-01-13 16:22:01 +00:00
Jörg Mayer 1242a77e74 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
2014-01-13 10:51:37 +00:00
Jörg Mayer 1bd240749d One more place where setcap does not need inheritance
svn path=/trunk/; revision=54708
2014-01-12 22:21:55 +00:00
Pascal Quantin 527071fb0d 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
2014-01-12 20:52:19 +00:00
Martin Kaiser 658e0d82da remove unnecessary if(tree) statements
svn path=/trunk/; revision=54706
2014-01-12 17:57:21 +00:00
Martin Kaiser b3df31324b Coverity 280438: missing break
svn path=/trunk/; revision=54705
2014-01-12 17:49:30 +00:00
Gerald Combs 8989899e92 [Automatic manuf, services and enterprise-numbers update for 2014-01-12]
svn path=/trunk/; revision=54702
2014-01-12 15:03:43 +00:00
Michael Mann bdfabe5979 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
2014-01-12 03:17:51 +00:00
Michael Mann 11a61d757d 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
2014-01-12 02:29:51 +00:00
Michael Mann c071a1c728 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
2014-01-12 00:50:41 +00:00
Chris Maynard 4210311b69 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
2014-01-11 20:40:43 +00:00
Michael Mann 31e24e47db 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
2014-01-11 19:47:24 +00:00
Alexis La Goutte e2cec3b990 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
2014-01-11 12:16:56 +00:00
Alexis La Goutte bf95d60829 Fix indent (use 4 spaces) and add modelines
svn path=/trunk/; revision=54695
2014-01-11 11:16:49 +00:00
Gerald Combs 1a279aca25 Update the enterprise-numbers URL.
svn path=/trunk/; revision=54694
2014-01-10 22:57:28 +00:00
Stig Bjørlykke 640e6f44ec 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
2014-01-10 18:58:56 +00:00
Martin Mathieson 830509b7dc Update a comment and fix some indentation
svn path=/trunk/; revision=54692
2014-01-10 17:56:55 +00:00
Martin Mathieson 92b1a4a112 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
2014-01-10 12:51:57 +00:00
Martin Mathieson 4debda5779 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
2014-01-10 12:36:17 +00:00
Martin Kaiser 5843e95163 use a value string for the emi
correct the dot offset
other minor cleanup

svn path=/trunk/; revision=54689
2014-01-10 09:23:36 +00:00
Martin Kaiser 8a99c0428c dissect Digital Only Token and retention limit
svn path=/trunk/; revision=54688
2014-01-10 09:15:08 +00:00
Martin Kaiser 80ed2d24bd correct a typo in a filter string
svn path=/trunk/; revision=54687
2014-01-10 08:48:38 +00:00
Anders Broman 05f7044bc7 Make internal functions static
svn path=/trunk/; revision=54686
2014-01-10 07:01:15 +00:00
Anders Broman 02eb787d13 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
2014-01-10 06:49:25 +00:00
Pascal Quantin 70dc6197ec 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
2014-01-09 21:58:09 +00:00
Michael Mann f42fa7abf1 USB: Add DFU dissector. Bug 9610 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9610)
From Michal Labedzki

svn path=/trunk/; revision=54683
2014-01-09 21:42:36 +00:00
Pascal Quantin 944db5d447 Set explicitly P2P direction for received SMS
svn path=/trunk/; revision=54682
2014-01-09 21:29:07 +00:00
Michael Mann 84dc9e9b4b 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
2014-01-09 20:19:43 +00:00
Martin Kaiser 0fa16ed92a 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
2014-01-09 13:45:51 +00:00
Martin Kaiser e830c290da 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
2014-01-09 13:02:27 +00:00
Jörg Mayer 02b9cbb571 Move cfile.c into SHARK_COMMON_SRC (as was done in nmake)
svn path=/trunk/; revision=54678
2014-01-09 11:02:29 +00:00
Guy Harris 993a4d5b7c Mark an unused parameter as such.
svn path=/trunk/; revision=54677
2014-01-09 03:01:37 +00:00
Michael Mann 5ff31ef33d 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
2014-01-09 02:49:18 +00:00
Gerald Combs bbc7ad3c4e cfile.c is in WIRESHARK_COMMON_SRC so there's no need to add it again.
svn path=/trunk/; revision=54675
2014-01-09 01:30:25 +00:00
Jörg Mayer 2203d51591 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
2014-01-08 22:02:07 +00:00
Guy Harris 0cde948e34 Add libfiletap.
svn path=/trunk/; revision=54673
2014-01-08 21:27:44 +00:00
Guy Harris 8c916394ef TFShark doesn't capture traffic, so it doesn't need
SHARK_COMMON_CAPTURE_SRC.

svn path=/trunk/; revision=54672
2014-01-08 20:57:34 +00:00
Guy Harris 658e0b30e6 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
2014-01-08 20:50:52 +00:00
Guy Harris c81a43da68 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
2014-01-08 20:36:37 +00:00
Guy Harris 324a7c9043 Rename PLATFORM_SRC to PLATFORM_CAPTURE_SRC, to match the CMake name.
svn path=/trunk/; revision=54669
2014-01-08 20:22:13 +00:00
Guy Harris 005ff3f64d 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
2014-01-08 20:10:17 +00:00