Commit Graph

37980 Commits

Author SHA1 Message Date
Stig Bjørlykke f5c9ccd0c4 Fixed some coding errors:
packet-bacapp.c:6154: error: stray '\250' in program
packet-bacapp.c:7137: warning: cast to pointer from integer of different size

svn path=/trunk/; revision=39680
2011-10-30 17:03:24 +00:00
Anders Broman cd6fa1f722 Fix unused variable warnings.
svn path=/trunk/; revision=39679
2011-10-30 16:44:02 +00:00
Anders Broman 5e7bccb9c2 From Thomas Dreibholz:
Update the NetPerfMeter protocol dissector to the latest
version of NetPerfMeter (http://www.iem.uni-due.de/~dreibh/netperfmeter/).

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

svn path=/trunk/; revision=39678
2011-10-30 16:23:36 +00:00
Anders Broman 0b41604bad From Kevin Hildebrand:
Typo in acinclude.m4 breaks Heimdal kerberos builds

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

svn path=/trunk/; revision=39677
2011-10-30 16:19:05 +00:00
Anders Broman 798fabed72 From Lori Tribble:
I found many new properties in BACnet that were not decoded correctly in
Wireshark.  I have attached a patch that adds decoding to the following
properties:

Fixed the following properties to decode:

In the Accumulator Object:
scale (187)
prescale (185)
logging-record (184)

In Access Door Object:
door-members (228)
masked-alarm-values (234)

In the Pulse Converter Object:
input-reference (181)

In the Group Object:
list-of-group-members (53)

In the Event Enrollment Object:
object-property-reference (78)

In the Command Object:
action (2)

In the Trend Log Multiple object:
log-buffer (131)

In the Event Log Object:
log-buffer (131)

In the Structured View object:
subordinate-list (211)

Added decoding for the following enumeration type properties:
  Logging-type (197)
  event-state (36)
  reliability (103)
  notify-type (208)
  door-status (231)
  lock-status (233)
  secured-status (235)
  maintenance-required (158)
  program-state (92)
  program-change (90)
  reason-for-halt (100)
  mode (160)
  silenced (163)
  operation-expected (161)
  tracking-value (164)
  file-access-method (41)

The above fixes also fixed the log-buffer decoding of the old trend log 
recorded as Wireshark bug: #6458

I believe this patch also fixes bug: #6235.  But the original bug did not
contain a capture file so I am not positive my capture represents the
originators issue.

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

svn path=/trunk/; revision=39676
2011-10-30 16:06:14 +00:00
Anders Broman 773f294db6 From Martin Kaiser:
DVB-CI / CI+ Operator Profile Resource

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

svn path=/trunk/; revision=39675
2011-10-30 16:02:20 +00:00
Anders Broman c7fb9d9fe3 From Pascal Quantin:
Fix dissection of PLMN List IE.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6513

svn path=/trunk/; revision=39674
2011-10-30 15:57:30 +00:00
Stig Bjørlykke 89880b5b59 Increase the size of a unknown INTEGER to FT_INT64 to be able to show
negative integers and integers up to MAXINT64.  We still don't support
integers between MAXINT64 and MAXUINT64, which would be 9 bytes long.

svn path=/trunk/; revision=39673
2011-10-30 15:55:18 +00:00
Balint Reczey 6efb9bdf91 pass file to wireshark in wireshark.desktop
svn path=/trunk/; revision=39670
2011-10-30 14:24:29 +00:00
Gerald Combs c34e5d4357 [Automatic manuf, services and enterprise-numbers update for 2011-10-30]
svn path=/trunk/; revision=39669
2011-10-30 14:03:25 +00:00
Guy Harris 7aa8340533 Clang Cat is watching you fail to check for a null pointer.
svn path=/trunk/; revision=39668
2011-10-30 06:47:27 +00:00
Guy Harris f15386dd93 Don't set mr_mult_req_info->num_services *unless we're sure
mr_mult_req_info is non-null*!  This should fix bug 6514, and possibly a
bunch of other buildbot crashes.

svn path=/trunk/; revision=39667
2011-10-29 20:41:30 +00:00
Stig Bjørlykke be353072dc Added support for big integer64 values.
This fixes bug 6295.

svn path=/trunk/; revision=39666
2011-10-29 18:26:57 +00:00
Stig Bjørlykke 69d36a6271 Based on a patch provided by Prashanth in bug 6472:
Only have one Filter Expression window.

svn path=/trunk/; revision=39665
2011-10-29 10:28:58 +00:00
Stig Bjørlykke 8b0be9ad63 Fixed max and min in sint24_from_unparsed() again.
Note to self: don't think hex while doing something else...

svn path=/trunk/; revision=39664
2011-10-29 09:00:18 +00:00
Guy Harris 42c2e1c57b It appears that the "packet" records are actually "stuff from the ISDN
link" records, including stuff that's from a G.704 PRI frame but not
from a D or H channel in that frame.  Handle them (currently, we ignore
them).

The low-order bit of the flags field for "packet" records" is "network
to user" (NT->TE), not "user to network" (TE->NT).

svn path=/trunk/; revision=39663
2011-10-28 22:57:33 +00:00
Stig Bjørlykke 760813589c Fixed max and min in sint24_from_unparsed().
svn path=/trunk/; revision=39662
2011-10-28 20:57:46 +00:00
Stig Bjørlykke 67c6b90fd9 Fixed a typo: strtoull() -> strtoul()
svn path=/trunk/; revision=39661
2011-10-28 20:32:42 +00:00
Stig Bjørlykke a52bf4edc5 Simplified code for checking integer ranges.
svn path=/trunk/; revision=39660
2011-10-28 20:30:41 +00:00
Stig Bjørlykke 3e241efba3 Added range checking for integers and give an appropriate error
message if value is outside of range (given by field type).

svn path=/trunk/; revision=39659
2011-10-28 20:14:13 +00:00
Stig Bjørlykke 46c3fe0547 Prefer previous error message if not having hfinfo->strings,
because this may give more interesting information.

svn path=/trunk/; revision=39658
2011-10-28 20:13:56 +00:00
Martin Mathieson 338cb689a6 Fix the width of a type (and hopefully please the buildbots).
svn path=/trunk/; revision=39657
2011-10-28 18:59:30 +00:00
Martin Mathieson ec748afa3a First go at calling UMTS RLC dissector from IxCatapult logs.
Had to change some #defines in the header file (for UDP-framed/heuristic
dissector) - will need to update example sending program later on tonight.

