obnox/wireshark/wip.git
7 years agoFrom Yaniv Kaul: SPICE dissector
wmeier [Thu, 29 Sep 2011 18:10:14 +0000 (18:10 +0000)]
From Yaniv Kaul: SPICE dissector

"It's not perfect, but has been in use for quite a while and dissects nicely most
of the messages."

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39184 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake it possible to dissect proprietarry Opcodes.
etxrab [Thu, 29 Sep 2011 15:23:23 +0000 (15:23 +0000)]
Make it possible to dissect proprietarry Opcodes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39183 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Roland Knall:
etxrab [Thu, 29 Sep 2011 06:13:13 +0000 (06:13 +0000)]
From Roland Knall:
Address Coverty issues CID 1204, CID 1215, CID 1224, CID 1246, CID 1247

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39182 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd heuristics in dissect_xmcp_message() to try to avoid dissecting TCP packets on...
cmaynard [Thu, 29 Sep 2011 01:53:38 +0000 (01:53 +0000)]
Add heuristics in dissect_xmcp_message() to try to avoid dissecting TCP packets on port 4788 that aren't actually xmcp packets.  Also, removed the check for a NULL tree as there's more work to do whether tree is NULL or not.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39181 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoIn drag_and_drop.c use accessor functions for GtkSelectionData. In
gerald [Wed, 28 Sep 2011 20:58:56 +0000 (20:58 +0000)]
In drag_and_drop.c use accessor functions for GtkSelectionData. In
main_menubar.c use gtk_osxapplication_insert_app_menu_item instead of
gtk_osxapplication_add_app_menu_item. Fixes deprecation-related errors
when compiling with HAVE_GTKOSXAPPLICATION defined.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39180 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThe SRT/SRA test pattern is 16 bits in Japan, don't try to retrieve 32 bits of it.
morriss [Wed, 28 Sep 2011 19:46:24 +0000 (19:46 +0000)]
The SRT/SRA test pattern is 16 bits in Japan, don't try to retrieve 32 bits of it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39179 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd default modeline settings to the end of the skeleton code.
cmaynard [Wed, 28 Sep 2011 19:40:34 +0000 (19:40 +0000)]
Add default modeline settings to the end of the skeleton code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39178 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd modeline. For now, add it at the bottom with tabstop=8, as that's where and...
cmaynard [Wed, 28 Sep 2011 19:38:03 +0000 (19:38 +0000)]
Add modeline.  For now, add it at the bottom with tabstop=8, as that's where and what most others are using.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39177 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoQuit if we have a zero-length query, so we don't loop indefinitely.
guy [Wed, 28 Sep 2011 19:08:20 +0000 (19:08 +0000)]
Quit if we have a zero-length query, so we don't loop indefinitely.
Should fix bug 6378.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39176 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRather than complain and quit if -V is missing when -O <protocols> is used, do the...
cmaynard [Wed, 28 Sep 2011 14:50:07 +0000 (14:50 +0000)]
Rather than complain and quit if -V is missing when -O <protocols> is used, do the user a favor and continue as if -V had been specified.  Add explicit documentation of the -O <protocols> option to the man page.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39175 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoLink to the RTmac spec.
guy [Wed, 28 Sep 2011 00:15:48 +0000 (00:15 +0000)]
Link to the RTmac spec.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39174 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate URL.
guy [Tue, 27 Sep 2011 23:48:34 +0000 (23:48 +0000)]
Update URL.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39173 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago- check_col() no longer needed;
wmeier [Tue, 27 Sep 2011 20:41:45 +0000 (20:41 +0000)]
- check_col() no longer needed;
- Calls to col_str_str() and to subdissectors must not be under 'if(tree)';
- Remove unneeded #includes;
- Use tvb_reported_length();
- Use tvb_new_subset_remaining();
- Use val_to_str_const();

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39172 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThe separator between packets is an output option, not a capture option,
guy [Tue, 27 Sep 2011 19:52:19 +0000 (19:52 +0000)]
The separator between packets is an output option, not a capture option,
so it should be present even when building without libpcap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39171 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFuture tense -> present tense for the encoding argument to
guy [Tue, 27 Sep 2011 19:43:54 +0000 (19:43 +0000)]
Future tense -> present tense for the encoding argument to
proto_tree_add_item() having more than just a byte order.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39170 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6359
alagoutte [Tue, 27 Sep 2011 19:43:31 +0000 (19:43 +0000)]
From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6359
IEEE 802.11 dissector shows duplicated proto item for Action category

