Commit Graph

41048 Commits

Author SHA1 Message Date
Gerald Combs bcb021c25f Define STAGING_DIR and use it in various places instead of hard-coding
"..\.." or "..\..\wireshark-gtk2".

svn path=/trunk/; revision=43239
2012-06-13 21:03:54 +00:00
Gerald Combs c548b1097f Use terminology that conforms better with the MSDN documentation and a
style that conforms better with the rest of the NSIS output.

svn path=/trunk/; revision=43237
2012-06-13 20:11:41 +00:00
Gerald Combs a9cb4061d4 Move the "uninstall" parts of wireshark.nsi to uninstall.nsi and the
common parts to common.nsh. Creating an installer now requires two
NSIS runs:

  - uninstaller.nsi, which creates an installer (uninstall_installer.exe)
    that only writes uninstall.exe to ../../wireshark-gtk2.

  - wireshark.nsi, which bundles uninstall.exe along with the rest of
    our installation files.

If we ever get around to signing our executables this will let us sign
all of them. It also cleans up the .nsi file contents a bit.

Instead of keeping separate list of file extensions, manage them from
a single macro. Print the extensions we register / deregister in the
detail pane.

svn path=/trunk/; revision=43236
2012-06-13 19:06:27 +00:00
Jeff Morriss 75972ddcd9 Mark a couple of parameters as unused.
svn path=/trunk/; revision=43235
2012-06-13 17:25:16 +00:00
Bill Meier 0ec00075ef Add a comment as to .bsc files seemingly not usable with VS2010.
svn path=/trunk/; revision=43234
2012-06-13 16:44:06 +00:00
Bill Meier d0868be051 Add '*.sbr' to 'clean'
svn path=/trunk/; revision=43233
2012-06-13 16:19:35 +00:00
Bill Meier db25589d90 Add a comment as to .bsc files seemingly not usable with VS2010.
svn path=/trunk/; revision=43232
2012-06-13 16:18:38 +00:00
Anders Broman d2d882e4b1 From Michael Mann:
length bugfix + proto_tree_add_text() cleanup

Fixed the Web-Cache Identity Info dissection.  Also converted many of the
proto_tree_add_text() to "more filterable" APIs.

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

svn path=/trunk/; revision=43231
2012-06-13 15:27:41 +00:00
Jeff Morriss f00c8309af From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3317
Add SSL/TLS support to the POP dissector (functionality copied from the
SMTP dissector).

svn path=/trunk/; revision=43230
2012-06-13 14:56:33 +00:00
Bill Meier a519001f02 wireshark.bsc dependencies: fix a typo; add 2 which are missing.
svn path=/trunk/; revision=43229
2012-06-13 14:42:30 +00:00
Jeff Morriss 4fdc3c3cc2 Create, and start using, file name preferences.
File name preferences are basically just string preferences except that the
GUI will present a "Browse" button that allows the user to go and find the
file s/he wants (rather than having to blindly type in the full path).

svn path=/trunk/; revision=43228
2012-06-13 01:13:12 +00:00
Pascal Quantin f0a74f3a5c Upgrade GSM BSSMAP dissection to Release 9 (V9.8.0)
svn path=/trunk/; revision=43227
2012-06-12 21:36:55 +00:00
Bill Meier 1b17369504 Fix: code under 'if(tree)' (in)directly calls sub-dissector/col_...()/expert...() fcns
svn path=/trunk/; revision=43226
2012-06-12 21:22:46 +00:00
Bill Meier 5b53b81835 Note that calls to "expert" functions should not be under 'if (tree)'.
svn path=/trunk/; revision=43224
2012-06-12 13:03:05 +00:00
Jörg Mayer f679b89649 Revert r41952
BACKPORT to 1.8

svn path=/trunk/; revision=43222
2012-06-12 10:44:57 +00:00
Jörg Mayer 9228ece476 Manually revert r41953
BACKPORT to 1.8

svn path=/trunk/; revision=43221
2012-06-12 10:38:22 +00:00
Bill Meier 4f47eefa79 Fix bugs and other issues:
- remove 'if (tree)' around code which (eventually) calls col_...() functions;
- remove unneeded check_col() usage;
- use extended value-strings where appropriate;
- use col_set_str() instead of col_add_fstr();
- fix mismatch between proto_tree_add_item() size arg and the FT type in the
   referenced hf[] entry (in a few cases);
