Stefan Metzmacher [Thu, 27 Aug 2009 08:29:12 +0000 (10:29 +0200)]
support for des key netlogon schannel
metze
Matthieu Patou [Mon, 27 Jul 2009 08:58:01 +0000 (10:58 +0200)]
patch_ntlm_260709
Matthieu Patou [Mon, 27 Jul 2009 08:57:09 +0000 (10:57 +0200)]
patch_netlogon_260709
Stefan Metzmacher [Sat, 25 Jul 2009 08:23:26 +0000 (10:23 +0200)]
MIT krb5-1.6 HACK patch
metze
Stefan Metzmacher [Sat, 25 Jul 2009 08:08:29 +0000 (10:08 +0200)]
Revert "non-working HACKS: try to manually decrypt aes wrapped blobs"
This reverts commit
30e69148103d31c5453e3e7e256f7deb96b506a9.
Stefan Metzmacher [Sat, 25 Jul 2009 08:06:37 +0000 (10:06 +0200)]
non-working HACKS: try to manually decrypt aes wrapped blobs
This is needed because in DCERPC header signing is sometimes used.
and the krb5_c_decrypt() would fail because the signature is wrong.
metze
Stefan Metzmacher [Thu, 27 Aug 2009 08:51:34 +0000 (10:51 +0200)]
packet-spnego: fix decryption of DCERPC packets in decrypt_gssapi_krb_cfx_wrap()
There the checksum and the encrypted data are no 2 different buffers
and we need to combine them before we try to rotate and decrypt them.
metze
Stefan Metzmacher [Tue, 9 Jun 2009 10:51:52 +0000 (12:51 +0200)]
smb2 compound..
Stefan Metzmacher [Mon, 14 Sep 2009 23:54:18 +0000 (01:54 +0200)]
packet-dcerpc-nt.c: fix a crash bug
metze
Stefan Metzmacher [Tue, 5 Aug 2008 13:37:29 +0000 (15:37 +0200)]
dummy fix the build for me
metze
stig [Sun, 27 Sep 2009 21:28:52 +0000 (21:28 +0000)]
Fix a possible dereference of null pointer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30177
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 27 Sep 2009 21:26:29 +0000 (21:26 +0000)]
Fix a possible dereference of null pointer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30176
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 27 Sep 2009 21:23:51 +0000 (21:23 +0000)]
Fix a possible dereference of null pointer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30175
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Sun, 27 Sep 2009 21:18:18 +0000 (21:18 +0000)]
Fix a possible dereference of null pointer when having no tree.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30174
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 27 Sep 2009 15:03:30 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2009-09-27]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30171
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 11:48:13 +0000 (11:48 +0000)]
Delete log files from test runs that were succesful
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30170
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 11:05:59 +0000 (11:05 +0000)]
* Redirect stdout/stderr to temporary files
* Do file comparison on stdout/stderr output
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30169
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 09:48:46 +0000 (09:48 +0000)]
Start implementing 'compare against baseline'. When fully implemented we'll be able to compare any changes that we've made to the working directory against a clean/baseline version of tshark.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30168
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 09:03:26 +0000 (09:03 +0000)]
Add support for running tshark (-d) on a set of files matching a certains protocols (--list-all-proto-files). The index file is used to search for the files matching the given protocol(s)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30167
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 07:13:48 +0000 (07:13 +0000)]
Look for both tshark and tshark.exe
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30166
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 06:41:20 +0000 (06:41 +0000)]
Free capture filename on shutdown
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30165
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 05:48:04 +0000 (05:48 +0000)]
Introduce print_stream_ps_alloc() and start using it
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30164
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 05:25:42 +0000 (05:25 +0000)]
Introduce print_stream_text_alloc() and start using it
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30163
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 04:52:34 +0000 (04:52 +0000)]
(Cosmetic) Reorder so that the failure message output handler appear in succession
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30162
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 03:51:17 +0000 (03:51 +0000)]
Remove tpg from configure. It's not ready to be built by the masses
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30161
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Sat, 26 Sep 2009 03:48:04 +0000 (03:48 +0000)]
Add option to dump all files containing a protocol (possibly a comma delimited list of protocols)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30160
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 25 Sep 2009 21:55:39 +0000 (21:55 +0000)]
Treat 13 as if it came from OpenBSD except on BSD/OS, so that if there
are any BSD/OS users still out there using Wireshark to read RFC 1483
ATM captures from BSD/OS, they can still do so, but all other users get
to read OpenBSD DLT_ENC captures, not just users *on* OpenBSD.
That also lets us simplify some hacks to deal with a link-layer type of
13 on Nokia IPSO captures.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30159
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 25 Sep 2009 21:29:36 +0000 (21:29 +0000)]
The data sources can be used even if the protocol tree isn't being built
or isn't visible.
Clean up some indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30158
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Fri, 25 Sep 2009 21:12:34 +0000 (21:12 +0000)]
Set the usual properties + executable:
Name: svn:executable
+ *
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30157
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Fri, 25 Sep 2009 21:01:28 +0000 (21:01 +0000)]
Handle keyboard interrupts gracefully
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30156
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Fri, 25 Sep 2009 20:50:51 +0000 (20:50 +0000)]
* Cleanup print
* Remove timeout (this wasn't correctly implemented)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30155
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 25 Sep 2009 20:05:16 +0000 (20:05 +0000)]
Until we either supply "yapp" or put "yapp" into the list of tools you
need to install, don't include in Wireshark anything that requires "yapp".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30154
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Fri, 25 Sep 2009 19:41:54 +0000 (19:41 +0000)]
Use timeout to keep the file progress printing smooth
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30153
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Fri, 25 Sep 2009 19:02:32 +0000 (19:02 +0000)]
Use apply_async and print out file progress in the parent process
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30152
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 25 Sep 2009 18:09:42 +0000 (18:09 +0000)]
Try to add tpg, but it seems it doesn't build with autofoo either.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30151
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Fri, 25 Sep 2009 17:47:25 +0000 (17:47 +0000)]
Refactoring: add find_capture_files()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30150
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Fri, 25 Sep 2009 17:43:01 +0000 (17:43 +0000)]
Add option to dump all files in index file
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30149
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Fri, 25 Sep 2009 17:28:53 +0000 (17:28 +0000)]
Add option to dump all protocols in index file
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30148
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Fri, 25 Sep 2009 17:03:44 +0000 (17:03 +0000)]
* Handle some error path more gracefully
* Add more verbose output
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30147
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Fri, 25 Sep 2009 15:41:17 +0000 (15:41 +0000)]
Use pickle to store the results into the index file
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30146
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 25 Sep 2009 15:29:15 +0000 (15:29 +0000)]
Forgot to commit the unistim cmakefile
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30145
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 25 Sep 2009 15:17:45 +0000 (15:17 +0000)]
Fix build of make and asn1 plugins.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30144
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Fri, 25 Sep 2009 15:02:57 +0000 (15:02 +0000)]
Add initial multiprocessing support
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30143
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 25 Sep 2009 14:53:56 +0000 (14:53 +0000)]
wslua now builds, links and installs.
Enable it by default.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30142
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Fri, 25 Sep 2009 12:50:03 +0000 (12:50 +0000)]
Removed some duplicate libraries.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30141
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 25 Sep 2009 07:45:45 +0000 (07:45 +0000)]
Put the byte-order mark back in the AUTHORS file, add Michael Speck, and
clean up a couple of items.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30140
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 25 Sep 2009 07:40:40 +0000 (07:40 +0000)]
From Speck Michael:
trivial patch that makes Wireshark compiling again, please check it into the sources.
There is a comment not properly terminated in file gtk\keys.h.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30139
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 25 Sep 2009 06:02:22 +0000 (06:02 +0000)]
Fooled by an #ifdef
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30138
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 25 Sep 2009 05:21:00 +0000 (05:21 +0000)]
Remove forgotten C++ style comments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30137
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 25 Sep 2009 05:19:18 +0000 (05:19 +0000)]
Make the filter toolbar style a preference.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30136
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Fri, 25 Sep 2009 02:50:48 +0000 (02:50 +0000)]
- Previous patch moved the intall targes dirs too far down.
- Install some auxiliary files (AUTHORS-SHORT, manuf, ...)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30135
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 25 Sep 2009 01:22:08 +0000 (01:22 +0000)]
Upon 2nd thought: revert changes I made to remove 'if(checkcol(...)' around col_add_fstr(...)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30134
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Fri, 25 Sep 2009 00:29:06 +0000 (00:29 +0000)]
Upon 2nd thought: revert removal of 'if (check_col(...))' around col_add_fstr & etc.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30133
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 24 Sep 2009 23:05:46 +0000 (23:05 +0000)]
Changes:
- Fix some #defines which just happened to sum up to the correct values but which used the wrong symbols;
- check_col() no longer req'd;
- use col_add_str() rather than col_add_fstr();
- check bytes are actually present before doing a heuristics check which fetches the bytes;
- use tvb_reported_length_remaining() instead of tvb_length_remaining() in one case;
- fix call to tvb_new_subset;
- (pedantic): return 0 or tvb_length(...) rather than FALSE or TRUE for this new-style dissector;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30132
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 24 Sep 2009 21:42:57 +0000 (21:42 +0000)]
- Remove the comments about the breaks, they were needed.
- Add another break
- Add a comment about suboption 9
- Add suboption 11 decoding while I'm at it
(Server Identifier Override Suboption)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30131
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Thu, 24 Sep 2009 20:52:58 +0000 (20:52 +0000)]
Add win-setup.sh which contains pretty much what used to be in win32-setup.sh and which happens to be generic code
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30130
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 24 Sep 2009 20:42:08 +0000 (20:42 +0000)]
Slightly rework the detection code for some packages.
Make compile flag detection work (needed some not so nice hacks).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30129
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Thu, 24 Sep 2009 20:27:33 +0000 (20:27 +0000)]
Use warnings
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30128
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Thu, 24 Sep 2009 20:21:23 +0000 (20:21 +0000)]
* Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30127
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Thu, 24 Sep 2009 20:07:41 +0000 (20:07 +0000)]
* Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30126
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Thu, 24 Sep 2009 20:00:21 +0000 (20:00 +0000)]
Don't guard col_append_str with check_col
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30125
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Thu, 24 Sep 2009 19:50:43 +0000 (19:50 +0000)]
Remove check_col() guard
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30124
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 24 Sep 2009 19:50:00 +0000 (19:50 +0000)]
Remove unneeded #includes (along with C++ style comments added by mistake in the last commit).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30123
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 24 Sep 2009 19:26:45 +0000 (19:26 +0000)]
Minor: Use tvb_reported_length... not tvb_length...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30122
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 24 Sep 2009 19:05:26 +0000 (19:05 +0000)]
Various:
- check_col no longer req'd;
- Remove unneeded #includes;
- Use consistent indentation/style;
- Reformat a few lines;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30121
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Thu, 24 Sep 2009 19:02:49 +0000 (19:02 +0000)]
The beginning of a Python script/tool that indexes capture files. It currently extracts all protocols that appear in the given capture files.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30120
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 24 Sep 2009 19:01:42 +0000 (19:01 +0000)]
Add what appear to be missing breaks in two cases of a switch () {...}.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30119
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 24 Sep 2009 17:30:20 +0000 (17:30 +0000)]
Minor changes:
- Use col_clear only once (in the right place);
- Use col_add_fstr instead of col_clear/col_append_fstr;
- check_col no longer req'd;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30118
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 24 Sep 2009 16:54:54 +0000 (16:54 +0000)]
Minor changes:
Use col_clear (in the right place) instead of col_set_str(...,"");
check_col no longer req'd;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30117
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 24 Sep 2009 16:22:37 +0000 (16:22 +0000)]
Minor changes:
- remove unneeded includes;
- check_col no longer req'd;
- move proto_register/proto_reg_handoff to the end of the file;
- fix some typos;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30116
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 24 Sep 2009 15:49:56 +0000 (15:49 +0000)]
Get rid of some deprecated functions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30115
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 24 Sep 2009 15:44:59 +0000 (15:44 +0000)]
Minor changes:
- check_col no longer req'd;
- use tvb_strncaseeql instead of tvb_get_ptr & etc;
- Change if (guint > 0) to if (guint != 0).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30114
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Thu, 24 Sep 2009 13:37:02 +0000 (13:37 +0000)]
Make sure that we also traverse the free_list while looking for valid pointers
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30113
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Thu, 24 Sep 2009 13:36:02 +0000 (13:36 +0000)]
Use val_to_str_const() since we intend on passing the string to col_set_str (which expects a constant string)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30112
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 24 Sep 2009 05:11:47 +0000 (05:11 +0000)]
Update *.vcproj to visual studio 8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30111
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 24 Sep 2009 05:10:38 +0000 (05:10 +0000)]
option menu -> combo box.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30110
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 24 Sep 2009 04:57:41 +0000 (04:57 +0000)]
While trying to understand commit 30107, I found the following at
http://www.itk.org/Bug/view.php?id=9219
Note that CMAKE_CFG_INTDIR is no longer necessary for this purpose but
has been left for compatibility with existing projects. Instead
add_custom_command() recognizes executable target names in its COMMAND
So just use "lemon" instead of specifying the full path.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30109
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Thu, 24 Sep 2009 04:52:35 +0000 (04:52 +0000)]
Call subdissector even when tree is NULL
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30108
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 23 Sep 2009 21:23:49 +0000 (21:23 +0000)]
Run lemon from CMAKE_CFG_INTDIR.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30107
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 23 Sep 2009 19:52:45 +0000 (19:52 +0000)]
Added Apple Cocoa library to processes dumping OSX version.
Added Apple CoreServices to wireshark.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30106
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 23 Sep 2009 19:41:08 +0000 (19:41 +0000)]
Add a few hints for OS X builds.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30105
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 23 Sep 2009 19:40:25 +0000 (19:40 +0000)]
- Add $Id: $ tags
- FindHtmlViewer.cmake: Try to add reading the name of the
html viewer from the HTML_VIEWER environment variable (untested)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30104
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Wed, 23 Sep 2009 19:14:35 +0000 (19:14 +0000)]
Fix for bug 4046:
Fix type of FIP dissector header field hf_fip_desc_map.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30103
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 23 Sep 2009 18:36:50 +0000 (18:36 +0000)]
Small indent fix.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30102
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 23 Sep 2009 18:20:06 +0000 (18:20 +0000)]
Define a global variable as static;
#include <stdio.h> & <stdlib.h> not req'd.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30101
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 23 Sep 2009 18:15:31 +0000 (18:15 +0000)]
Try finding gpg-error library, to improve building on OSX.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30100
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 23 Sep 2009 18:08:16 +0000 (18:08 +0000)]
Removed setting GLIB2_LIBRARIES to GLIB_LIBRARY, to improve build on OSX.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30099
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 23 Sep 2009 18:02:15 +0000 (18:02 +0000)]
Try finding pixbuf and pango libraries to help building on OSX.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30098
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 23 Sep 2009 17:55:37 +0000 (17:55 +0000)]
Change gchar foo[mm][nn] = {"xxx", "yyy", ...} to static const gchar *foo[mm] = {...}
Add a comment about a possible bug: some strings in array are never used ?
Do some minor reformatting.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30097
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Wed, 23 Sep 2009 17:53:55 +0000 (17:53 +0000)]
Build wiretap with cmake on OSX.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30096
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Wed, 23 Sep 2009 16:27:37 +0000 (16:27 +0000)]
(Trivial) White space changes
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30095
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 23 Sep 2009 16:06:39 +0000 (16:06 +0000)]
Quick fix for Bug #4040.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4040
ToDo: Fix usage of
gchar xxx[..][..] = {"aaa", "bbb", ...};
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30094
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 23 Sep 2009 15:56:44 +0000 (15:56 +0000)]
More fixes for OSX - might work now :-)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30093
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 23 Sep 2009 15:43:55 +0000 (15:43 +0000)]
Propagate the changes to the .cnf file so they don't get lost when regenerating the dissector.
Use col_set_str instead of col_add_fstr/col_add_str when adding constant strings to COL_INFO
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30092
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 23 Sep 2009 15:08:32 +0000 (15:08 +0000)]
Hopefully fix wsutil build on OSX.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30091
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Wed, 23 Sep 2009 14:59:22 +0000 (14:59 +0000)]
Don't col_clear(COL_PROTOCOL) followed by col_set_str(COL_PROTOCOL). A col_set_str() will clear (replace) any existing string (the fence still needs to be respected though)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30090
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Wed, 23 Sep 2009 14:52:01 +0000 (14:52 +0000)]
Use col_set_str instead of col_add_fstr/col_add_str when adding constant strings to COL_INFO
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30089
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Wed, 23 Sep 2009 14:43:23 +0000 (14:43 +0000)]
Use col_set_str instead of col_add_fstri/col_add_str when adding constant strings to COL_PROTOCOL
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30088
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 23 Sep 2009 14:30:56 +0000 (14:30 +0000)]
Change option menu to combo box.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30087
f5534014-38df-0310-8fa8-
9805f1628bb7
krj [Wed, 23 Sep 2009 14:30:36 +0000 (14:30 +0000)]
Don't col_clear() followed by col_set_str(). A col_set_str() will clear (replace) any existing string (the fence still needs to be respected though)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30086
f5534014-38df-0310-8fa8-
9805f1628bb7