metze/wireshark/wip.git
11 years agoUpdate the MSRP link, it's an actual RFC now.
Evan Huus [Mon, 28 Jan 2013 13:27:28 +0000 (13:27 -0000)]
Update the MSRP link, it's an actual RFC now.

svn path=/trunk/; revision=47323

11 years agoWhitespace and doxygen comment changes.
Anders Broman [Mon, 28 Jan 2013 12:04:15 +0000 (12:04 -0000)]
Whitespace and doxygen comment changes.

svn path=/trunk/; revision=47322

11 years agoFrom Gyanesh:
Jaap Keuter [Mon, 28 Jan 2013 06:46:21 +0000 (06:46 -0000)]
From Gyanesh:
Add SPBV MAC address sub-TLV support (802.1aq).

svn path=/trunk/; revision=47321

11 years agothe fragment id must depend on the transport connection
Martin Kaiser [Sun, 27 Jan 2013 22:08:29 +0000 (22:08 -0000)]
the fragment id must depend on the transport connection
fragments from different transport connections can be interleaved

svn path=/trunk/; revision=47320

11 years agoFix some dead increment warnings found by Clang
Pascal Quantin [Sun, 27 Jan 2013 18:58:52 +0000 (18:58 -0000)]
Fix some dead increment warnings found by Clang

svn path=/trunk/; revision=47319

11 years agoFix typo error
Pascal Quantin [Sun, 27 Jan 2013 18:57:08 +0000 (18:57 -0000)]
Fix typo error

svn path=/trunk/; revision=47318

11 years agoFrom Hadar Shoham via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8262
Evan Huus [Sun, 27 Jan 2013 16:07:02 +0000 (16:07 -0000)]
From Hadar Shoham via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8262

Bootp updates, fixes and additional options.

svn path=/trunk/; revision=47317

11 years agoBugfix crash caused by AirPDcap decryption. Bug 8177 (https://bugs.wireshark.org...
Michael Mann [Sun, 27 Jan 2013 15:28:55 +0000 (15:28 -0000)]
Bugfix crash caused by AirPDcap decryption.  Bug 8177 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8177)

svn path=/trunk/; revision=47314