- FT_STRING fields should have ENC_ASCII|ENC_NA as the 'encoding' arg
   in the corresponding proto_tree_add_item() call;
- do whitespace cleanup.

Note: 1 issue remains:
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7260#c12


svn path=/trunk/; revision=43217
2012-06-11 20:51:47 +00:00
Bill Meier bdebbb9bdf Re-order 2 value_string arrays so that entries are in ascending order by value.
svn path=/trunk/; revision=43216
2012-06-11 20:35:00 +00:00
Pascal Quantin aa0ebee47c From Alexander via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7361 :
Add BSS supported Codec list dissection to Assigment Complete message

svn path=/trunk/; revision=43215
2012-06-11 20:28:31 +00:00
Pascal Quantin 653f74bfcf From Alexander via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7360 :
Service handover IE is not correctly dissected

svn path=/trunk/; revision=43214
2012-06-11 20:12:17 +00:00
Jeff Morriss 41242190b0 Prohibit strtod() (as per r 43212).
Replace tabs with spaces (for consistency).

svn path=/trunk/; revision=43213
2012-06-11 19:42:05 +00:00
Jakub Zawadzki 804ba9bbc1 Fix bug 6917
strtod() is locale-aware, change it to g_ascii_strtod()

svn path=/trunk/; revision=43212
2012-06-11 19:27:57 +00:00
Bill Meier 5e3066f006 Use dscp_vals_ext everyplace (instead of dscp_vals);
(dscp_vals is now a static array in packet-ip.c)

svn path=/trunk/; revision=43211
2012-06-11 19:07:53 +00:00
Bill Meier 70cc6362fe Don't define value_string arrays in a .h file (included in multiple places).
Also:
 - don't use val_to_str_const() with a "format" default string;
 - rename 'opt_len_type' enumeration  identifiers to be less generic.

svn path=/trunk/; revision=43210
2012-06-11 18:47:42 +00:00
Bill Meier afab63c34c Fix another compiler warning
svn path=/trunk/; revision=43209
2012-06-11 16:53:49 +00:00
Bill Meier 332f743f6c Fix a compiler warning
svn path=/trunk/; revision=43208
2012-06-11 16:44:42 +00:00
Bill Meier 8469651f54 General cleanup:
- remove some redundant code;
- use ep_strdup_printf() instead of g_snprintf() to a static buffer;
- create and use extended-value-strings as appropriate;
- define a value_string array as static (not as an automatic);
- use val_to_str_const() instead of val_to_str() as appropriate;
- reformat hf[] array entries;
- do general formatting cleanup;
- do whitespace cleanup (e.g., indentation & 4-space tabs).

svn path=/trunk/; revision=43207
2012-06-11 16:33:56 +00:00
Jeff Morriss 7e2963943c S9 AVPs start at 2200.
svn path=/trunk/; revision=43205
2012-06-11 16:05:38 +00:00
Bill Meier df07bfeba4 Create dscp_vals_ext value_str_ext (based upon dscp_vals); Use it as appropriate.
Also:
 - use val_to_str_const() [instead of val_to_str()] in a few cases;
 - do some trivial formatting cleanup.

svn path=/trunk/; revision=43204
2012-06-11 15:47:50 +00:00
Pascal Quantin a923c28ede Use restricted character string decoding for IA5String type
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6246

svn path=/trunk/; revision=43203
2012-06-11 13:54:06 +00:00
Pascal Quantin 3be09ce941 Add TGPPS9.xml to makefile and NSIS installer
svn path=/trunk/; revision=43202
2012-06-11 13:48:11 +00:00
Pascal Quantin 40d4144689 From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7357 :
Fix memory corruption in base64 introduced in revision 43196

svn path=/trunk/; revision=43201
2012-06-11 12:38:06 +00:00
Anders Broman 4f2c3a8e86 len is no longer used.
svn path=/trunk/; revision=43200
2012-06-11 08:07:48 +00:00
Anders Broman 3de0578f89 Add a reference to TGPPS9.xml update a couple of AVP:s while at it.
svn path=/trunk/; revision=43199
2012-06-11 07:48:14 +00:00
Anders Broman ec86463ac1 From Evan Huus:
Airpcap memory leak.

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

