aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2014-04-14Fix no previous prototype warnings.AndersBroman13-2/+36
Change-Id: I859597ebc957a58f659800ef63318f94e80feabf Reviewed-on: https://code.wireshark.org/review/1104 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Try to make happy Ubuntu BuildbotAlexis La Goutte1-3/+3
../../../epan/wslua/wslua_tree.c: In function 'TreeItem_add_packet_field': ../../../epan/wslua/wslua_tree.c:151:14: error: variable 'tvbr' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered] ../../../epan/wslua/wslua_tree.c:154:9: error: variable 'ett' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered] ../../../epan/wslua/wslua_tree.c:159:9: error: variable 'nargs' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered] Change-Id: I1720a62613f4bf94ae2f8649a04139a7899fb106 Reviewed-on: https://code.wireshark.org/review/1103 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Add tvb_get and proto_tree_add for string-encoded timestampsHadriel Kaplan6-157/+799
This commit adds tvb_get_string_time and proto_tree_add_time_item routines for getting nstime fields from the tvb when they are encoded in ASCII string form. The proto_tree_add_time_item routine is also usable for normal big/little-endian encoded time_t, and has the advantage of retrieving the value even if there's no proto tree. It also exposes the routines to Lua, both so that a Lua script can take advantage of this, but also so I can write a testsuite to test the functions. Change-Id: I955da10f68f2680e3da3a5be5ad8fdce7ed6808c Reviewed-on: https://code.wireshark.org/review/1084 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Increase tap limit to 5000Michal Labedzki1-1/+1
This will fix "Warn Too many taps queued" information, while there is more then 100 PDUs to be exported. For example while exporting Logcat from TCP/IP it is quite often to have PDU with multiple Logcat PDUs around 1000. Change-Id: I24d0619e57ae494c836c19c8a67df44503c54318 Reviewed-on: https://code.wireshark.org/review/1096 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Bluetooth: ATT: Add missing offset calculationsMichal Labedzki1-2/+5
Change-Id: Ia0fe426bff7d48a45d915a18aa679bb8978d2fca Reviewed-on: https://code.wireshark.org/review/1095 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Allow FT_BYTES, FT_NONE, FT_STRING use length "-1"Michal Labedzki1-1/+1
All three types support zero length, so using -1 (aka length remaining) should be safe. Change-Id: Ia616d652ce6884f8e12a5ac5782073403810b10b Reviewed-on: https://code.wireshark.org/review/1072 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Fix infinite loop. Bug 9986Michael Mann1-0/+3
Change-Id: Idbd22522918f0db131945d2a39f38b963ca3e0c2 Reviewed-on: https://code.wireshark.org/review/1093 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-13MBIM: fix dissection of ENVELOPE Sim Toolkit messagesPascal Quantin1-8/+8
Change-Id: I3e6567e8ebfe83f12a0e2cbb2998b2e43ad2277a Reviewed-on: https://code.wireshark.org/review/1092 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-13MBIM: add decoding of text based CDMA SMSPascal Quantin1-21/+92
Change-Id: Id2497597660bffeff2d98087d6511b91bfd93b1a Reviewed-on: https://code.wireshark.org/review/1091 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-13Add ENC_ASCII_7BITS encodingPascal Quantin5-115/+151
Change-Id: I01ec87ff4181afb5b2de487fd5f5200f8d62f17d Reviewed-on: https://code.wireshark.org/review/1088 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-13[Automatic manuf, services and enterprise-numbers update for 2014-04-13]Gerald Combs1-6/+158
Change-Id: I0af1de7915bf152ae59e48b4fb2e80c302aa4b39 Reviewed-on: https://code.wireshark.org/review/1085 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-12Use ftype_name() to get the name of an FT_ value.Guy Harris1-51/+13
That way we don't have to update the hf_types[] value_string if a new type is added. Change-Id: If4fd0a8ff2d6b54d0b70140be407dae9c4ab6b3b Reviewed-on: https://code.wireshark.org/review/1083 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-12Get rid of more tvb_get_nstringz* calls.Guy Harris18-155/+232
Add an FT_STRINGZPAD type, for null-padded strings (typically fixed-length fields, where the string can be up to the length of the field, and is null-padded if it's shorter than that), and use it. Use IS_FT_STRING() in more cases, so that less code needs to know what types are string types. Add a tvb_get_stringzpad() routine, which gets null-padded strings. Currently, it does the same thing that tvb_get_string_enc() does, but that might change if we don't store string values as null-terminated strings. Change-Id: I46f56e130de8f419a19b56ded914e24cc7518a66 Reviewed-on: https://code.wireshark.org/review/1082 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-12Update E.212 list to Operational Bulletin No. 1047 (1.III.2014)Pascal Quantin1-9/+28
Change-Id: I6eddb03a0ef541f94fc166a03417a91bb219e235 Reviewed-on: https://code.wireshark.org/review/1081 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-12no need for if(tree)Martin Kaiser1-23/+19
Change-Id: Ic74a8f080628dc200fe1f5a4d34ff5f9bb60e232 Reviewed-on: https://code.wireshark.org/review/1079 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-12TABs -> spacesMartin Kaiser1-96/+109
add editor modelines Change-Id: Ieee4ea5c5043c519c465a4b0570357f2c22e311c Reviewed-on: https://code.wireshark.org/review/1078 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-12Fix packet-vp8.c:168:6: warning: redundant redeclaration of ↵Alexis La Goutte1-2/+0
'proto_reg_handoff_vp8' [-Wredundant-decls] packet-vp8.c:30:6: note: previous declaration of 'proto_reg_handoff_vp8' was here Change-Id: Ibbae1eeffaa672224e5ea77bda8e207d077b7262 Reviewed-on: https://code.wireshark.org/review/1071 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-12Add Mac Roman and DOS CP437.Guy Harris4-0/+64
Change-Id: Ib96f2cf4ea71cd0cc2c703d58b9d254bf4c1248a Reviewed-on: https://code.wireshark.org/review/1077 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-12Fixes for numerous fuzz crashes - bug 9962.David Ameiss2-47/+160
Change-Id: I34fb09b62e79bfadd362c0ade81bec80dd0f14e0 Reviewed-on: https://code.wireshark.org/review/1058 Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-12Adding message type to COL_INFO for multipart messagesShu Shen1-0/+6
Change-Id: I0ae84101c71f31e2d6ab91c7f7b74da81865b8f3 Signed-off-by: Shu Shen <shu.shen@gmail.com> Reviewed-on: https://code.wireshark.org/review/1075 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-12Fix non-standard format specifiersEvan Huus1-1/+1
C90 permits plain %f for doubles. Thanks to Alexis for pointing this out. Change-Id: I3f927b0a50e5764c2297c7f9d680c6363ba9fd0e Reviewed-on: https://code.wireshark.org/review/1073 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-11Fix compilation if not HAVE_LIBGNUTLS and not HAVE_LIBGCRYPTStig Bjørlykke1-2/+2
This was introduced in the previous compilation fix. Change-Id: I4ec652a2708d90f35f3f00ec2c3261acb3e68397 Reviewed-on: https://code.wireshark.org/review/1074 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-11Fix compilation if HAVE_LIBGNUTLS but not HAVE_LIBGCRYPT.Stig Bjørlykke2-2/+4
Also fixed a comment for a #endif for the same defines. Change-Id: Icbbf619dbaeb1d4d154a5f1a8273f252d35c6981 Reviewed-on: https://code.wireshark.org/review/1070 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-11GlusterFS: correctly dissect flags passed with OPEN, CREATE, etc.Niels de Vos1-4/+4
RPC/XDR is in big-endian, just like dissect_rpc_uint64() and friends. Change-Id: I0843e280bd2ffc2c4bd9a5273a7343a17d81ad6a Reported-by: Xavier Hernandez <xhernandez@datalab.es> Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: https://code.wireshark.org/review/1066 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-11Improved TLS/DTLS Heartbeat Message handling.Stig Bjørlykke2-16/+41
Added an expert info for invalid payload length (heartbleed). Change-Id: I9e09d1ae2b997091bbce2483c098dba7e6631859 Reviewed-on: https://code.wireshark.org/review/1067 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-11Added P1 extension 34.Stig Bjørlykke1-75/+76
Change-Id: Iccaaf39d4de21e1a12a26c40a184321a67b41f3e Reviewed-on: https://code.wireshark.org/review/1068 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-11Fix unused variable warnings found by clang.Gerald Combs2-1/+3
Change-Id: I31ff6d9bfcedfc1e3cab4e191d8dbf8de347abb1 Reviewed-on: https://code.wireshark.org/review/1065 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-10display LCNs as decimal numberMartin Kaiser1-1/+1
this makes them easier to compare with your TVs channel list Change-Id: Ie78d1a7df8aa83455ff723fa523b84a067231e5f Reviewed-on: https://code.wireshark.org/review/1063 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-10use the CI+ value string for CI+ descriptor tagsMartin Kaiser1-1/+2
Change-Id: I48f3304f74263672a65a74f523f14ebb7950d2d6 Reviewed-on: https://code.wireshark.org/review/1062 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-10Fix infinite loop. Bug 9970Michael Mann1-2/+4
Change-Id: I4f928187b9ba3e522f63f6b6987587e3638d8ba7 Reviewed-on: https://code.wireshark.org/review/1057 Reviewed-by: Francesco Fondelli <francesco.fondelli@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-10Update to the latest packet format.AndersBroman1-30/+148
Change-Id: I745a05c9a9e7a5addc00befc2b4ff019aca2a4cc Reviewed-on: https://code.wireshark.org/review/1056 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-10Add a hint in the protocol tree.AndersBroman1-1/+5
Change-Id: Id565b153e322599430218eb6f7a542e2dd763458 Reviewed-on: https://code.wireshark.org/review/1055 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-10Have the checkum preference only affect IPv4AndersBroman1-3/+3
Change-Id: I6416ab40ac4e1e652bc453fb8e6d3eaa6ec5fe65 Reviewed-on: https://code.wireshark.org/review/1054 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-10More zero-length checks.Guy Harris1-3/+19
Fixes bug 9965. (Also fixes a typo in an expert info string.) Change-Id: I0b4f9bc4619e0d2ba291795973070598e2e142fe Reviewed-on: https://code.wireshark.org/review/1051 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-10Check for zero-length options.Guy Harris1-2/+30
Otherwise, we get an infinite loop when processing options. This might be the cause of bug 9967. Change-Id: If115c8cc8fc87b0c4252ab3cd07bfa34952786c6 Reviewed-on: https://code.wireshark.org/review/1050 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-10Fix two ett_ variables that weren't getting registered.Guy Harris1-0/+2
Change-Id: I0b37bf3d89a108978a6c917fc4d3a33cba456493 Reviewed-on: https://code.wireshark.org/review/1048 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-10Avoid bug 9962 - don't use variables that haven't been set.Guy Harris1-1/+5
See the comment for details. Change-Id: I0b1800dd884736e00201f09166c0d2bd6795b6c3 Reviewed-on: https://code.wireshark.org/review/1047 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09Fix white space.Guy Harris1-1/+1
Change-Id: Ia36d439d1210f93be25a31d2a7288474688e0d9c Reviewed-on: https://code.wireshark.org/review/1046 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09Update kafka OffsetFetchResponse dissectionEvan Huus1-5/+1
Per https://github.com/Shopify/sarama/pull/77 the spec is out of date, there is no longer a clientID field in certain messages. Change-Id: Ieeb7b8f1dd32b326b3d9507e3d5897574a1b09fd Reviewed-on: https://code.wireshark.org/review/1043 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-09Improve dissection of RFC 6607. Bug 9960Michael Mann1-8/+24
Change-Id: Ibab13b0ab7b3f0ac1d9c2e305cb428bb17689313 Reviewed-on: https://code.wireshark.org/review/1039 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-09Added support for MQTT protocol. Bug 9930Michael Mann3-0/+589
Change-Id: I04fc3a6225c56af9905f4f9bbbca5bc10f214843 Reviewed-on: https://code.wireshark.org/review/873 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-09Clean up white space.Guy Harris1-274/+269
Change-Id: If274c6239859127485d306b92a59e4d473c26d39 Reviewed-on: https://code.wireshark.org/review/1045 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09Use tvb_strncaseeql() to check for XML.Guy Harris2-6/+2
This avoids using tvb_get_nstringz0(), and simplifies the check. Change-Id: Ib33cf22bf79d4fac8896c25a8b879eeb6e506831 Reviewed-on: https://code.wireshark.org/review/1044 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09iTXt chunk nameMartin Kaiser1-0/+2
Change-Id: I0310368319fe70782bd2c3b48e100292cd93d8c4 Reviewed-on: https://code.wireshark.org/review/1042 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-09There seems to be some ambigiousy on how to calculate V3 checksums forAndersBroman1-14/+28
IPv4. Introduce a preference to use the same metod as for VRRP V2. http://ask.wireshark.org/questions/15291/does-wireshark-uses-a-pseudo-header-for-vrrpv3-ipv4-checksum-calculation Change-Id: I14bf279b0c85405c1963784737add9321d5cb7c4 Reviewed-on: https://code.wireshark.org/review/1040 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-09Clean up the dissection of ServiceContexts.Guy Harris1-85/+119
Make the top-level item for a ServiceContext an item for the ServiceContext as a while, and put the VSCID under it like other items, rather than making the VSCID the top-level item. Don't dissect the VSCID using the value_string field for the Object Management Group's SCIDs; use that value_string field for the SCID if the VSCID is 0 (meaning "Object Management Group"), and have no value_string field for the VSCID otherwise (the interpretation of the SCID depends on the value of the VSCID). Dissect the encapsulation information even for unknown ServiceContexts. If the ServiceContext's length is bigger than what it's supposed to be, throw an exception if it's also bigger than the data available in the packet; this squelches a run-time warning in that case. Change-Id: I11cc62c2e32f4623dba2a551119b3146a7037e6d Reviewed-on: https://code.wireshark.org/review/1038 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09remove usb_trans_info parameterMartin Kaiser1-22/+9
trans_info is part of the conversation info Change-Id: I3eafe893324d7d6d23c5475f6f7aa34b7520a6b8 Reviewed-on: https://code.wireshark.org/review/1018 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-09setup dissectors don't need bus_id and device_address parametersMartin Kaiser1-59/+36
these values are already part of usb_conv_info Change-Id: I79f0c67c91f0f93ba2d52ef08875833eee5e9efd Reviewed-on: https://code.wireshark.org/review/1017 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-09Don't use tvb_get_nstringz0(), use tvb_get_string_enc().Guy Harris6-24/+16
Change-Id: I8e654fa857fca6713198e3d20f2a14a0a444e935 Reviewed-on: https://code.wireshark.org/review/1037 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09Update some Kafka API constants per lastest specEvan Huus1-2/+2
Change-Id: Icef981f50e81e5059916e3bde5fa8a1e1fcd92ae Reviewed-on: https://code.wireshark.org/review/1033 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 19:41:54 +0000