Action frame dissecting is first adding hf_ieee80211_action (wlan_mgt.fixed.action) field before the category-based processing. Immediately after that, the per-category implementations are adding FIELD_CATEGORY_CODE (hf_ieee80211_ff_category_code, i.e., wlan_mgt.fixed.category_code) to the proto tree for the exact same octet. Remove hf_ieee80211_action to avoid the duplicated item in the tree. In addition, remove the now unused action_item and action_tree variables.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39169 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd a new tshark option for being able to specify an alternate line separator between...
cmaynard [Tue, 27 Sep 2011 18:32:59 +0000 (18:32 +0000)]
Add a new tshark option for being able to specify an alternate line separator between packets.  The option chosen was "-S <separator>".  The former -S option was renamed to -P, and the former -P option, which was previously undocumented, was renamed to -2.  This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5342.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39168 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6060
alagoutte [Tue, 27 Sep 2011 18:21:57 +0000 (18:21 +0000)]
From mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6060
New dissectors: (UA) Universal Alcatel Protocol and transport UAUDP

From me :
* Prefer proto_tree_add_item (when is possible)
* Use 4-space indenting
* Add Modeline information
* Fix Clang Warning

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39167 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMinor formatting changes to the dumpcap -h output.
cmaynard [Tue, 27 Sep 2011 18:19:23 +0000 (18:19 +0000)]
Minor formatting changes to the dumpcap -h output.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39166 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMinor formatting changes to the rawshark -h output.
cmaynard [Tue, 27 Sep 2011 17:18:25 +0000 (17:18 +0000)]
Minor formatting changes to the rawshark -h output.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39165 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of check_col, while at it set ENC.
etxrab [Tue, 27 Sep 2011 12:05:32 +0000 (12:05 +0000)]
Get rid of check_col, while at it set ENC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39164 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoIn proto_tree_add_bits... use const guint encoding to be consistent with proto_tree_a...
etxrab [Tue, 27 Sep 2011 12:04:29 +0000 (12:04 +0000)]
In proto_tree_add_bits... use const guint encoding to be consistent with proto_tree_add_item().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39163 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMore white space cleanup.
guy [Mon, 26 Sep 2011 21:48:54 +0000 (21:48 +0000)]
More white space cleanup.

We need the PDU length to find stuff at the end; use
tvb_reported_length(), *not* tvb_length(), to get it, so we're not
confused by a snapshot length.  Rename it "pdu_len" to make that clear.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39162 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoYet another bug fix from Pascal.
etxrab [Mon, 26 Sep 2011 21:06:55 +0000 (21:06 +0000)]
Yet another bug fix from Pascal.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39161 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThe fragment data is almost certainly not a text string, so don't make
guy [Mon, 26 Sep 2011 20:46:09 +0000 (20:46 +0000)]
The fragment data is almost certainly not a text string, so don't make
it an FT_STRING.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39160 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSome whitespace cleanup. FALSE -> ENC_BIG_ENDIAN. Remove most check_col()'s.
cmaynard [Mon, 26 Sep 2011 20:34:33 +0000 (20:34 +0000)]
Some whitespace cleanup.  FALSE -> ENC_BIG_ENDIAN.  Remove most check_col()'s.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39159 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse ENC_ values in proto_tree_add_item() calls.
guy [Mon, 26 Sep 2011 20:33:35 +0000 (20:33 +0000)]
Use ENC_ values in proto_tree_add_item() calls.

Get rid of the code that attempts to deal with the FCS; if the
link-layer dissector hasn't removed the FCS, either:

1) the link-layer dissector is buggy and should be fixed;

or

2) the link-layer dissector doesn't know whether there's an FCS
   and you have to tell it by setting a preference (and if there
   is no such preference, one needs to be added).

The code in question was causing errors when the link-layer dissector
was removing the FCS when it's known to be present, as it should do.

