aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove last caller of se_strdup_printfEvan Huus2014-06-164-25/+4
| | | | | | | | | | | Also remove that function as it is now unused. Fix what appeared to be a memory leak in the manual address resolution dialog while in the neighbourhood. Change-Id: I75128ab0f95e5a7673f92bfeea45191f00581c25 Reviewed-on: https://code.wireshark.org/review/2244 Reviewed-by: Michael Mann <mmann78@netscape.net>
* Remove emem from ssl utils, use glib instead.Evan Huus2014-06-161-14/+18
| | | | | | | | No exceptions can be thrown when loading a key from a file, so it's safe. Change-Id: I14ee8569bb516fcb45b72f07f76d28ef4b32065c Reviewed-on: https://code.wireshark.org/review/2243 Reviewed-by: Michael Mann <mmann78@netscape.net>
* Remove now-unused functions.Evan Huus2014-06-164-42/+1
| | | | | | Change-Id: Iecf230d493b31ecab25b33c67323987459b23bd7 Reviewed-on: https://code.wireshark.org/review/2242 Reviewed-by: Michael Mann <mmann78@netscape.net>
* STUN: Add support of MS-TURNBWMAlexis La Goutte2014-06-161-1/+179
| | | | | | | | | Traversal using Relay NAT (TURN) Bandwidth Management Extensions http://msdn.microsoft.com/en-us/library/ff595670.aspx Change-Id: I58c7b758ae96226a45095243939b2ad2b4a91d4d Reviewed-on: https://code.wireshark.org/review/1973 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Support out-of-source docbook buildStig Bjørlykke2014-06-162-33/+43
| | | | | | Change-Id: I273a6317c459664a247d3f5623ef54b0a70a9ab8 Reviewed-on: https://code.wireshark.org/review/2232 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Fix SDP dissector crash during fuzz testingYan Burman2014-06-161-0/+3
| | | | | | | Change-Id: Ic133dd9440feb61964d197fa0aaacd86241f229d Signed-off-by: Yan Burman <yanb@mellanox.com> Reviewed-on: https://code.wireshark.org/review/2248 Reviewed-by: Michael Mann <mmann78@netscape.net>
* iSCSI: Register iscsi dissector, so it can be used by iSERYan Burman2014-06-161-0/+1
| | | | | | | Change-Id: I78e487c14859b82d7e1d79f99a92c759c73fbda2 Signed-off-by: Yan Burman <yanb@mellanox.com> Reviewed-on: https://code.wireshark.org/review/2246 Reviewed-by: Michael Mann <mmann78@netscape.net>
* Register BER dissector as new.Stig Bjørlykke2014-06-161-5/+8
| | | | | | | | This makes it possible to dissect part of a package as ASN.1. Change-Id: I53dd6bc916fa0d2c932d77fef437c2094fdd29ed Reviewed-on: https://code.wireshark.org/review/2238 Reviewed-by: Evan Huus <eapache@gmail.com>
* Use tfs_f1_3_override_state to avoid unused variable errorStig Bjørlykke2014-06-161-2/+2
| | | | | | Change-Id: I211f1bd2dcf61f27034e1e42e00ab3c1dc0c4c89 Reviewed-on: https://code.wireshark.org/review/2236 Reviewed-by: Evan Huus <eapache@gmail.com>
* Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte2014-06-161-2/+1
| | | | | | Change-Id: I781c7eec381d3296d15e666385f549e44f62e3f1 Reviewed-on: https://code.wireshark.org/review/2226 Reviewed-by: Evan Huus <eapache@gmail.com>
* Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte2014-06-161-3/+0
| | | | | | Change-Id: I17b5f3af2c4822805705fae9fdbb0375ba04acdd Reviewed-on: https://code.wireshark.org/review/2225 Reviewed-by: Evan Huus <eapache@gmail.com>
* New dissector for Character Generator Protocol (chargen).Dario Lombardo2014-06-153-0/+116
| | | | | | | Change-Id: I01e0508adc79dda11b3eaee51fa01110b8c83e39 Bug: 10178 Reviewed-on: https://code.wireshark.org/review/2220 Reviewed-by: Bill Meier <wmeier@newsguy.com>
* Fix documentation for DissectorTable_get_dissectorStig Bjørlykke2014-06-151-4/+4
| | | | | | Change-Id: Ic8db06249c6326505b7f5c4518c3af2c6961066a Reviewed-on: https://code.wireshark.org/review/2234 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
* Added some type valuesStig Bjørlykke2014-06-151-0/+4
| | | | | | Change-Id: I99a2203968dfb9fb0bb7e2052c2bf5aa0994f9ca Reviewed-on: https://code.wireshark.org/review/2233 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
* Add missing --git-dir=$srcdir/.git for ls-remoteStig Bjørlykke2014-06-151-1/+1
| | | | | | | Change-Id: I848b80cd8126d93cbf3ce02a333345f4ea6b4e92 Reviewed-on: https://code.wireshark.org/review/2231 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
* Depend on docbook-xml and drop obsoleted 0005-...patchBalint Reczey2014-06-153-42/+1
| | | | | | | | Change-Id: I4c849a1e8205b65ba05959213967bac5f378c96c Reviewed-on: https://code.wireshark.org/review/2137 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
* [Automatic manuf, services and enterprise-numbers update for 2014-06-15]Gerald Combs2014-06-154-8/+158
| | | | | | Change-Id: Idb28b18adc99e7ba5cd1a3995986774d75ddb3aa Reviewed-on: https://code.wireshark.org/review/2227 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* OSPF: Remove unused code (will be never reused)Alexis La Goutte2014-06-151-13/+0
| | | | | | Change-Id: I7cd22fd1524b6eeaf5a1384d6a43acc5411370f9 Reviewed-on: https://code.wireshark.org/review/2224 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
* Fix warnings turning errors (also fixes buildbot)Joerg Mayer2014-06-153-1/+15
| | | | | | | | | These fixes are superficial. Michael: Please review and either remove the unneeded stuff or put in the correct use. Change-Id: I15e0f8c746af5bd76f57965ddcbf06d9e4ac80ca Reviewed-on: https://code.wireshark.org/review/2223 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
* packet-ospf.c : proto_tree_add_text -> something filterableMichael Mann2014-06-151-384/+364
| | | | | | Change-Id: I9769e1d93ff99c4081dd028d79c0cead75e0e36c Reviewed-on: https://code.wireshark.org/review/2221 Reviewed-by: Michael Mann <mmann78@netscape.net>
* packet-ipmi-se.c : proto_tree_add_text -> something filterable.Michael Mann2014-06-154-601/+632
| | | | | | | | | Also did some minor cleanup noticed while doing the filter conversion Change-Id: Iea61b395c0eeb6fbcaac4c09964da2cb3cdccda5 Reviewed-on: https://code.wireshark.org/review/2184 Reviewed-by: Dmitry Bazhenov <dima_b@pigeonpoint.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
* acknowledge BASE_RANGE_STRINGMichael Mann2014-06-151-0/+1
| | | | | | Change-Id: I3e899f79a3d58b8a2e72b88253a7e9ec51a314b5 Reviewed-on: https://code.wireshark.org/review/2222 Reviewed-by: Michael Mann <mmann78@netscape.net>
* Policy CMP020 was being set twice. Remove my original clumsy implementation.Joerg Mayer2014-06-141-6/+1
| | | | | | | | Set CMP0015 to NEW Change-Id: Idea76f365f27e59eb6f56c7edec6d96224668c0d Reviewed-on: https://code.wireshark.org/review/2219 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
* Added monlist supportDario Lombardo2014-06-141-3/+142
| | | | | | | | Change-Id: Ia96bfb71449624ff75c694080fef30d57300b30d Bug: 10174 Reviewed-on: https://code.wireshark.org/review/2131 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* limit the scope of setup_tvbMartin Kaiser2014-06-141-1/+2
| | | | | | | Change-Id: Id3fc3f017c02c2df3b0578c28f187b106c3ad2ed Reviewed-on: https://code.wireshark.org/review/2218 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* limit the scope of new_offsetMartin Kaiser2014-06-141-5/+5
| | | | | | | Change-Id: Ib7f57696e40df770f5ae21ca066b27d28c13b57b Reviewed-on: https://code.wireshark.org/review/2217 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* let the subfct fill win32_data_lenMartin Kaiser2014-06-141-4/+3
| | | | | | | Change-Id: I39012cf467b27eb0be4c63bbc648a72f831d9068 Reviewed-on: https://code.wireshark.org/review/2216 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* mark both transfer header and payload bytes for usbpcap iso packetsMartin Kaiser2014-06-141-2/+4
| | | | | | | Change-Id: I2aadbde82b59ac0135230e5e370a9a3f81951365 Reviewed-on: https://code.wireshark.org/review/2215 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* more descriptive names for tree variablesMartin Kaiser2014-06-141-9/+9
| | | | | | | Change-Id: I3eaa39784be9c00de834325dbfe9be4c545dcec7 Reviewed-on: https://code.wireshark.org/review/2214 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* rename tree_ti to urb_tree_tiMartin Kaiser2014-06-141-7/+7
| | | | | | | Change-Id: I2cda4c90de1be774d80cc2cd044ce2609a350c3e Reviewed-on: https://code.wireshark.org/review/2213 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* remove unnecessary tree variableMartin Kaiser2014-06-141-4/+1
| | | | | | | Change-Id: Ie3eb6f91a99e82c9068074aa20e99ca5b2525882 Reviewed-on: https://code.wireshark.org/review/2212 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* simplify the detection of iso data start offsetMartin Kaiser2014-06-141-4/+3
| | | | | | | Change-Id: Idcae64accda9d812fdeb21b71bed35601cfbcd89 Reviewed-on: https://code.wireshark.org/review/2211 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* rename dissect_win32_usb_pseudo_header() toMartin Kaiser2014-06-141-21/+6
| | | | | | | | | | | | | dissect_usbpcap_buffer_packet_header() only process the generic part of the usbpcap pseudo header in this function, the transfer-specific parts are handled in dissect_usb_common() Change-Id: I1e97db9905ef1d14f04b53624e82feed7270912f Reviewed-on: https://code.wireshark.org/review/2210 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* dissect the usbpcap_buffer_control_header in dissect_usb_common()Martin Kaiser2014-06-141-14/+18
| | | | | | | Change-Id: I605908619b5d87c846810016c15cccfce9da858e Reviewed-on: https://code.wireshark.org/review/2209 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
* Define INET6 for all platforms.Irene Ruengeler2014-06-142-1/+7
| | | | | | | | | Show the addresses as a tooltip in capture interfaces. Change-Id: I911784e09ed9479229a7d6f8a7f1476e2e1e6224 Reviewed-on: https://code.wireshark.org/review/2155 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
* Match for contents of WIRESHARK_SIMD_FLAGS only if non-emptyJoerg Mayer2014-06-141-5/+6
| | | | | | Change-Id: I99e15b237c74783b455461ce58ba32f1f8202990 Reviewed-on: https://code.wireshark.org/review/2208 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
* Make it harder to miss that this is also about Win buildsJoerg Mayer2014-06-141-3/+3
| | | | | | Change-Id: Id4fd7a4672ed32dfcb57a4435a6b3e5cf2e5ca3d Reviewed-on: https://code.wireshark.org/review/2207 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
* Backport autofoo simd optimizationJoerg Mayer2014-06-143-1/+49
| | | | | | Change-Id: I5d58154bf8266eabedf550b54f18845612f514c6 Reviewed-on: https://code.wireshark.org/review/2206 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
* Small whitespace fixesJoerg Mayer2014-06-141-2/+2
| | | | | | Change-Id: I44c6c193ec2a7d88cda56ba34c2f17c03f7e121d Reviewed-on: https://code.wireshark.org/review/2205 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
* Rename WIRESHARK_C_FLAGS to WIRESHARK_COMMON_FLAGSJoerg Mayer2014-06-141-8/+8
| | | | | | Change-Id: If78801de797264c0924e81abaf8cd49cc5715a83 Reviewed-on: https://code.wireshark.org/review/2204 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
* Fix package version stamping.Gerald Combs2014-06-131-1/+1
| | | | | | | | Change-Id: I1615364071563c4f56b071d7d68e4660dd989296 Reviewed-on: https://code.wireshark.org/review/2198 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit fd017eeae358fbcbb3f51f2765bd31777aa513d1) Reviewed-on: https://code.wireshark.org/review/2201
* From Gisle Vanem on -dev: don't print modelines info when run with -h.Jeff Morriss2014-06-121-1/+3
| | | | | | | | Also remove trailing white space. Change-Id: Ic56140f617a2cbf9fa93fb427282eab0b6cff9c6 Reviewed-on: https://code.wireshark.org/review/2113 Reviewed-by: Evan Huus <eapache@gmail.com>
* RTP: fix invalid memory accessPascal Quantin2014-06-121-2/+2
| | | | | | | Bug: 10176 Change-Id: If54e4a5a118ea10befeeed5278394665df99425e Reviewed-on: https://code.wireshark.org/review/2187 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
* Try to fix a used-but-not-set warning.Guy Harris2014-06-121-1/+3
| | | | | | | | | | | | | | I'm guessing that GCC is complaining because "device" isn't guaranteed to be set (if there are no interfaces, the body of the loop will never be executed), so do with the list of link-layer header types what's done for the buffer size and snapshot length. But should the column-setting code be executed if the interface isn't found? Change-Id: I8c365a482b8af44cdd1c1a7f41ca611141387c86 Reviewed-on: https://code.wireshark.org/review/2180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Don't check "&(device.if_info)" to see if it's null.Guy Harris2014-06-121-1/+1
| | | | | | | | It would be null only with a horribly buggy C implementation. Change-Id: I880747e9993a8b087d2b177ee0bed63644ecd646 Reviewed-on: https://code.wireshark.org/review/2179 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* X11: Update generated dissectorPeter Harris2014-06-126-83/+42
| | | | | | | Change-Id: Id3fbc64b4d797d50e935223c40c5c2321a1c8198 Signed-off-by: Peter Harris <pharris@opentext.com> Reviewed-on: https://code.wireshark.org/review/2148 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* X11: Support XCB's new <pad align='n' />Peter Harris2014-06-121-7/+34
| | | | | | | Change-Id: I0a45380ffcfb3be7e3190d0875626ed0fe046c4e Signed-off-by: Peter Harris <pharris@opentext.com> Reviewed-on: https://code.wireshark.org/review/2147 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
* Fix a regression, as -1 can no longer means until the end of the tvbMartin Mathieson2014-06-121-2/+2
| | | | | | Change-Id: I2bbb9c5f62984f0365a3cad6b60401ee70418e74 Reviewed-on: https://code.wireshark.org/review/2158 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
* Make sure image/expert_ok.png ends up in a source tarball.Guy Harris2014-06-121-0/+1
| | | | | | Change-Id: I7ad2b53d706d953d443ef935f1edb84c46d7fa16 Reviewed-on: https://code.wireshark.org/review/2156 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* Capture Interfaces Dialog:Irene Ruengeler2014-06-1221-169/+983
| | | | | | | | | | | | | | - allow to change the interface options in the table - save the options to preferences when the dialog is left - add a field for setting a capture filter for all selected interfaces - add a "Compile BPF" button and a window to show the compiled filter output - try to address Alexis' and Evan's comments Change-Id: Ic1272e29183ec80e2d2f4b3e494c79dabe2c3b6f Reviewed-on: https://code.wireshark.org/review/1946 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>