svn path=/trunk/; revision=39656
2011-10-28 18:36:20 +00:00
Alexis La Goutte 5fb574c69e Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39655
2011-10-28 17:44:01 +00:00
Alexis La Goutte 654f213aae Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39654
2011-10-28 17:39:31 +00:00
Alexis La Goutte 2fb7b4fc4c From Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5767
BitTorrent DHT dissector for wireshark

From me :
* Fix encoding attribut for proto_tree_add_item (with fix-encodings-args script)

svn path=/trunk/; revision=39653
2011-10-28 14:50:13 +00:00
Alexis La Goutte f0f3d8d13c From Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5767
Make bt-utp as heuristic dissectors

svn path=/trunk/; revision=39652
2011-10-28 14:49:31 +00:00
Alexis La Goutte ece3e6d974 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39651
2011-10-28 11:20:19 +00:00
Alexis La Goutte 971e3ff730 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=39650
2011-10-28 10:24:57 +00:00
Anders Broman 5057f53e8b From Eliot:
Add runtime tracers (disabled by default) for debug.

Add runtime tracers (disabled by default) for debug.

This may be useful for ongoing development.



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

svn path=/trunk/; revision=39649
2011-10-28 06:22:24 +00:00
Anders Broman 2b2ed07262 From Eliot:
ctypes updates, minor fixes

ctypes updates, minor fixes

Explicitly use ctypes for some calls.
Remove spurious reference to homeplug.
Remove unnecessary line continuation backslashes

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

svn path=/trunk/; revision=39648
2011-10-28 06:19:55 +00:00
Anders Broman 37db4ed4ae From Eliot:
Define correct ctypes parameter and return types for used functions.

Define correct ctypes parameter and return types for used functions.
Particularly on 64 bit, int default doesn't work.

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