svn path=/trunk/; revision=43198
2012-06-11 07:14:52 +00:00
Anders Broman 8456dcbceb From Michael Mann:
Implemented RFC 4954 within the SMTP dissector.  On principle, the decryption
is disabled by default (making this feature not obviously present). However I
don't think there will ever be enough data that the performance would be an
issue if the default was changed.

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

svn path=/trunk/; revision=43197
2012-06-11 07:10:18 +00:00
Anders Broman 34cb6f96d3 From Michael Mann:
NUL terminate the decoded string.  
Updated only dissector that uses epan_base64_decode() (packet-http.c) to assume
NULL termination.

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

svn path=/trunk/; revision=43196
2012-06-11 07:09:11 +00:00
Chris Maynard 5cbccb3ead Expand the item regarding displayed packets, rather than all packets, as being the default when saving to also include exporting and printing as well.
svn path=/trunk/; revision=43195
2012-06-11 03:51:47 +00:00
Bill Meier 7b94cadffd From Evan Huus: Missing breaks in packet-rsvp.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7353

svn path=/trunk/; revision=43194
2012-06-11 03:36:04 +00:00
Chris Maynard e9b173b306 Set the default for printing or exporting packets to displayed packets only.
svn path=/trunk/; revision=43193
2012-06-11 02:43:16 +00:00
Bill Meier ec84ce59b5 From Evan Huus: Unnecessary branch in dfvm.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7354

svn path=/trunk/; revision=43192
2012-06-11 02:09:48 +00:00
Chris Maynard 7c7856d41b Remove duplicate entry.
svn path=/trunk/; revision=43191
2012-06-11 00:53:23 +00:00
Jakub Zawadzki 2252800809 Missing proto_tree_model.c in CMakeLists (r43189 for cmake)
svn path=/trunk/; revision=43190
2012-06-10 22:35:48 +00:00
Jakub Zawadzki f372010ee8 Custom model for packet details
Original patch tracked in bug #7224

svn path=/trunk/; revision=43189
2012-06-10 22:07:54 +00:00
Jakub Zawadzki a2bb94c3b3 Clear GtkTreeStore before freeing edt
When building current data for packet details treeview we store two things.
- Generated string with item label
- Pointer to node field_info structure

After epan_dissect_{free, cleanup} pointer to field_info node is no longer
valid so we should clear GtkTreeStore before freeing.

svn path=/trunk/; revision=43188
2012-06-10 22:03:17 +00:00
Chris Maynard 339bedb75c Fix UDP-Lite checksum verification bug introduced with r40387 and reported by "answer" via http://ask.wireshark.org/questions/11798/is-udp-lite-checksum-correct-ipv6
There is a difference between the UDP and UDP-Lite pseudo header that wasn't realized when r40387 was committed.  Details of the difference in http://tools.ietf.org/html/rfc3828#section-3.2

svn path=/trunk/; revision=43187
2012-06-10 19:43:40 +00:00
Bill Meier 08807fc48d Fix "BASE_CUSTOM field is incorrectly formatted when applied as a column".
Resolves Bug #6671 - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6671

svn path=/trunk/; revision=43186
2012-06-10 19:23:50 +00:00
Chris Maynard ebe8ed3a3e Fix the other part of Coverity CID 703086. I thought I got it with r42798, but apparently that was only 1/2 the fix as sometimes they group more than one bug into a single CID.
svn path=/trunk/; revision=43185
2012-06-10 19:02:03 +00:00
Bill Meier 2968fcffa8 Fix bug wherein values in a custom column aren't displayed as a value_string (when appropriate).
Essentially: BASE_CUSTOM is "base_display_e value" (like BASE_DEC) *not* a bit-mask
 (like BASE_EXT_STRING).
Bug introduced in SVN #39902

svn path=/trunk/; revision=43184
2012-06-10 15:10:11 +00:00
Gerald Combs 50c79570bd [Automatic manuf, services and enterprise-numbers update for 2012-06-10]
svn path=/trunk/; revision=43183
2012-06-10 14:03:31 +00:00