aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-09-07Eliminate proto_tree_add_text from some of the dissectors.Michael Mann13-145/+230
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>
2014-09-07[Automatic manuf, services and enterprise-numbers update for 2014-09-07]Gerald Combs4-10/+219
Change-Id: I35bc2282b41810cc9644ded0b5c4036f4508264b Reviewed-on: https://code.wireshark.org/review/4024 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-07Squelch a compiler warning and get rid of an unnecessary variable.Guy Harris1-2/+1
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>
2014-09-07Create subdissector table for RTAC Serial and have dissectors register with ↵Michael Mann9-72/+99
it, rather than have the RTAC Serial dissector go find all of the dissectors its interested in. 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>
2014-09-07GTK (conversations table): Fix Dereference of null pointer found by Clang ↵Alexis La Goutte1-0/+3
analyzer Change-Id: Iebe0c581259b80d905f0ef3e26c1caae07f715d1 Reviewed-on: https://code.wireshark.org/review/4012 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-06Don't give names to parameters you don't use.Guy Harris1-1/+1
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>
2014-09-06Convert all the other function-defining macros.Guy Harris1-15/+15
(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>
2014-09-06Try to suppress MSVC++ unused parameter warnings.Guy Harris1-5/+11
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>
2014-09-06Make the count of bytes read from the file 64 bits.Guy Harris1-1/+1
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>
2014-09-06Make some variables size_t, as values of that width are assigned to it.Guy Harris1-3/+3
(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>
2014-09-06Put asn1 back as a distributed subdirectory.Guy Harris1-0/+1
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>
2014-09-06Remove obsolete dissectors.AndersBroman30-12547/+0
Change-Id: Icd480491670de9d8495a95861b18a8a5cb9724b4 Reviewed-on: https://code.wireshark.org/review/4006 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-06Eliminate proto_tree_add_text from some of the dissectors.Michael Mann23-435/+437
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>
2014-09-06MySQL : Eliminate proto_tree_add_text (use proto_tree_add_debug...)Alexis La Goutte1-5/+5
Change-Id: I2e14328715cd11bc1ce31dad91b1cc5ef4091130 Reviewed-on: https://code.wireshark.org/review/4005 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-05MySQL: add decode connattrs when use COM_CHANGE_USERAlexis La Goutte1-0/+28
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>
2014-09-056LoWPAN: fix storage of contexts coming from ICMPv6 Router Advertisement ↵Pascal Quantin1-2/+2
messages Bug: 10443 Change-Id: I1a74b4d3036c61f0c8e1fca6373845ea40d87808 Reviewed-on: https://code.wireshark.org/review/4008 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-05Fix compilation when we don't HAVE_GEOIP.Jeff Morriss1-1/+1
Change-Id: Ib72178aab69c266cb903ef5ad5587cc0b80eb1fd Reviewed-on: https://code.wireshark.org/review/4007 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-05Fix compiler warnings.Guy Harris1-41/+41
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>
2014-09-05adjust the path to the translation filesMartin Kaiser1-1/+1
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>
2014-09-05Fix compiler warnings from g30f3d52.Gerald Combs3-13/+13
Change-Id: I76fa088f72f0e31da9be105919d56fd8db1ea7b5 Reviewed-on: https://code.wireshark.org/review/3999 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-05CAPWAP: Add some new Message Element Type (RFC5415)Alexis La Goutte1-0/+190
* 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>
2014-09-05Fix the GeoIP include path.Gerald Combs1-1/+1
Change-Id: Ib4b3264a4da5b54b01061153e383f21e1bcf00b2 Reviewed-on: https://code.wireshark.org/review/3998 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-05Add the GeoIP include path to the Windows qmake build.Gerald Combs1-0/+1
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>
2014-09-05Qt: Refactor ConversationDialog for endpoints.Gerald Combs33-1036/+1861
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>
2014-09-04packet-netflow.c: Update "Information Elements" dissected based upon ↵Bill Meier1-334/+1693
08/13/2014 IANA IPFIX assignments document Change-Id: Icfabdf5b77cdeef686620b75e649fc5bc270197a Reviewed-on: https://code.wireshark.org/review/3996 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-04another lupdate + lrelease for JapaneseMartin Kaiser2-689/+1281
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>
2014-09-04From 竹下 恵 (Megumi Takeshita)Martin Kaiser2-700/+767
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>
2014-09-04ICMPv6: Remove soft deprecated API (tvb_length -> tvb_captured_length)Alexis La Goutte1-1/+1
Change-Id: Ib6161f778d902430f0903f5aef2df40c8166c5aa Reviewed-on: https://code.wireshark.org/review/3992 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-04tvbuff composite: add modelines infos (tabs)Alexis La Goutte1-0/+13
Change-Id: I9ea2160b550243b45f6798ad3339f6a45b34a4ef Reviewed-on: https://code.wireshark.org/review/3991 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-04tvbuff composite: fix Dereference of null pointer found by Clang AnalyzerAlexis La Goutte1-0/+3
Change-Id: Ia43cb2e1cab99e4b769c8dfa0805d8e38e225a1c Reviewed-on: https://code.wireshark.org/review/3990 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-04Update NEWS: Add S7 Communication dissector and the extcap interface.Jeff Morriss3-5/+19
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>
2014-09-04Fix Mac OS X buildbotAlexis La Goutte1-20/+20
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>
2014-09-04openSAFETY: Add datafield for preloadRoland Knall1-95/+103
- 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>
2014-09-04s7comm: Add dissector for S7 CommunicationThomas Wiens6-0/+7488
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>
2014-09-04Bump the time limit for valgrind fuzzingEvan Huus1-2/+2
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>
2014-09-04Don't print non-printable characters in AX.25 addresses.Jeff Morriss3-3/+18
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>
2014-09-04Fix Mac OS X buildbotAlexis La Goutte1-5/+5
packet-cp2179.c:719: warning: declaration of 'index' shadows a global declaration Change-Id: Ic622b4f90f9816a43bc62bcb3ce438fbfab3d8a5 Reviewed-on: https://code.wireshark.org/review/3983 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-04Fix unused variable... [-Werror,-Wunused-const-variable]Stig Bjørlykke1-1/+3
Use DATA_FRAG_FLAGS, disabled unused NACK_FLAGS Change-Id: I2d3dda2c3ab1ebbd66e32bf5ec1b62b521a7140d Reviewed-on: https://code.wireshark.org/review/3968 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-04Add dissector for CP "Cooper" 2179 ProtocolQiaoyin Yang6-0/+1432
All credit for development should go Qiaoyin Yang CP2179 protocol is a serial based protocol. The 2179 protocol is implemented with minor variations between vendors. The RTAC implemented the 2179 client supporting a limited function codes and command codes. The RTAC doesn't support multiple function codes in a single request and the dissector also doesn't support decoding these or corresponding responses. Bug:10285 Change-Id: I217bf4185c52b0b183f69b3b5aa84613340d3944 Reviewed-on: https://code.wireshark.org/review/3089 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-04Fix up some formatting.Jeff Morriss2-25/+54
Change-Id: Ib38561ad5cf0f532e43ae3e10bbb857bb24ab9b6 Reviewed-on: https://code.wireshark.org/review/3980 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-03Work around an apparent bug in GtkFileChooserButton.Gerald Combs1-0/+12
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: If2556ef939b95d8af12581a7116a48fb46586f57 Bug: 10434 Reviewed-on: https://code.wireshark.org/review/3977 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03RPKI RTR: Add support draft-ietf-sidr-rpki-rtr-rfc6810-bis-01Alexis La Goutte1-7/+113
Add new PDU : Router Key (9) Add new field (Expire, Retry... interval) for END OF DATA PDU Ping-Bug:8296 Change-Id: Ic30ab0ff9d0f9989eb7d157f85b74a54d09fb0e7 Reviewed-on: https://code.wireshark.org/review/3948 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-03RTPS: Add Modelines infoAlexis La Goutte2-2/+27
Change-Id: Ib29fb16d3b82b53aba52e2d13be2ce8e8727ccfb Reviewed-on: https://code.wireshark.org/review/3973 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-03tvbparse: do not increment the token length when the new sub token length is 0Pascal Quantin1-2/+4
It fixes the unwanted addition of ignore characters when using tvbparse_some as seen with the capture from bug 10417 Change-Id: If68b587e1821fb34aa1fb56666986e1fa6385c33 Reviewed-on: https://code.wireshark.org/review/3905 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-03RTPS: fix Result of operation is garbage or undefinedAlexis La Goutte1-0/+1
Missing get num_virtual_guids value... Change-Id: I81a3dea3c96fb946c5c26ffe4ab2bfb82d1d8222 Reviewed-on: https://code.wireshark.org/review/3972 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-03ICMPv6: fix missing space before 6LBRAlexis La Goutte1-1/+1
Change-Id: Ibfb53df05691b67ac08a4f54ab0949ea17a89f89 Reviewed-on: https://code.wireshark.org/review/3971 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-03Don't need include ipproto.hAlexis La Goutte2-2/+0
Change-Id: Ia2fe7df0ec72c0ba9eb77ea4beafe58be20d901d Reviewed-on: https://code.wireshark.org/review/3970 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-03Updated translations (add Comment fields) for desktop integration.AlexL1-0/+33
Patch submitted via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10442 Bug: 10442 Change-Id: Idf73b058cff5db520cde951e58e85e5f71c680e2 Reviewed-on: https://code.wireshark.org/review/3975 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-09-03Don't override the PA package naming convention. Use our full version inGerald Combs3-20/+11
the package name. Set a minimum OS version (Vista). Update some comments. Change-Id: I28096276d2588993136b008a307dbcc7983496b0 Reviewed-on: https://code.wireshark.org/review/3974 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03Check whether the hop-count of most inner message is equal to 0Jérôme LAFORGE1-20/+37
Extract RFC3315 about relay message and hop-count : 20.1.1. Relaying a Message from a Client If the relay agent received the message to be relayed from a client, the relay agent places a global or site-scoped address with a prefix assigned to the link on which the client should be assigned an address in the link-address field. This address will be used by the server to determine the link from which the client should be assigned an address and other configuration information. The hop-count in the Relay-forward message is set to 0. 20.3. Construction of Relay-reply Messages A server uses a Relay-reply message to return a response to a client if the original message from the client was relayed to the server in a Relay-forward message or to send a Reconfigure message to a client if the server does not have an address it can use to send the message directly to the client. A response to the client MUST be relayed through the same relay agents as the original client message. The server causes this to happen by creating a Relay-reply message that includes a Relay Message option containing the message for the next relay agent in the return path to the client. The contained Relay-reply message contains another Relay Message option to be sent to the next relay agent, and so on. The server must record the contents of the peer-address fields in the received message so it can construct the appropriate Relay-reply message carrying the response from the server. For example, if client C sent a message that was relayed by relay agent A to relay agent B and then to the server, the server would send the following Relay-Reply message to relay agent B: msg-type: RELAY-REPLY hop-count: 1 link-address: 0 peer-address: A Relay Message option, containing: msg-type: RELAY-REPLY hop-count: 0 link-address: address from link to which C is attached peer-address: C Relay Message option: <response from server> Change-Id: I774cc22c9c090af1a5d3732115c7cd3478343288 Bug:10437 Reviewed-on: https://code.wireshark.org/review/3936 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 18:11:08 +0000