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.
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: I8f1f48595830d4672984f3797be1c9d994e64ea0
Reviewed-on: https://code.wireshark.org/review/4043
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Bug: 10446
simplify OPCR calculation while we're at it
Change-Id: I8590e409895e712fe6bbb64ab23093caf5795fa7
Reviewed-on: https://code.wireshark.org/review/4040
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Extract RFC3315 about hop-count :
20.1.2. Relaying a Message from a Relay Agent
If the message received by the relay agent is a Relay-forward message
and the hop-count in the message is greater than or equal to
HOP_COUNT_LIMIT, the relay agent discards the received message.
The relay agent copies the source address from the IP datagram in
which the message was received from the client into the peer-address
field in the Relay-forward message and sets the hop-count field to
the value of the hop-count field in the received message incremented
by 1.
Bug:10449
Change-Id: Ifb94e7c54c0a26714fc543862d4358d3e60c2676
Reviewed-on: https://code.wireshark.org/review/4017
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Other minor cleanups while in the area.
Change-Id: I623d941e53128f169e55dfc629547b4221fa72fc
Reviewed-on: https://code.wireshark.org/review/4021
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Other minor cleanups while in the area.
Change-Id: Id8dab02df6f111c3462238c3de1bf201e037ca48
Reviewed-on: https://code.wireshark.org/review/4022
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Just use "sizeof line" for the size of that array; don't have a separate
variable with the number of elements of the array (which at least is
equal to the size of the array, as it's an array of char), as that means
that you have to remember to change both of them.
Then cast "sizeof line" to int, as the second argument to fgets() is an
int, not a size_t (fgets(), as I remember, existed before size_t).
Change-Id: I3c65774527f4fcd824d7ae39208ab6e8e33eb9b4
Reviewed-on: https://code.wireshark.org/review/4023
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Change-Id: I6b6a05ec242e4798fb56ffa43c661ec277aca955
Reviewed-on: https://code.wireshark.org/review/3984
Reviewed-by: Chris Bontje <cbontje@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: Iebe0c581259b80d905f0ef3e26c1caae07f715d1
Reviewed-on: https://code.wireshark.org/review/4012
Reviewed-by: Michael Mann <mmann78@netscape.net>
C++, unlike C, lets you do that. This squelches warnings from MSVC++.
Change-Id: Id7127392b7690769111afdb951951d743f1d5e63
Reviewed-on: https://code.wireshark.org/review/4019
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(Perhaps C2099 will finally deprecate old-style function definitions and
allow you to declare parameters without names, just as C++ does, and
compilers will - obviously - not warn about those parameters being
unreferenced, obviating the need for __attribute((unused))__ and the
like. And perhaps monkeys will fly out of....)
Change-Id: Iff295c1854e66eb4f9e02cdd5761e0191d371365
Reviewed-on: https://code.wireshark.org/review/4018
Reviewed-by: Guy Harris <guy@alum.mit.edu>
I haven't found a way to with MSVC to mark parameters in the argument
list as unused. MSVC doesn't give warnings about them in C code, but
does appear to give them with C++ code. An answer to
http://stackoverflow.com/questions/3020584/avoid-warning-unreferenced-formal-parameter
suggests not giving the formal parameter a name in C++.
Have a macro UNUSED_PARAMETER(), which takes as an argument a variable
name, and expands to nothing in C++ and to the variable name followed by
_U_ in C, and use that for some unused parameters. If it works, we'll
use it for all of them.
Change-Id: I76107bed037f1f0d94615adb42234c9faf83b4db
Reviewed-on: https://code.wireshark.org/review/4016
Reviewed-by: Guy Harris <guy@alum.mit.edu>
We probably won't get files that big, but let's at least be prepared;
that squelches some compiler warnings.
Change-Id: Ia43ff78af7df63c7204c41d8331fea946de63116
Reviewed-on: https://code.wireshark.org/review/4015
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(I'd say "as values of that *type* are assigned to it", but the "len"
field of a GString is of type "gsize", and, for some unknown reason, the
GLib folks, rather than just using size_t, which is required by C89 to
be available, invented their own "gsize" type, defined as "long", which
happens to be narrower than "size_t" on LLP64 platforms such as 64-bit
Windows. Sigh....)
This squelches some compiler warnings.
Change-Id: Ifca1300297b2e9b777fb2c426dda822ba157cfe5
Reviewed-on: https://code.wireshark.org/review/4014
Reviewed-by: Guy Harris <guy@alum.mit.edu>
If it's not there, "make distcheck" fails. In addition, 1) "make
distclean" doesn't clean out the Makefile.in files under asn1 and 2) you
don't get to see the source from which the ASN.1 dissectors were built
if you have a source tarball.
Change-Id: Ied59d42950373476a535fcf9cfccece46de92599
Reviewed-on: https://code.wireshark.org/review/4013
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Other minor cleanups while in the area.
Change-Id: I8ea59205cfe6fab643d8fe01b75ce91532004fd9
Reviewed-on: https://code.wireshark.org/review/4004
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Change-Id: I5c24f0bf3d756abed0db17bf2ae8ab0dbf695c43
Ping-Bug:10351
Reviewed-on: https://code.wireshark.org/review/4000
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Change-Id: Ib72178aab69c266cb903ef5ad5587cc0b80eb1fd
Reviewed-on: https://code.wireshark.org/review/4007
Reviewed-by: Michael Mann <mmann78@netscape.net>
In our build environment, some UN*Xes define the historic index()
routine in addition to the standard strchr() routine.
Change-Id: Id39ad42a60def6af4c5b3625528207e9d2948392
Reviewed-on: https://code.wireshark.org/review/4002
Reviewed-by: Guy Harris <guy@alum.mit.edu>
they were renamed from qtshark_... to wireshark_...
Change-Id: I97b245a9028b4ed99812204114ba8f59357d49e8
Reviewed-on: https://code.wireshark.org/review/3995
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
* AC Timestamp (6)
* Add Station (6)
* CAPWAP Local IPv4 Address (30)
* CAPWAP Local IPv6 Address (50)
* CAPWAP Transport Protocol (51)
* MTU Discovery Padding (52)
* ECN Support (53)
Change-Id: Ib8b2768d5df4b0e1b5b8b5bd28ae66e825020205
Reviewed-on: https://code.wireshark.org/review/3986
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
It looks like we need to install and/or configure Qt on the Windows
petri dish builder.
Change-Id: I2bdde7cd9216e311d6402116d6c67b37d37e182d
Reviewed-on: https://code.wireshark.org/review/3997
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Create a TrafficTableDialog (for lack of a better name) parent class
from the general parts of ConversationDialog. Use it to create
EndpointsDialog.
Move the contents of conversation_tree_widget.{cpp,h} to
conversation_dialog.{cpp,h} to match endpoint_dialog and
traffic_table_dialog.
Fill in GeoIP columns dynamically instead of using a hard-coded limit.
Use "endp_" and "ENDP_" prefixes for a lot of endpoint variables and
defines.
Try to make geoip_db_lookup_ipv4 and geoip_db_lookup_ipv6 more robust.
Clean up some includes. Fix a shadowed variable.
Change-Id: I23054816ac7f8c6edb3b1f01c8536db37ba4122d
Reviewed-on: https://code.wireshark.org/review/3462
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
this fixed the line numbers, marked some items as obsolete and added new
items
corrected some minor problems
Promiscious Mode was changed to Monitor Mode, update the translation
accordingly
Change-Id: I63b3ef0fb3488d941d6d1170b911026281f94a0a
Reviewed-on: https://code.wireshark.org/review/3994
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
japanese language update
Change-Id: I92a68f389a7ac1e07eb11c970d5e37c31fde22c1
Reviewed-on: https://code.wireshark.org/review/3993
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Also add the S7 Communication dissector's author to AUTHORS.
Mention that the Qt UI is now the default.
Change-Id: Ie2629333fd48bbe1ce95052292336a4f8608ea17
Reviewed-on: https://code.wireshark.org/review/3988
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
packet-s7comm.c:962: warning: declaration of 'time' shadows a global declaration
Change-Id: I4020b780e787a91c42f08f7b7b1c7feabcabdc62
Reviewed-on: https://code.wireshark.org/review/3987
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
- Block Up-/Download will be removed from the protocol
It has never been implemented => no impact
- Preload will be added in future versions of the
openSAFETY specification
- Better definition of SSDO ACMD sets to ensure correct
protocol dissection
- Use TFS.h t/f strings where applicable, remaining
strings are referenced directly from specification
Change-Id: I9c809098938333c914e1f8ba67d100b994fd33f4
Reviewed-on: https://code.wireshark.org/review/2647
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
S7 Communication is a Siemens proprietary protocol that runs between
programmable logic controllers (PLC) of the Siemens S7-300/400 family.
Dissector T.125 has to be disabled to let this dissector work.
Change-Id: I578cf270a4ae567f8e20dbabec1ce1e13fc08e6e
Reviewed-on: https://code.wireshark.org/review/3777
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Some captures are still hitting the limit as a false positive.
Bug: 10122
Change-Id: I12dd26ba0f96f44799f5ae642b1f9b0487f86a8a
Reviewed-on: https://code.wireshark.org/review/3982
Reviewed-by: Michael Mann <mmann78@netscape.net>
Add a new routine to wsutil to make this easy: printable_char_or_period().
Bug: 10439
Change-Id: I0eb2bb6bc0676a1035c3d845b5e20276fa04de60
Reviewed-on: https://code.wireshark.org/review/3981
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>