Get rid of 4-space tabs in favor of spaces.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39158 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix modeline.
cmaynard [Mon, 26 Sep 2011 20:31:52 +0000 (20:31 +0000)]
Fix modeline.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39157 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Thomas Morin via bug #6395: Improve display for IGMP
sfisher [Mon, 26 Sep 2011 19:24:47 +0000 (19:24 +0000)]
From Thomas Morin via bug #6395: Improve display for IGMP

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39156 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAnother bug fix from Pascal.
etxrab [Mon, 26 Sep 2011 18:56:27 +0000 (18:56 +0000)]
Another bug fix from Pascal.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39155 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake buildbots happy by adding back closing brace.
cmaynard [Mon, 26 Sep 2011 18:24:17 +0000 (18:24 +0000)]
Make buildbots happy by adding back closing brace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39154 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of check_col() and use ENC.
etxrab [Mon, 26 Sep 2011 17:50:54 +0000 (17:50 +0000)]
Get rid of check_col() and use ENC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39153 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Pascal Quantin:
etxrab [Mon, 26 Sep 2011 17:19:54 +0000 (17:19 +0000)]
From Pascal Quantin:
When building the last byte, the remaining number of bits isn't masked.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39152 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of check_col() and use ENC.
etxrab [Mon, 26 Sep 2011 17:18:10 +0000 (17:18 +0000)]
Get rid of check_col() and use ENC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39151 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMove tvb_new_octet_aligned() to tvbuff.c and use it.
etxrab [Mon, 26 Sep 2011 15:11:14 +0000 (15:11 +0000)]
Move tvb_new_octet_aligned() to tvbuff.c and use it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39150 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of check_col, while at it set ENC.
etxrab [Mon, 26 Sep 2011 14:50:59 +0000 (14:50 +0000)]
Get rid of check_col, while at it set ENC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39149 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of check_col, while at it set ENC.
etxrab [Mon, 26 Sep 2011 11:33:10 +0000 (11:33 +0000)]
Get rid of check_col, while at it set ENC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39148 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of check_col, while at it set ENC.
etxrab [Mon, 26 Sep 2011 09:01:17 +0000 (09:01 +0000)]
Get rid of check_col, while at it set ENC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39147 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of check_col, while at it set ENC.
etxrab [Mon, 26 Sep 2011 08:25:18 +0000 (08:25 +0000)]
Get rid of check_col, while at it set ENC.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39146 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake it build again.
etxrab [Mon, 26 Sep 2011 06:13:27 +0000 (06:13 +0000)]
Make it build again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39145 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of check_col() and use ENC_BIG_ENDIAN.
etxrab [Mon, 26 Sep 2011 05:52:58 +0000 (05:52 +0000)]
Get rid of check_col() and use ENC_BIG_ENDIAN.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39144 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Martin Kaiser:
etxrab [Mon, 26 Sep 2011 05:17:57 +0000 (05:17 +0000)]
From Martin Kaiser:
Implement the content control resource from the CI+
specification 1.2.

From me:
Change ENC_NA to ENC_BIG_ENDIAN as i suppose this is a big endian protocol and ENC_NA was erroneously used for irems bigger than i byte in some cases.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39143 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPut in "#if 0":s to make it compile, these widgets are not vissible on my system...
etxrab [Mon, 26 Sep 2011 04:56:24 +0000 (04:56 +0000)]
Put in "#if 0":s to make it compile, these widgets are not vissible on my system so I have no idea what the GUI looks like with these changes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39142 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agogkvumeter got removed, don't try to build it.
jmayer [Sun, 25 Sep 2011 22:20:41 +0000 (22:20 +0000)]
gkvumeter got removed, don't try to build it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39141 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Sylvain Munaut: Fix Bug #6351 (Buildbot fuzztest crash);
wmeier [Sun, 25 Sep 2011 22:01:50 +0000 (22:01 +0000)]
From Sylvain Munaut: Fix Bug #6351 (Buildbot fuzztest crash);

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39140 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove gtkvumeter.[hc]
jmayer [Sun, 25 Sep 2011 21:54:04 +0000 (21:54 +0000)]
Remove gtkvumeter.[hc]
This may cause windows builds to fail. If nobody picks up the task
of getting it to compile again I'll start doing that tomorrow morning
with the help of the buildbot.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39139 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER
jmayer [Sun, 25 Sep 2011 21:27:19 +0000 (21:27 +0000)]
Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER
as it is the only option left.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39138 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoWe now always build with MAIN_MENU_USE_UIMANAGER, so remove all code using
jmayer [Sun, 25 Sep 2011 21:19:45 +0000 (21:19 +0000)]
We now always build with MAIN_MENU_USE_UIMANAGER, so remove all code using
the old ways except the proto_help.c file, which is kept for now in case someone
is willing to reimplement the help menus using non-deprecated methods.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39137 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agovlan dissector has been restored;
wmeier [Sun, 25 Sep 2011 21:10:04 +0000 (21:10 +0000)]
vlan dissector has been restored;
pref "eth.qinq_ethertype" has been moved(restored) to "vlan.qinq_ethertype".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39136 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix for
jmayer [Sun, 25 Sep 2011 19:56:42 +0000 (19:56 +0000)]
Fix for
/home/jmayer/work/wireshark/svn/trunk/gtk/capture_if_dlg.c:522:3: error: ISO C90 forbids mixed declarations and code

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39135 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDo some cleanup related to the reversion of SVN #34848 donr in SVN #39100.
wmeier [Sun, 25 Sep 2011 19:28:07 +0000 (19:28 +0000)]
Do some cleanup related to the reversion of SVN #34848 donr in SVN #39100.

