Commit Graph

23311 Commits

Author SHA1 Message Date
Evan Huus 95f484a91e 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
2013-10-25 22:14:25 +00:00
Jeff Morriss b190de385a 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
2013-10-25 20:38:50 +00:00
Jeff Morriss 274596eaab Fix up some formatting and white space.
svn path=/trunk/; revision=52848
2013-10-25 15:25:46 +00:00
Jeff Morriss ce23d50028 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
2013-10-25 15:00:00 +00:00
Jeff Morriss 81b0681c12 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
2013-10-25 14:57:55 +00:00
Jeff Morriss 4cfc0f27cb 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
2013-10-25 14:41:12 +00:00
Jeff Morriss 3440dd73f2 Fix CID 1080758: be prepared for tvb_child_uncompress() failing (and returning
NULL).

svn path=/trunk/; revision=52844
2013-10-25 14:38:39 +00:00
Jeff Morriss 2aae7bc4a6 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
2013-10-25 14:15:28 +00:00
Jeff Morriss ab97b9d50b 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
2013-10-25 14:04:22 +00:00
Michael Mann 02784747f7 Make sure "mp2t-dsmcc" dissector is registered by name so it can be picked up by etv dissector.
svn path=/trunk/; revision=52841
2013-10-25 13:37:10 +00:00
Jeff Morriss 3e4c954fd8 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
2013-10-25 13:24:29 +00:00
Jeff Morriss 86b6659210 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
2013-10-25 13:23:17 +00:00
Michael Mann cf1f098afb 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
2013-10-25 02:41:47 +00:00
Michael Mann c09b328e13 Pass ieee802154_packet data into the heuristic check instead of using private_data.
svn path=/trunk/; revision=52836
2013-10-25 02:02:02 +00:00
Michael Mann ab0ad4aa1c 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
2013-10-25 01:54:53 +00:00
Jeff Morriss 787bca8ea0 Add SVN properties.
svn path=/trunk/; revision=52832
2013-10-25 00:56:17 +00:00
Evan Huus 29a4ebc5d4 Mark unused parameter, remove moved .h file from Makefile.common
svn path=/trunk/; revision=52831
2013-10-25 00:08:07 +00:00
Michael Mann 9563de93a3 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
2013-10-24 23:59:47 +00:00
Michael Mann e83fe18fcc Have ZigBee dissectors pass data through subdissector parameter instead of using struct _packet_info.
svn path=/trunk/; revision=52827
2013-10-24 23:40:58 +00:00
Pascal Quantin 39fd5f29af Fix copy paste errors
svn path=/trunk/; revision=52823
2013-10-24 21:11:00 +00:00
Martin Kaiser bc8006b224 fix offset calculation
highlight the correct payload bytes for unknown sub-descriptors

svn path=/trunk/; revision=52822
2013-10-24 20:59:32 +00:00
Jeff Morriss 8601a75d51 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
2013-10-24 20:52:00 +00:00
Jörg Mayer 1b69a6a94d 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
2013-10-24 20:35:53 +00:00
Anders Broman f1f72f2f57 From Zoltán Lajos Kis:
dissect echo messages.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283

svn path=/trunk/; revision=52816
2013-10-24 16:41:04 +00:00
Michael Mann e4e536bf1d Remove need for match_port #define in packet_info.h and just replace existing calls.
svn path=/trunk/; revision=52815
2013-10-24 15:04:38 +00:00
Evan Huus 207cedd928 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
2013-10-24 12:41:27 +00:00
Anders Broman d803c5bf9c 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
2013-10-24 04:04:14 +00:00
Michael Mann 71cbca03ba Remove ipxptype from struct _packet_info and pass it into subdissectors through ipxhdr_t structure.
svn path=/trunk/; revision=52810
2013-10-24 01:26:30 +00:00
Michael Mann 4cfd2f93ea Remove profinet_conv member of struct _packet_info and turn it into proto_data.
svn path=/trunk/; revision=52806
2013-10-24 00:17:58 +00:00
Martin Kaiser a3ba5dcbf5 initialize DSM-CC over TCP and over MPEG2-TS in the same way
svn path=/trunk/; revision=52805
2013-10-23 21:22:14 +00:00
Martin Kaiser 00e8cd960d support DSM-CC over TCP
dissect some DSM-CC user-to-network messages related to session
management

svn path=/trunk/; revision=52804
2013-10-23 21:20:41 +00:00
Anders Broman 3f0bbe7669 Fix warnings.
svn path=/trunk/; revision=52803
2013-10-23 20:54:17 +00:00
Chris Maynard e41d5b9049 Provide a usage example of the column formats.
svn path=/trunk/; revision=52802
2013-10-23 17:47:47 +00:00
Evan Huus 4e66e2ec91 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
2013-10-23 17:10:25 +00:00
Michael Mann 79d58dc670 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
2013-10-23 16:47:02 +00:00
Michael Mann 25c43f9dc2 Make option tag and length filterable and part of a subtree, which simplifies the switch statement handling.
Add modelines.

svn path=/trunk/; revision=52797
2013-10-23 16:25:26 +00:00
Jeff Morriss 0bf219035a Remove trailing spaces from hf name values (to satisfy checkAPIs).
svn path=/trunk/; revision=52796
2013-10-23 16:23:54 +00:00
Michael Mann 5abe9d8a89 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
2013-10-23 14:41:07 +00:00
Anders Broman f4306bb0cd 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
2013-10-23 14:19:28 +00:00
Anders Broman c76f307221 From Zoltán Lajos Kis:
dissect hello messages

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283

svn path=/trunk/; revision=52788
2013-10-23 14:08:56 +00:00
Anders Broman b8003ea06e g_slist_free_full() is glib 2.28
Fix spelling.

svn path=/trunk/; revision=52787
2013-10-23 14:04:19 +00:00
Anders Broman e717ca06bd 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
2013-10-23 12:02:15 +00:00
Anders Broman 8713b826ce epan/dissectors/Makefile.common:218: error: comment following trailing backslash
svn path=/trunk/; revision=52783
2013-10-23 08:54:30 +00:00
Anders Broman 8533218275 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
2013-10-23 08:02:16 +00:00
Bill Meier 9874da2fcb #if 0 numerous "unused const variables" (mostly value-string-arrays);
Also; fix a few "set but not used" warnings.

svn path=/trunk/; revision=52780
2013-10-23 06:29:11 +00:00
Evan Huus dd314cd97e Add explicit 64/32 casts missing from r52775.
svn path=/trunk/; revision=52779
2013-10-23 01:56:52 +00:00
Evan Huus 53e771f217 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
2013-10-23 01:47:55 +00:00
Evan Huus 328a05630c 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
2013-10-23 01:36:49 +00:00
Michael Mann cbd3194bcf 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
2013-10-22 23:30:26 +00:00
Michael Mann 17679ee25d 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
2013-10-22 17:41:06 +00:00