svn path=/trunk/; revision=39647
2011-10-28 06:18:59 +00:00
Anders Broman fb1736120f From Adam Mitz:
The RTPS2 dissector doesn't handle octetsToNextHeader properly in INFO_RELY submessages.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6506

svn path=/trunk/; revision=39646
2011-10-28 06:06:20 +00:00
Guy Harris 83aed00fac The version string field isn't followed by 20 bytes of stuff; the last 8
bytes of what we thought was a version string appears to be an 8-byte
record of some sort in the captures we originally looked at, and appears
to be a non-8-byte record in another capture.  If we treat that as a
record, the version string field appears to be null-padded and 41 bytes
long.

svn path=/trunk/; revision=39645
2011-10-28 02:48:52 +00:00
Bill Meier c4b63360dc Fix proto_tree_add_item( encoding args;
Do whitespace cleanup (for a few files).

svn path=/trunk/; revision=39640
2011-10-27 20:30:38 +00:00
Anders Broman 1b75d2a3f3 ..Filter is not used any more.
svn path=/trunk/; revision=39639
2011-10-27 19:20:39 +00:00
Anders Broman e595aec776 Fix comparison with UAT keys.
svn path=/trunk/; revision=39637
2011-10-27 16:49:53 +00:00
Bill Meier 20e3e0b5b5 Fix some proto_tree_add_item() encoding args;
In some files:
 Remove a few unneeded #includes;
 Do some whitespace/indentation cleanup

svn path=/trunk/; revision=39635
2011-10-27 15:59:12 +00:00
Anders Broman 2c2fb429f7 Fix indentation.
svn path=/trunk/; revision=39634
2011-10-27 15:38:32 +00:00
Anders Broman 4d0e343dbf The comparison with the UAT keys are broken, this is
a fix for fetching the IP address.

svn path=/trunk/; revision=39633
2011-10-27 15:35:48 +00:00
Bill Meier 75c64294fa Fix a typo.
svn path=/trunk/; revision=39632
2011-10-27 14:50:20 +00:00
Jeff Morriss 7b6f829483 Correct an off-by-one error introduced in r39626.
svn path=/trunk/; revision=39631
2011-10-27 14:39:12 +00:00
Jeff Morriss 01de3aea36 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6498 :
Initialize cip_req_info_t.ciaData, too.

svn path=/trunk/; revision=39630
2011-10-27 14:30:57 +00:00
Jeff Morriss 8d25051a28 Followup to r39626: It is also necessary to initialize the number of services
to 0 (in case we throw an exception decoding the first service).

svn path=/trunk/; revision=39629
2011-10-27 13:30:32 +00:00
Guy Harris c0db24bf4d Fix cut-and-pasteo that happened not to cause a problem on *P64
platforms but failed on *P32 platforms.

Remove the debugging code (the above was the problem in question).

svn path=/trunk/; revision=39628
2011-10-27 03:00:03 +00:00
Jeff Morriss 4de661bb9f Add a little shell script to export the appropriate variables necessary for
running valgrind and then run it on either tshark or (if the user is very
patient) Wireshark.

svn path=/trunk/; revision=39627
2011-10-27 02:32:32 +00:00
Jeff Morriss 3c622f7b80 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6491 :
Don't set mr_mult_req_info->num_services until we're sure we've
initialized the full structure for that service.  Otherwise if we
happen to throw an exception before initializing the whole
structure, we'll core someplace (like dissect_cip_generic_service_rsp())
which expects all num_services entries to be fully initialized.


svn path=/trunk/; revision=39626
2011-10-27 01:48:39 +00:00
Guy Harris a4e597b545 Add some debugging code; the current code doesn't work when compiled
with MSVC on Win32, and the fix will remove the debugging code as well.

svn path=/trunk/; revision=39624
2011-10-26 23:41:15 +00:00
Bill Meier 269cc1920f Fix a [-Wunused-but-set-variable] compiler warning;
Also: Remove trailing whitespace from lines.

svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
Anders Broman 095c62b66e The comparison with the UAT keys are broken, this is
a fix for the SPI the src and dst IP address strings needs fixing too.
I'll look into that tomorrow if no one beats me too it.

svn path=/trunk/; revision=39621
2011-10-26 21:42:45 +00:00