1. Revert SVN #35830 (See Bug #5645);
   This patch is no longer needed given the reversion.

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

   http://anonsvn.wireshark.org/viewvc?revision=39100&view=revision

2. Restore 'col_set_str(pinfo->cinfo, COL_INFO, "Ethernet II");' just to
       be safe (altho it's possible that this line is not needed).

3. Remove several lines of no longer needed code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39134 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdded Glenn Matthews.
stig [Sun, 25 Sep 2011 18:11:38 +0000 (18:11 +0000)]
Added Glenn Matthews.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39133 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTry fixing the signed/unsigned mismatch issues.
stig [Sun, 25 Sep 2011 17:30:29 +0000 (17:30 +0000)]
Try fixing the signed/unsigned mismatch issues.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39132 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Glenn Matthews via bug 6319:
stig [Sun, 25 Sep 2011 16:31:14 +0000 (16:31 +0000)]
From Glenn Matthews via bug 6319:
Add dissector for XMCP protocol.

From me:
- Fixed an obvious bug setting transaction_id_key[2].key = NULL,
  where transaction_id_key is defined with only 2 elements.
- Only register heur_dissector once.
- Only find media_type_dissector_table once.
- Added packet-xmcp.c to CMakeLists.txt

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39131 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a compile error.
wmeier [Sun, 25 Sep 2011 15:25:33 +0000 (15:25 +0000)]
Fix a compile error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39130 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMinor cleanup:
wmeier [Sun, 25 Sep 2011 15:09:44 +0000 (15:09 +0000)]
Minor cleanup:
- Fix two cases of "set but unused" as reported by GCC 4.6;
- remove _U_ from parameters which are actually used;
- printf --> REPORT_DISSECTOR_BUG;
- define a function as static;

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39129 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago[Automatic manuf, services and enterprise-numbers update for 2011-09-25]
gerald [Sun, 25 Sep 2011 14:03:26 +0000 (14:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-09-25]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39126 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoBug 6369:
gal [Sun, 25 Sep 2011 07:02:57 +0000 (07:02 +0000)]
Bug 6369:
Unprotected array write.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39125 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix syntax...
tuexen [Sat, 24 Sep 2011 16:26:49 +0000 (16:26 +0000)]
Fix syntax...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39124 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDon't consider remote airpcap devices as airpcap devices, but as remote devices.
tuexen [Sat, 24 Sep 2011 16:24:09 +0000 (16:24 +0000)]
Don't consider remote airpcap devices as airpcap devices, but as remote devices.
This makes the GUI consistent.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39123 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse the new remote capturing icon also in the interfaces dialog box.
tuexen [Sat, 24 Sep 2011 14:16:37 +0000 (14:16 +0000)]
Use the new remote capturing icon also in the interfaces dialog box.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39122 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMake buildbot happy
alagoutte [Sat, 24 Sep 2011 13:42:53 +0000 (13:42 +0000)]
Make buildbot happy

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39121 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a typo in RD offset
alagoutte [Sat, 24 Sep 2011 13:36:51 +0000 (13:36 +0000)]
Fix a typo in RD offset

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39120 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Abhik Sarkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2384
alagoutte [Sat, 24 Sep 2011 13:27:58 +0000 (13:27 +0000)]
From Abhik Sarkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2384
SMPP+ which is customized by Huawei company can't be decoded

From me :
Convert "space tabs" to spaces

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39119 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse one of the new icons for remote interfaces.
tuexen [Sat, 24 Sep 2011 12:39:09 +0000 (12:39 +0000)]
Use one of the new icons for remote interfaces.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39118 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMark the "adjustment" argument to scroll callbacks as unused. (Is
guy [Sat, 24 Sep 2011 00:26:58 +0000 (00:26 +0000)]
Mark the "adjustment" argument to scroll callbacks as unused.  (Is
redrawing sufficient?  Could the adjustment be used to optimize what's
drawn?)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39117 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoNetwork icons from Elliott Aldrich.
gerald [Sat, 24 Sep 2011 00:13:32 +0000 (00:13 +0000)]
Network icons from Elliott Aldrich.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39116 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of duplicate call.
guy [Fri, 23 Sep 2011 23:56:21 +0000 (23:56 +0000)]
Get rid of duplicate call.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39115 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoChange the case of "sNMPv2-Trap" to match RFC 3416. Reported by Qiyao.
gerald [Fri, 23 Sep 2011 22:44:28 +0000 (22:44 +0000)]
Change the case of "sNMPv2-Trap" to match RFC 3416. Reported by Qiyao.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39114 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThe -D, -L and -S options are mutually exclusive, so change "and" to "or".
cmaynard [Fri, 23 Sep 2011 21:24:22 +0000 (21:24 +0000)]
The -D, -L and -S options are mutually exclusive, so change "and" to "or".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39113 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGrr make it work if GTK < 2.22
etxrab [Fri, 23 Sep 2011 17:33:04 +0000 (17:33 +0000)]
Grr make it work if GTK < 2.22

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39112 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRedraw when vertical scroll is used.
etxrab [Fri, 23 Sep 2011 17:29:01 +0000 (17:29 +0000)]
Redraw when vertical scroll is used.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39111 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse val_to_str_const().
martinm [Fri, 23 Sep 2011 17:10:08 +0000 (17:10 +0000)]
Use val_to_str_const().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39110 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse val_to_str_const().
martinm [Fri, 23 Sep 2011 17:02:56 +0000 (17:02 +0000)]
Use val_to_str_const().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39109 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agodissector_(add|delete) ==> dissector_(add|delete)_uint: fixes checkapi error.
wmeier [Fri, 23 Sep 2011 15:36:26 +0000 (15:36 +0000)]
dissector_(add|delete) ==> dissector_(add|delete)_uint: fixes checkapi error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39108 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate the draw area as well.
etxrab [Fri, 23 Sep 2011 14:55:26 +0000 (14:55 +0000)]
Update the draw area as well.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39107 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUh, "Fix the fix (in SVN #39105)" so it compiles.
wmeier [Fri, 23 Sep 2011 14:47:18 +0000 (14:47 +0000)]
Uh, "Fix the fix (in SVN #39105)" so it compiles.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39106 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoCorrection for SVN #39100:"Revert Revision 34838";
wmeier [Fri, 23 Sep 2011 14:39:23 +0000 (14:39 +0000)]
Correction for SVN #39100:"Revert Revision 34838";
Fixes buildbot compile error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39105 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd packet-vlan.c
wmeier [Fri, 23 Sep 2011 14:15:49 +0000 (14:15 +0000)]
Add packet-vlan.c

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39104 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPut packet-vlan back into Makefile.common (to go with SVN #39100)
wmeier [Fri, 23 Sep 2011 14:10:52 +0000 (14:10 +0000)]
Put packet-vlan back into Makefile.common (to go with SVN #39100)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39103 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove duplicated code.
etxrab [Fri, 23 Sep 2011 11:35:37 +0000 (11:35 +0000)]
Remove duplicated code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39102 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove code commited by misstake.
etxrab [Fri, 23 Sep 2011 11:22:48 +0000 (11:22 +0000)]
Remove code commited by misstake.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39101 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRevert Revision 34838 "Resolve bug #2254: Migrate the 802.1q VLAN dissector into...
etxrab [Fri, 23 Sep 2011 11:01:13 +0000 (11:01 +0000)]
Revert Revision 34838 "Resolve bug #2254: Migrate the 802.1q VLAN dissector into the Ethernet II."
as this causes a lot of problems.
See
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5680
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6305
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6366

Original bug:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2254

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39100 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoConvert "space tabs" to spaces
alagoutte [Fri, 23 Sep 2011 09:03:26 +0000 (09:03 +0000)]
Convert "space tabs" to spaces
Add modeline information

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39099 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 23 Sep 2011 08:44:53 +0000 (08:44 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39098 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6128 : Wireshark doesn't...
alagoutte [Fri, 23 Sep 2011 08:41:23 +0000 (08:41 +0000)]
From https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6128 : Wireshark doesn't decode BGP.MP_REACH_NLRI.NLRI when RD type is 2(defined in RFC4364:4.2)

Fix a wrong offset of RD Type 2 and display AS4 in asdot+ notation (Add a pref to chose the type of display for AS4 ?)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39097 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTighten the check on wheter a message really is chipered or not.
etxrab [Fri, 23 Sep 2011 06:55:10 +0000 (06:55 +0000)]
Tighten the check on wheter a message really is chipered or not.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39096 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Daniel:
etxrab [Fri, 23 Sep 2011 06:19:47 +0000 (06:19 +0000)]
From Daniel:
Add support for the osmo extension header to IP.a

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6371
While we are there
- Use ENC_BIG_ENDIAN

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39095 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTrivial: Consistently use 2 spaces after a period terminating a sentence.
cmaynard [Fri, 23 Sep 2011 04:33:07 +0000 (04:33 +0000)]
Trivial: Consistently use 2 spaces after a period terminating a sentence.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39094 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTrivial: Fix typo.
cmaynard [Fri, 23 Sep 2011 04:17:16 +0000 (04:17 +0000)]
Trivial: Fix typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39093 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a couple of typos and use 2 spaces consistently after a period.
cmaynard [Fri, 23 Sep 2011 02:00:50 +0000 (02:00 +0000)]
Fix a couple of typos and use 2 spaces consistently after a period.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39092 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTrivial: Add missing <interval> in one case of tshark -z io,stat usage.
cmaynard [Fri, 23 Sep 2011 01:23:42 +0000 (01:23 +0000)]
Trivial: Add missing <interval> in one case of tshark -z io,stat usage.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39091 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd an option -d to specify display filter from the command line.
stig [Thu, 22 Sep 2011 18:39:29 +0000 (18:39 +0000)]
Add an option -d to specify display filter from the command line.

This was requested in bug 2463.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39090 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago(Trivial) Fix a typo in a comment.
wmeier [Thu, 22 Sep 2011 15:57:41 +0000 (15:57 +0000)]
(Trivial) Fix a typo in a comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39089 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoBe careful about reporting number of missing SNs when wrapping around SN range.
martinm [Thu, 22 Sep 2011 15:28:46 +0000 (15:28 +0000)]
Be careful about reporting number of missing SNs when wrapping around SN range.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39088 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoShow if per packet info is missing.
etxrab [Thu, 22 Sep 2011 08:59:24 +0000 (08:59 +0000)]
Show if per packet info is missing.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39087 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoStore a pointer to frame_data rather than the time.
etxrab [Thu, 22 Sep 2011 08:46:09 +0000 (08:46 +0000)]
Store a pointer to frame_data rather than the time.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39086 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse ENC_ values in proto_tree_add_item() calls.
guy [Thu, 22 Sep 2011 03:10:30 +0000 (03:10 +0000)]
Use ENC_ values in proto_tree_add_item() calls.

In the AgentX dissector, make the "flags" arguments guint8, to match
what's passed in.

In the AIM dissector, use val_to_str() in col_add_str() calls - it gives
the same result if there's a match, and puts a note in the Info column
if there isn't, and is less complicated.

In the AJP13 dissector:

update the URL for the protocol documentation;

add #defines for message types, and use them;

for "enumerated data type" fields, make the fields numerical
rather than strings and give them the value_string tables;

get rid of col_check() calls;

make a Boolean item an FT_BOOLEAN.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39085 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago(Trivial) Remove trailing whitespace from lines for a few files.
wmeier [Wed, 21 Sep 2011 23:42:55 +0000 (23:42 +0000)]
(Trivial) Remove trailing whitespace from lines for a few files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39084 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse '%" G_GINT64_MODIFIER "u' iso '%llu'. Fixes checkapi fail and (presumably) compil...
wmeier [Wed, 21 Sep 2011 21:07:07 +0000 (21:07 +0000)]
Use '%" G_GINT64_MODIFIER "u' iso '%llu'. Fixes checkapi fail and (presumably) compile errors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39083 f5534014-38df-0310-8fa8-9805f1628bb7