11 years ago[Automatic manuf, services and enterprise-numbers update for 2013-01-27]
Gerald Combs [Sun, 27 Jan 2013 15:03:25 +0000 (15:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-01-27]

svn path=/trunk/; revision=47313

11 years agoFix various instances of unused hf[] entries found
Bill Meier [Sat, 26 Jan 2013 22:43:34 +0000 (22:43 -0000)]
Fix various instances of unused hf[] entries found
 by checkhf.

svn path=/trunk/; revision=47312

11 years agoFix for CID 718640:
Jaap Keuter [Sat, 26 Jan 2013 22:36:54 +0000 (22:36 -0000)]
Fix for CID 718640:
Make sure the AVPs length are right before we go into hash calculation.

svn path=/trunk/; revision=47311

11 years agoInitialize some hf_... vars to -1;
Bill Meier [Sat, 26 Jan 2013 21:42:36 +0000 (21:42 -0000)]
Initialize some hf_... vars to -1;

(Reduces the number of checkhf false positives)

svn path=/trunk/; revision=47310

11 years agoMake airpcap's print_debug_line take const arguments so that it compiles
Evan Huus [Sat, 26 Jan 2013 21:21:25 +0000 (21:21 -0000)]
Make airpcap's print_debug_line take const arguments so that it compiles
on newer GCC's when _DEBUG is #defined.

Found while investigating
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8177

svn path=/trunk/; revision=47309

11 years agoInit several hf... vars to -1.
Bill Meier [Sat, 26 Jan 2013 20:41:55 +0000 (20:41 -0000)]
Init several hf... vars to -1.

(found by checkhf)

svn path=/trunk/; revision=47308

11 years agoForward-port r47305 from trunk-1.8:
Gerald Combs [Sat, 26 Jan 2013 20:36:57 +0000 (20:36 -0000)]
Forward-port r47305 from trunk-1.8:

  ------------------------------------------------------------------------
  r47305 | gerald | 2013-01-26 12:12:52 -0800 (Sat, 26 Jan 2013) | 6 lines
  Changed paths:
     M /trunk-1.8/tools/fuzz-test.sh

  Instead of setting resource limits on the fuzz-test.sh process itself,
  set limits on the TShark subprocess. This should hopefully take care
  of the strange fuzz failures we've seen lately.

  Reduce the maximum CPU time to 5 minutes while we're at it.
  ------------------------------------------------------------------------

svn path=/trunk/; revision=47307

11 years agoAdd two missing hf[] entries (which should have been part of SVN #42819).
Bill Meier [Sat, 26 Jan 2013 19:59:41 +0000 (19:59 -0000)]
Add two missing hf[] entries (which should have been part of SVN #42819).
(Found by checkhf)

##Backport 1.8

svn path=/trunk/; revision=47304

11 years agoUse "4 space" indentation.
Bill Meier [Sat, 26 Jan 2013 19:09:15 +0000 (19:09 -0000)]
Use "4 space" indentation.

svn path=/trunk/; revision=47303

11 years agoComment out cases of unused hf array entries found by checkhf.
Bill Meier [Sat, 26 Jan 2013 18:54:53 +0000 (18:54 -0000)]
Comment out cases of unused hf array entries found by checkhf.

svn path=/trunk/; revision=47302

11 years agoReformat hf array entries slightly (to help checkdf)
Bill Meier [Sat, 26 Jan 2013 16:31:24 +0000 (16:31 -0000)]
Reformat hf array entries slightly (to help checkdf)

svn path=/trunk/; revision=47301

11 years agoThe const was important, take a copy of the suffix to sanitize instead.
Evan Huus [Sat, 26 Jan 2013 15:51:01 +0000 (15:51 -0000)]
The const was important, take a copy of the suffix to sanitize instead.

svn path=/trunk/; revision=47300

11 years agoAlways call sub-dissectors with the top-level tree.
Evan Huus [Sat, 26 Jan 2013 15:41:35 +0000 (15:41 -0000)]
Always call sub-dissectors with the top-level tree.

svn path=/trunk/; revision=47299

11 years agoReplace disallowed filename characters to '-'.
Chris Maynard [Sat, 26 Jan 2013 15:41:16 +0000 (15:41 -0000)]
Replace disallowed filename characters to '-'.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7877
#BACKPORT(1.8, 1.6)

svn path=/trunk/; revision=47298

11 years agoFrom Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8246
Evan Huus [Sat, 26 Jan 2013 15:38:12 +0000 (15:38 -0000)]
From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8246

Support for dissection of FeliCa payloads in PN532 InCommunicateThru packets.

svn path=/trunk/; revision=47297

11 years agoUSB-CCID header is always 10 bytes and may contain payloads, so setting
Evan Huus [Sat, 26 Jan 2013 15:34:48 +0000 (15:34 -0000)]
USB-CCID header is always 10 bytes and may contain payloads, so setting
it to run to the end of the packet was confusing and/or wrong.

svn path=/trunk/; revision=47296

11 years agodcp-etsi dissector: new formula for rx_min
Michael Mann [Sat, 26 Jan 2013 15:07:25 +0000 (15:07 -0000)]
dcp-etsi dissector: new formula for rx_min
Bug 8231 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8231)

svn path=/trunk/; revision=47295

11 years agoFix for CID 280529 and 280530.
Jaap Keuter [Sat, 26 Jan 2013 11:34:55 +0000 (11:34 -0000)]
Fix for CID 280529 and 280530.
Check the validity of the TLV before using its retreived data.

svn path=/trunk/; revision=47294

11 years agoWhitespace cleanup.
Evan Huus [Fri, 25 Jan 2013 22:04:59 +0000 (22:04 -0000)]
Whitespace cleanup.

svn path=/trunk/; revision=47286

11 years agoFrom Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8259
Evan Huus [Fri, 25 Jan 2013 21:54:18 +0000 (21:54 -0000)]
From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8259

Improve the dissection of the "Get Software Version" confirmation frame as well
as the "Read configuration Block" confirmation frame by properly dissecting the
fields previously marked as reserved in the Homeplug-AV dissector.

svn path=/trunk/; revision=47285

11 years agoClean up:
Bill Meier [Fri, 25 Jan 2013 21:48:38 +0000 (21:48 -0000)]
Clean up:
- Remove hf & ett decls not used externally from .h
- For hf & ett vars not used externally:
   remove from .c if not used internally otherwise
   declare as static.

svn path=/trunk/; revision=47284

11 years agoHandle hf_... definitions which are not static;
Bill Meier [Fri, 25 Jan 2013 20:12:09 +0000 (20:12 -0000)]
Handle hf_... definitions which are not static;
For .../dissectors/(non-generated dissectors):
 Reduces the number of "unused" false positives (and
 adds about 2 different false positives).

svn path=/trunk/; revision=47280

11 years agoWhen searching for hex bytes from the "Find Packet" dialog, highlight the correct...
Chris Maynard [Fri, 25 Jan 2013 19:01:57 +0000 (19:01 -0000)]
When searching for hex bytes from the "Find Packet" dialog, highlight the correct number of bytes.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8085
#BACKPORT
1.8: ui/gtk/main_proto_draw.c:packet_hex_print()
1.6: gtk/main_proto_draw.c:packet_hex_print()

svn path=/trunk/; revision=47277

11 years agoRemove duplicate include file
Pascal Quantin [Fri, 25 Jan 2013 18:37:00 +0000 (18:37 -0000)]
Remove duplicate include file

svn path=/trunk/; revision=47275

11 years agoFix dissection of ETWS/CMAS messages
Pascal Quantin [Fri, 25 Jan 2013 18:33:07 +0000 (18:33 -0000)]
Fix dissection of ETWS/CMAS messages

svn path=/trunk/; revision=47274

11 years agoRemove non ASCII character
Pascal Quantin [Fri, 25 Jan 2013 16:50:05 +0000 (16:50 -0000)]
Remove non ASCII character

svn path=/trunk/; revision=47273

11 years agoDissect Broadcast-Message-Content correctly.
Anders Broman [Fri, 25 Jan 2013 15:29:19 +0000 (15:29 -0000)]
Dissect Broadcast-Message-Content correctly.

svn path=/trunk/; revision=47272

11 years agoFrom Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8258 :
Pascal Quantin [Fri, 25 Jan 2013 14:10:09 +0000 (14:10 -0000)]
From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8258 :
HomePlugAV dissector: improve device ID decoding

svn path=/trunk/; revision=47271

11 years agoFix dissection of path ["/" session-id] is optional.
Anders Broman [Fri, 25 Jan 2013 09:08:24 +0000 (09:08 -0000)]
Fix dissection of path ["/" session-id] is optional.

svn path=/trunk/; revision=47270

11 years agoFix the temp file description. Wwhen capturing on multiple interface, pcapng is...
Chris Maynard [Fri, 25 Jan 2013 04:07:35 +0000 (04:07 -0000)]
Fix the temp file description.  Wwhen capturing on multiple interface, pcapng is implied so the file format is not included as part of the temp file name.

svn path=/trunk/; revision=47269

11 years agoUpdate the description of the temporary file name.
Chris Maynard [Fri, 25 Jan 2013 03:48:55 +0000 (03:48 -0000)]
Update the description of the temporary file name.

svn path=/trunk/; revision=47268

11 years agoAdd new query types, options and message types for DHCPv6 Bulk Leasequery protocol...
Michael Mann [Fri, 25 Jan 2013 03:40:53 +0000 (03:40 -0000)]
Add new query types, options and message types for DHCPv6 Bulk Leasequery protocol.  Also enforce message rules in RFC 5460 section 4 through expert_info

Part of bug 8172 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8172)

svn path=/trunk/; revision=47267

11 years agoUse pinfo-scoped memory for mtp3 addresses.
Evan Huus [Fri, 25 Jan 2013 00:28:48 +0000 (00:28 -0000)]
Use pinfo-scoped memory for mtp3 addresses.

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

svn path=/trunk/; revision=47266

11 years agoFrom Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8166
Evan Huus [Fri, 25 Jan 2013 00:18:10 +0000 (00:18 -0000)]
From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8166

properly dissect the 0x6048 and 0x6038 frames with HomePlug AV 1.1

svn path=/trunk/; revision=47265

11 years agoAdd back the X11 substitutes.
Gerald Combs [Thu, 24 Jan 2013 23:50:01 +0000 (23:50 -0000)]
Add back the X11 substitutes.

svn path=/trunk/; revision=47264

11 years agoClean up font initialization a bit.
Gerald Combs [Thu, 24 Jan 2013 23:42:34 +0000 (23:42 -0000)]
Clean up font initialization a bit.

svn path=/trunk/; revision=47263

11 years agoUse ws_gtk_grid...() in place of gtk_table...().
Bill Meier [Thu, 24 Jan 2013 21:21:51 +0000 (21:21 -0000)]
Use ws_gtk_grid...() in place of gtk_table...().

This completes the process of replacing
     Wireshark gtk_table...() usage !!

(However: the prefs dialogs still have a few Gtk3
          related Expand/Fill issues which need to be fixed).

svn path=/trunk/; revision=47262

11 years agoSeparate Time Shift item from Time Reference items. From Cal Turney via
Chris Maynard [Thu, 24 Jan 2013 20:06:20 +0000 (20:06 -0000)]
Separate Time Shift item from Time Reference items.  From Cal Turney via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8176 with qt change from me.

svn path=/trunk/; revision=47261

11 years agoUse ws_gtk_grid...() in place of gtk_table...();
Bill Meier [Thu, 24 Jan 2013 18:28:31 +0000 (18:28 -0000)]
Use ws_gtk_grid...() in place of gtk_table...();

Also: minor cleanup:
- use gtk_window_set_default_size() iso gtk_window_resize();
- change grid row numbers to start at 0 (not 1);
- fix some formatting/whitespace.

svn path=/trunk/; revision=47260

11 years agoUpdate WiresharkXML.py to work with Python 2.7.
Gilbert Ramirez [Thu, 24 Jan 2013 18:16:32 +0000 (18:16 -0000)]
Update WiresharkXML.py to work with Python 2.7.

svn path=/trunk/; revision=47259

11 years agoAdd support for HFI and infiniband interfaces in AIX iptrace files.
Gilbert Ramirez [Thu, 24 Jan 2013 18:08:25 +0000 (18:08 -0000)]
Add support for HFI and infiniband interfaces in AIX iptrace files.

svn path=/trunk/; revision=47258

11 years agoFrom Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8166
Evan Huus [Thu, 24 Jan 2013 16:23:15 +0000 (16:23 -0000)]
From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8166

Fixes for decoding HPAV-1.1 Network Info Request/Confirmation

From me: minor whitespace cleanup.

svn path=/trunk/; revision=47257

11 years agoFix H.460.9 numbers of parameters
Tomas Kukosa [Thu, 24 Jan 2013 11:54:18 +0000 (11:54 -0000)]
Fix H.460.9 numbers of parameters

svn path=/trunk/; revision=47256

11 years agoFix warning: cast to pointer from integer of different size
Pascal Quantin [Thu, 24 Jan 2013 10:36:51 +0000 (10:36 -0000)]
Fix warning: cast to pointer from integer of different size
While we are at it, restore the private data if no private extension dissector is not found (seems to be the right thing to do)

svn path=/trunk/; revision=47255

11 years agoAdd missing newline at end of file
Pascal Quantin [Thu, 24 Jan 2013 10:14:37 +0000 (10:14 -0000)]
Add missing newline at end of file

svn path=/trunk/; revision=47254

11 years agoFix H.460.x calling from H.225 - content decoding
Tomas Kukosa [Thu, 24 Jan 2013 10:11:02 +0000 (10:11 -0000)]
Fix H.460.x calling from H.225 - content decoding

svn path=/trunk/; revision=47253

11 years agoFrom Katrina Zhang sligtly modified.
Anders Broman [Thu, 24 Jan 2013 09:59:06 +0000 (09:59 -0000)]
From Katrina Zhang sligtly modified.
- Add dissection of Selected PLMN ID.
- Put enterpice id in the tree
- Filter for UTRAN Transparent Field.

svn path=/trunk/; revision=47252

11 years agoFrom Katrina Zhang sligtly modified.
Anders Broman [Thu, 24 Jan 2013 09:56:28 +0000 (09:56 -0000)]
From Katrina Zhang sligtly modified.
- Correct dissection of 8.50 Selected PLMN ID.
- Pass Instance to private extension dissectors.

svn path=/trunk/; revision=47251

11 years agoAdd sGSNPLMNIDChange
Anders Broman [Thu, 24 Jan 2013 09:53:57 +0000 (09:53 -0000)]
Add sGSNPLMNIDChange

svn path=/trunk/; revision=47250

11 years agoUpdate my email address in AUTHORS
Balint Reczey [Thu, 24 Jan 2013 09:40:17 +0000 (09:40 -0000)]
Update my email address in AUTHORS

svn path=/trunk/; revision=47249

11 years agoPrevent copying longer than expected NTLM SSP key
Balint Reczey [Thu, 24 Jan 2013 09:34:54 +0000 (09:34 -0000)]
Prevent copying longer than expected NTLM SSP key

svn path=/trunk/; revision=47248

11 years agoFrom Manuel Hofer: Dissector for the OpenVPN Protocol
Bill Meier [Thu, 24 Jan 2013 04:26:46 +0000 (04:26 -0000)]
From Manuel Hofer: Dissector for the OpenVPN Protocol

 As part of a semster project in our 3rd semester of
 "secure information systems" at the university of
 applied sciences upper austria, we built a wireshark
 dissector for the OpenVPN protocol.

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

From me:
 Rework reassembly code and tree display of
  message fragments and reassembled messages.
 Fix various bugs and do some cleanup.

Also: Do minor whitespace changes in AUTHORS.

svn path=/trunk/; revision=47247

11 years agoTry making dataCodingScheme a guint32 to quiet the MacOS buildbots.
Jeff Morriss [Thu, 24 Jan 2013 02:28:12 +0000 (02:28 -0000)]
Try making dataCodingScheme a guint32 to quiet the MacOS buildbots.

svn path=/trunk/; revision=47244

11 years agoTry not including radius/Custom.make in radius_DATA: I think including it means it...
Jeff Morriss [Thu, 24 Jan 2013 02:26:43 +0000 (02:26 -0000)]
Try not including radius/Custom.make in radius_DATA: I think including it means it gets distributed. (Anyway it's needed for building, it doesn't need to be installed.)

svn path=/trunk/; revision=47243

11 years agoAdd newline at end of file (to try to get dist's working again)
Jeff Morriss [Thu, 24 Jan 2013 01:57:00 +0000 (01:57 -0000)]
Add newline at end of file (to try to get dist's working again)

svn path=/trunk/; revision=47242

11 years agoDelete duplicated word, "you".
Chris Maynard [Thu, 24 Jan 2013 01:39:59 +0000 (01:39 -0000)]
Delete duplicated word, "you".

svn path=/trunk/; revision=47241

11 years agoAdd font and color preferences. Unfortunately Qt doesn't have a color
Gerald Combs [Thu, 24 Jan 2013 01:10:12 +0000 (01:10 -0000)]
Add font and color preferences. Unfortunately Qt doesn't have a color
picker widget so we're back to popping up dialogs. Move the contents of
monospace_font.{cpp,h} to wireshark_application.{cpp,h}.

Pango and Qt use completely different string representations for fonts.
Add a separate gui.qt.font_name preference so that they don't clobber
each other.

svn path=/trunk/; revision=47240

11 years agoAs requested:
Jeff Morriss [Wed, 23 Jan 2013 22:34:25 +0000 (22:34 -0000)]
As requested:

https://www.wireshark.org/lists/wireshark-dev/201301/msg00102.html

Delete Pavel Roskin (his contribution, in r7183, mentions his name already).

svn path=/trunk/; revision=47239

11 years agoAs requested:
Jeff Morriss [Wed, 23 Jan 2013 22:30:37 +0000 (22:30 -0000)]
As requested:

https://www.wireshark.org/lists/wireshark-dev/201301/msg00101.html

Modify Gisle Vanem's email address.

svn path=/trunk/; revision=47238

11 years agoSet MIME type
Jeff Morriss [Wed, 23 Jan 2013 22:29:09 +0000 (22:29 -0000)]
Set MIME type

svn path=/trunk/; revision=47237

11 years agoAllow dissection of several segmented warning messages in parallel
Pascal Quantin [Wed, 23 Jan 2013 21:55:07 +0000 (21:55 -0000)]
Allow dissection of several segmented warning messages in parallel

svn path=/trunk/; revision=47236

11 years agoPer Nathan's request on -dev, update this author's e-mail address.
Chris Maynard [Wed, 23 Jan 2013 21:22:22 +0000 (21:22 -0000)]
Per Nathan's request on -dev, update this author's e-mail address.
Ref: http://www.wireshark.org/lists/wireshark-dev/201301/msg00099.html

svn path=/trunk/; revision=47235

11 years agoUsage formatting changes:
Chris Maynard [Wed, 23 Jan 2013 21:16:42 +0000 (21:16 -0000)]
Usage formatting changes:
-> Wrap all text at column 80
-> Reference http://www.tcpdump.org/linktypes.html instead of net/bpf.h
-> Other misc. wording changes.

svn path=/trunk/; revision=47234

11 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8216 :
Pascal Quantin [Wed, 23 Jan 2013 20:50:18 +0000 (20:50 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8216 :
Add basic dissection of UTF8String type in ASN.1 PER dissector

svn path=/trunk/; revision=47233

11 years agoUpdate our column information even if we don't have a capture file loaded.
Gerald Combs [Wed, 23 Jan 2013 19:28:08 +0000 (19:28 -0000)]
Update our column information even if we don't have a capture file loaded.

svn path=/trunk/; revision=47232

11 years agoAdd column preferences.
Gerald Combs [Wed, 23 Jan 2013 19:04:36 +0000 (19:04 -0000)]
Add column preferences.

svn path=/trunk/; revision=47231

11 years agomm_context_used_cipher is 3 bits.
Anders Broman [Wed, 23 Jan 2013 15:56:29 +0000 (15:56 -0000)]
mm_context_used_cipher is 3 bits.

svn path=/trunk/; revision=47230

11 years agosvn path=/trunk/; revision=47229
Anders Broman [Wed, 23 Jan 2013 15:40:32 +0000 (15:40 -0000)]
svn path=/trunk/; revision=47229

11 years agoActually add the SKT.xml
Anders Broman [Wed, 23 Jan 2013 15:16:15 +0000 (15:16 -0000)]
Actually add the SKT.xml

svn path=/trunk/; revision=47228

11 years agoAdd an SKT.xml file.
Anders Broman [Wed, 23 Jan 2013 14:50:57 +0000 (14:50 -0000)]
Add an SKT.xml file.

svn path=/trunk/; revision=47227

11 years agoMissing space?
Anders Broman [Wed, 23 Jan 2013 14:40:17 +0000 (14:40 -0000)]
Missing space?

svn path=/trunk/; revision=47226

11 years agosvn path=/trunk/; revision=47225
Anders Broman [Wed, 23 Jan 2013 13:12:38 +0000 (13:12 -0000)]
svn path=/trunk/; revision=47225

11 years agoMake it possible to add custom radius dictionaries. Top Makefile.am needs more modifi...
Anders Broman [Wed, 23 Jan 2013 12:08:15 +0000 (12:08 -0000)]
Make it possible to add custom radius dictionaries. Top Makefile.am needs more modifications to include the file in the tarball.

svn path=/trunk/; revision=47224

11 years agoFix for CID 280286:
Jaap Keuter [Wed, 23 Jan 2013 06:11:18 +0000 (06:11 -0000)]
Fix for CID 280286:
Take negative value into account, avoid all casting in the process.

svn path=/trunk/; revision=47223

11 years agoConvert the strict allocator to use a hash table similarly to the simple
Evan Huus [Wed, 23 Jan 2013 02:31:04 +0000 (02:31 -0000)]
Convert the strict allocator to use a hash table similarly to the simple
allocator, allowing it to implement realloc and free.

svn path=/trunk/; revision=47222

11 years agoRun epan_cleanup after printing the version information in tshark,
Evan Huus [Wed, 23 Jan 2013 02:30:15 +0000 (02:30 -0000)]
Run epan_cleanup after printing the version information in tshark,
as it makes the results of ./tools/valgrind-wireshark.sh -n
much more interesting and useful.

svn path=/trunk/; revision=47221

11 years agoHandle NULL-pointers and 0-lengths in a much simpler allocator-agnostic way,
Evan Huus [Wed, 23 Jan 2013 01:11:36 +0000 (01:11 -0000)]
Handle NULL-pointers and 0-lengths in a much simpler allocator-agnostic way,
and document the fact that allocator authors don't have to care.

svn path=/trunk/; revision=47220

11 years agoAdd wrapper functions for realloc, free and gc, but don't expose them in the
Evan Huus [Wed, 23 Jan 2013 00:59:38 +0000 (00:59 -0000)]
Add wrapper functions for realloc, free and gc, but don't expose them in the
header yet as not all allocators implement them.

svn path=/trunk/; revision=47219

11 years agoTry to fix dissection of GSM protocol family broken by r47209.
Pascal Quantin [Tue, 22 Jan 2013 23:25:44 +0000 (23:25 -0000)]
Try to fix dissection of GSM protocol family broken by r47209.
Using val_to_str seemed to be a good idea, but most value_string arrays were not properly filled or were using hacks.
(I hope I got everything right...)

svn path=/trunk/; revision=47218

11 years agoFix for CID 761911-761984 and CID 761985-761994.
Jaap Keuter [Tue, 22 Jan 2013 22:07:44 +0000 (22:07 -0000)]
Fix for CID 761911-761984 and CID 761985-761994.
Try to convince Coverity that the passed in item pointer is appreciated,
but not used.
This time see if it pleases the Windows compiler too.

svn path=/trunk/; revision=47217

11 years agoFix a typo in a comment;
Bill Meier [Tue, 22 Jan 2013 20:55:54 +0000 (20:55 -0000)]
Fix a typo in a comment;
Do some minor whitespace & etc cleanup.

svn path=/trunk/; revision=47216

11 years agoMore fixes for handling of NULL-pointers and 0-lengths in calls to
Evan Huus [Tue, 22 Jan 2013 18:46:35 +0000 (18:46 -0000)]
More fixes for handling of NULL-pointers and 0-lengths in calls to
malloc/realloc/free.

svn path=/trunk/; revision=47215

11 years agoGTK+:
Gerald Combs [Tue, 22 Jan 2013 18:27:18 +0000 (18:27 -0000)]
GTK+:

Get rid of user-hostile behavior. In the layout preferences pane 2 & 3
radio buttons overrode the user's selection if a duplicate item was
selected. Now we assume that the user knows what he or she is doing and
steal duplicate selections from the other panes.

Qt:

Match the new GTK+ behavior in the layout preferences. Add padding
around the layout images. Add toolbar style preferences to the
Appearance pane (instead of the layout pane).

All:

Remove the selection mode and scrollbar placement prefs and mark them
obsolete as recently discussed on -dev.

Adjust the layout images yet again after more Awful Monitor Testing.

svn path=/trunk/; revision=47214

11 years agoFix VS Studio Analysis warning C6244: Local declaration of 'iftype' hides previous...
Chris Maynard [Tue, 22 Jan 2013 17:31:07 +0000 (17:31 -0000)]
Fix VS Studio Analysis warning C6244: Local declaration of 'iftype' hides previous declaration at line '1046'

svn path=/trunk/; revision=47213

11 years ago#include <epan/reassemble.h> not needed.
Bill Meier [Tue, 22 Jan 2013 15:55:59 +0000 (15:55 -0000)]
#include <epan/reassemble.h> not needed.

svn path=/trunk/; revision=47212

11 years agoCreate/use extended value-string;
Bill Meier [Tue, 22 Jan 2013 15:38:55 +0000 (15:38 -0000)]
Create/use extended value-string;
Add editor modelines;
Do minor whitespace, long lines, and etc cleanup.

svn path=/trunk/; revision=47211

11 years agosvn path=/trunk/; revision=47210
Anders Broman [Tue, 22 Jan 2013 08:28:46 +0000 (08:28 -0000)]
svn path=/trunk/; revision=47210

11 years agoFix for CID 717414-717435.
Jaap Keuter [Tue, 22 Jan 2013 07:18:20 +0000 (07:18 -0000)]
Fix for CID 717414-717435.
Never ever access a string in a value string by its array index.
Use the proper access functions (val_to_str[_ext] and friends).

Also: make clean compile, so move out of dirty dissectors.

svn path=/trunk/; revision=47209

11 years agoRevert 47201 it does not compile on Windows.
Anders Broman [Tue, 22 Jan 2013 07:05:39 +0000 (07:05 -0000)]
Revert 47201 it does not compile on Windows.

svn path=/trunk/; revision=47208

11 years ago2.24.5 is not 2.24.25. HTH.
Guy Harris [Tue, 22 Jan 2013 06:10:05 +0000 (06:10 -0000)]
2.24.5 is not 2.24.25.  HTH.

svn path=/trunk/; revision=47207

11 years agoRename MACOSX_VERSION to DARWIN_MAJOR_VERSION to reflect what it
Guy Harris [Tue, 22 Jan 2013 05:07:23 +0000 (05:07 -0000)]
Rename MACOSX_VERSION to DARWIN_MAJOR_VERSION to reflect what it
actually is (it's not an OS X version number, e.g. 10.7 for Leopard,
it's a Darwin version number, e.g. 9 for Leopard).  Add comments before
checks to indicate what we're checking for.

Put in a big long comment giving details about the issues I ran into
when trying to make this work on Leopard.

Fail if you try to run this on anything before Snow Leopard - note that
I said "trying" in the previous comment, and, yes, it was a very trying
experience....

Bump the libpng version - 1.5.12 isn't available any more.

Add some comments explaining why the code for Leopard was downloading
and installing libpng and libpixman.

Add some code to handle packages where older versions weren't compressed
with xz and newer versions were.

Add a hack to avoid finding the version of libpng that comes with X11
when trying to build Cairo on Leopard.

svn path=/trunk/; revision=47206

11 years agoUpdate the FeliCa dissector to identify FeliCa Standard commands
Michael Mann [Tue, 22 Jan 2013 04:29:37 +0000 (04:29 -0000)]
Update the FeliCa dissector to identify FeliCa Standard commands
From Tyson Key, bug 8243 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8243)

svn path=/trunk/; revision=47205