obnox/wireshark/wip.git
9 years agoEnable Python for HEAD to make sure build problems are found.
jmayer [Thu, 23 Sep 2010 06:42:58 +0000 (06:42 +0000)]
Enable Python for HEAD to make sure build problems are found.

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

9 years agoRemove unnecessary include: register.h
morriss [Thu, 23 Sep 2010 06:08:19 +0000 (06:08 +0000)]
Remove unnecessary include: register.h

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

9 years agoRevert 34191 and add some casts instead
morriss [Thu, 23 Sep 2010 06:00:22 +0000 (06:00 +0000)]
Revert 34191 and add some casts instead

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

9 years agoAssume we HAVE_GZCLEARERR on Windows and when using cmake
morriss [Thu, 23 Sep 2010 05:50:10 +0000 (05:50 +0000)]
Assume we HAVE_GZCLEARERR on Windows and when using cmake

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

9 years agoUse gsize (size_t) in a couple of places to make the Win64 build happy.
morriss [Thu, 23 Sep 2010 01:14:44 +0000 (01:14 +0000)]
Use gsize (size_t) in a couple of places to make the Win64 build happy.

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

9 years agoRemove a trailing space from an AVP name (which becomes a hf name)
morriss [Thu, 23 Sep 2010 00:55:02 +0000 (00:55 +0000)]
Remove a trailing space from an AVP name (which becomes a hf name)

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

9 years agoMake buildbot happy again...
sake [Wed, 22 Sep 2010 22:46:36 +0000 (22:46 +0000)]
Make buildbot happy again...

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

9 years agoVery old versions of libz (such as the one that comes with Solaris 10) don't have...
morriss [Wed, 22 Sep 2010 21:51:53 +0000 (21:51 +0000)]
Very old versions of libz (such as the one that comes with Solaris 10) don't have gzclearerr().  Check for that function and only use it if we have it.

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

9 years agoWhen using a custom column, make it possible to select which occurrence to show if...
sake [Wed, 22 Sep 2010 20:56:14 +0000 (20:56 +0000)]
When using a custom column, make it possible to select which occurrence to show if the field has multiple occurrences.

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

9 years ago- reassembly code shouldn't be under 'if (tree)'
wmeier [Wed, 22 Sep 2010 18:32:15 +0000 (18:32 +0000)]
- reassembly code shouldn't be under 'if (tree)'
- ECDH Parameter - Content:  Packet Bytes highlighting was off-by-one.

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

9 years agoFix for bug 5172:
jake [Wed, 22 Sep 2010 16:35:02 +0000 (16:35 +0000)]
Fix for bug 5172:
Properly retrieve the H.245 endpoint IP address.

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

9 years agoCode cleanup:
wmeier [Wed, 22 Sep 2010 15:52:53 +0000 (15:52 +0000)]
Code cleanup:
- Fix incorrect uses of val_to_str which could cause inv mem refs;
- Use tvb_reported_length instead of tvb_length;
- (Trivial) Remove some unneeded '= NULL' initializations;
- (A few other trivial changes).

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

9 years agoCode cleanup: Changed proto_tree_add_boolean() and proto_tree_add_bytes()
stig [Wed, 22 Sep 2010 13:31:49 +0000 (13:31 +0000)]
Code cleanup: Changed proto_tree_add_boolean() and proto_tree_add_bytes()
to proto_tree_add_item().

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

9 years agoFrom Lukasz Kotasa and Lukasz Suchy via bug 5248:
stig [Wed, 22 Sep 2010 13:18:23 +0000 (13:18 +0000)]
From Lukasz Kotasa and Lukasz Suchy via bug 5248:
Added dissector for WAI authentication protocol.

From me:
Some cleanup.

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

9 years agoFrom Lukasz Kotasa via bug 5248:
stig [Wed, 22 Sep 2010 13:14:46 +0000 (13:14 +0000)]
From Lukasz Kotasa via bug 5248:
Added ETHERTYPE_WAI.

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

9 years agoFrom Pascal Quantin:
etxrab [Wed, 22 Sep 2010 10:38:45 +0000 (10:38 +0000)]
From Pascal Quantin:
[NAS EPS] Use Request Type IE defined in 3GPP 24.008

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

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

9 years agointerlink type is decimal
girlich [Wed, 22 Sep 2010 07:18:49 +0000 (07:18 +0000)]
interlink type is decimal
some keyword substitution added

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

9 years agoFrom Pascal Quantin:
etxrab [Wed, 22 Sep 2010 07:06:15 +0000 (07:06 +0000)]
From Pascal Quantin:
[NAS EPS] Traffic Flow Template IE dissection bugs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5243

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

9 years agoThe CLDAP attribute value on a CLDAP reply is no longer being decoded
etxrab [Tue, 21 Sep 2010 14:56:55 +0000 (14:56 +0000)]
The CLDAP attribute value on a CLDAP reply is no longer being decoded
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5239

It got broken in Revision 33390 I think, if attr_type is unset at this point it should be set in the calling function.
http://anonsvn.wireshark.org/viewvc/trunk/asn1/ldap/ldap.cnf?r1=33388&r2=33390

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

9 years agoMake it compile.
stig [Tue, 21 Sep 2010 09:59:45 +0000 (09:59 +0000)]
Make it compile.

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

9 years agoMove a bunch of definitions before the code that uses at least one of
guy [Tue, 21 Sep 2010 09:53:44 +0000 (09:53 +0000)]
Move a bunch of definitions before the code that uses at least one of
the variables in question.

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

9 years agoTry to fix:
etxrab [Tue, 21 Sep 2010 09:30:16 +0000 (09:30 +0000)]
Try to fix:
"In menus_init() you seem to use ui_manager_packet_list_heading before it's initialized."

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

9 years agoAdd an SVN ID.
guy [Tue, 21 Sep 2010 07:18:31 +0000 (07:18 +0000)]
Add an SVN ID.

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

9 years agoGet rid of C++ comment.
guy [Tue, 21 Sep 2010 07:17:20 +0000 (07:17 +0000)]
Get rid of C++ comment.

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

9 years agoMake "Displayed Columns" work yet again, as done in revision 34160.
stig [Tue, 21 Sep 2010 07:08:35 +0000 (07:08 +0000)]
Make "Displayed Columns" work yet again, as done in revision 34160.
Bring back 'Resize Column' and 'Rename Column Title'.

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

9 years agoFix comments.
guy [Tue, 21 Sep 2010 05:58:14 +0000 (05:58 +0000)]
Fix comments.

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

9 years agoUpdate GUIManager menubar code(#IF 0 ).
etxrab [Tue, 21 Sep 2010 05:32:32 +0000 (05:32 +0000)]
Update GUIManager menubar code(#IF 0 ).

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

9 years agoWrong signature used for a GtkToggleActionEntry callback.
etxrab [Tue, 21 Sep 2010 05:24:02 +0000 (05:24 +0000)]
Wrong signature used for a GtkToggleActionEntry callback.

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

9 years agoRemove leftover debug code/comment
etxrab [Tue, 21 Sep 2010 05:10:38 +0000 (05:10 +0000)]
Remove leftover debug code/comment

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

9 years agoAs suggested by Kovarththanan Rajaratnam in https://bugs.wireshark.org/bugzilla/show_...
morriss [Tue, 21 Sep 2010 03:14:49 +0000 (03:14 +0000)]
As suggested by Kovarththanan Rajaratnam in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548 :

Clean up hf fields some more: mostly removing leading and trailing spaces from names and blurbs.

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

9 years agoAdd a cast
morriss [Tue, 21 Sep 2010 03:06:54 +0000 (03:06 +0000)]
Add a cast

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

9 years agoUse size_t to keep the Windows compiler happy
morriss [Tue, 21 Sep 2010 02:41:29 +0000 (02:41 +0000)]
Use size_t to keep the Windows compiler happy

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

9 years agoFrom Jakub Zawadzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3336 :
morriss [Tue, 21 Sep 2010 02:12:21 +0000 (02:12 +0000)]
From Jakub Zawadzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3336 :

We parse host & request page from headers, so we easily can construct full http
uri.

I was thinking about making it as field, so we could filter, print in column
info, or do other fancy stuff, but for now this is imho enough.

From me: add it as a (filterable) item.  Clean up spacing and indentation in a
few places.

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

9 years agoFix sequence numbers reported when duplicate SN detected.
martinm [Mon, 20 Sep 2010 17:01:22 +0000 (17:01 +0000)]
Fix sequence numbers reported when duplicate SN detected.

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

9 years agoMake "Displayed Columns" work again.
stig [Mon, 20 Sep 2010 13:11:48 +0000 (13:11 +0000)]
Make "Displayed Columns" work again.

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

9 years agoPut Abort reason in info column.
stig [Mon, 20 Sep 2010 12:49:52 +0000 (12:49 +0000)]
Put Abort reason in info column.

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

9 years ago[Automatic manuf and enterprise-numbers update for 2010-09-19]
gerald [Sun, 19 Sep 2010 15:03:36 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-09-19]

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

9 years agoFix for bug 5220:
jake [Sat, 18 Sep 2010 13:12:03 +0000 (13:12 +0000)]
Fix for bug 5220:
- Don't list codecs which are deleted by using port 0.
- Use real concatenation i.s.o. reprint, which seems to fail in some circumstances.

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

9 years agoUpdate Cal Turney's entry for the tshark SCSI tap
morriss [Sat, 18 Sep 2010 01:07:00 +0000 (01:07 +0000)]
Update Cal Turney's entry for the tshark SCSI tap

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

9 years agoFrom Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5223 :
morriss [Sat, 18 Sep 2010 01:03:45 +0000 (01:03 +0000)]
From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5223 :

I would like to contribute iSCSI SRT tap, 'tap-scsistat.c' for tshark.

The output exactly matches that of the Wireshark's iSCSI(disk) SRT dialog.

From me: a couple of small changes to make it compile without warnings.

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

9 years agoCopy the rev 34143 changes to packet-snmp.c over to the asn1 source.
morriss [Fri, 17 Sep 2010 14:03:05 +0000 (14:03 +0000)]
Copy the rev 34143 changes to packet-snmp.c over to the asn1 source.

hf_snmp_engineid_enterprise is now a BASE_EXT_STRING, not BASE_RANGE_STRING.  This fixes
the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5233

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

9 years agoDon't include stock icons that we no longer use.
morriss [Fri, 17 Sep 2010 13:38:09 +0000 (13:38 +0000)]
Don't include stock icons that we no longer use.

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

9 years agoUse GTK dialog stock icons rather than our own.
etxrab [Fri, 17 Sep 2010 12:54:07 +0000 (12:54 +0000)]
Use GTK dialog stock icons rather than our own.

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

9 years agoFix some bugs that show up when you build with the old packet list.
guy [Fri, 17 Sep 2010 08:48:19 +0000 (08:48 +0000)]
Fix some bugs that show up when you build with the old packet list.

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

9 years agoPut the definition of NEW_PACKET_LIST into config.h rather than the
guy [Fri, 17 Sep 2010 07:24:35 +0000 (07:24 +0000)]
Put the definition of NEW_PACKET_LIST into config.h rather than the
Makefile; that will force a rebuild if you configure it on or off
(that'll rebuild stuff that doesn't need to be rebuilt, but it'll also
rebuild stuff that *does* need to be rebuilt and that wouldn't be
rebuilt otherwise).

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

9 years agoUse the same control sequences for the old packet list that are used for
guy [Fri, 17 Sep 2010 04:58:30 +0000 (04:58 +0000)]
Use the same control sequences for the old packet list that are used for
the new packet list.

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

9 years agoUse val_to_str_ext() & friends to access sminmpec_values[];
wmeier [Fri, 17 Sep 2010 04:51:21 +0000 (04:51 +0000)]
Use val_to_str_ext() & friends to access sminmpec_values[];
Also: packet-nhrp.c: #include sminmpec.h not req'd;

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

9 years agoRemove check_col(). Clean up some spacing/indentation too.
morriss [Fri, 17 Sep 2010 02:22:37 +0000 (02:22 +0000)]
Remove check_col().  Clean up some spacing/indentation too.

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

9 years agoFrom Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5197 :
morriss [Fri, 17 Sep 2010 02:03:09 +0000 (02:03 +0000)]
From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5197 :

The NFS dissector (all versions) show access types that have not been requested
to be checked as "not allowed" in the call and reply.  This is incorrect and
misleading.  At present one must manually compare what was requested in order
to assess if access was actually denied for that type.  When there are hundreds
or thousands of these ACCESS requests in a capture, it is not possible or
practical to manually check each one.

The submitted patch does the following:

* Passes the access mask in the call to the reply for comparison
* Adds filterable fields for each supported (v4) and access type
* Adds a pseudo field, nfs.access_denied
* Lists the access types to be checked in the summary and tree
* Separately lists the supported, denied, and allowed access types in the
  summary and tree

The changes are applied to all NFS versions.

From me: a couple of small changes to make it compile without warnings.

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

9 years agoExtensive V9/V10 code clean up, bug fixing & dissection display improvements:
wmeier [Fri, 17 Sep 2010 01:45:29 +0000 (01:45 +0000)]
Extensive V9/V10 code clean up, bug fixing & dissection display improvements:
Bugs fixed:
 - Invalid time display for various time fields;
     Millisecs for types 152, 153 are actually stored as 64 bit integers;
     Microsecs, nanosecs are actually stored  in "NTP format";
     Times for fields 158, 159 are relative to "export time";
     SystemInitTime displayed incorrectly;
     ...
 - Options template not cached when only scope fields in template.
 - Templates not processed on first pass thru capture file:
    (In some cases data flows might not be handled until options template later displayed).
 - V9: number of options template entries limited to about 8 instead of intended 42;
 - Multiple options temlate flows in an Options Template flowset not handled;
 - "NotSentOctets" dislayed as "NotSentPackets";
   ...

Cleanups:
 - Options and data template processing code more or less rewritten;
 - options template displayed with format similar to that used for data templates;
 - Handling and display of PEN field (including use to indicate REVERSE) improved;
 - Don't use same filter name for two similar fields which only differ in size;
 - Handling & dislay of "variable length" fields improved;
 - sminmec lookup (PEN) done only during template processing & cached for later use;
   ...
 - Whitespace/Formatting

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

9 years agoMore typos.
gerald [Thu, 16 Sep 2010 19:56:34 +0000 (19:56 +0000)]
More typos.

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

9 years agoFix a typo.
gerald [Thu, 16 Sep 2010 19:55:25 +0000 (19:55 +0000)]
Fix a typo.

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

9 years agoTurn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().
gerald [Thu, 16 Sep 2010 19:20:06 +0000 (19:20 +0000)]
Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().

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

9 years agoAdd "(BE)" to the big endian representations of the ICMP identifier and
sfisher [Thu, 16 Sep 2010 18:22:45 +0000 (18:22 +0000)]
Add "(BE)" to the big endian representations of the ICMP identifier and
sequence number fields to match the "(LE)" ones.

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

9 years ago#if out ui_desc_conv_filter_popup to get the builds going (it looks like it should...
morriss [Thu, 16 Sep 2010 13:12:02 +0000 (13:12 +0000)]
#if out ui_desc_conv_filter_popup to get the builds going (it looks like it should be used but it isn't currently).

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

9 years agoMake "4 NOP in a row" work again after changing the NOP name for TCP and IP
stig [Thu, 16 Sep 2010 12:29:22 +0000 (12:29 +0000)]
Make "4 NOP in a row" work again after changing the NOP name for TCP and IP
in revisions 34095 and 34097.

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

9 years agoFix a typo.
etxrab [Thu, 16 Sep 2010 10:40:33 +0000 (10:40 +0000)]
Fix a typo.

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

9 years agoRemove C++ comments.
guy [Thu, 16 Sep 2010 08:58:46 +0000 (08:58 +0000)]
Remove C++ comments.

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

9 years agomenus.c:1508: warning: unused parameter 'current'
etxrab [Thu, 16 Sep 2010 08:15:45 +0000 (08:15 +0000)]
menus.c:1508: warning: unused parameter 'current'
menus.c:1508: warning: unused parameter 'user_data'
Mark parameters as unused.

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

9 years agoUse GUIManager for the pop-up:s.
etxrab [Thu, 16 Sep 2010 07:48:18 +0000 (07:48 +0000)]
Use GUIManager for the pop-up:s.
Can be dissabled by commenting out
#define MENUS_USE_UIMANAGER 1

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

9 years agoAlso rename inet_ntop() on Windows
morriss [Wed, 15 Sep 2010 21:41:27 +0000 (21:41 +0000)]
Also rename inet_ntop() on Windows

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

9 years agoFrom Juha Siltanen :
sake [Wed, 15 Sep 2010 21:17:35 +0000 (21:17 +0000)]
From Juha Siltanen :

When sorting a capture by protocol, some RTP packets are shown only as FLIP,
even though the dissection windows shows the RTP tree.

(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5215)

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

9 years agoAdd more GUIManager code #ifdef:ed out.
etxrab [Wed, 15 Sep 2010 20:51:44 +0000 (20:51 +0000)]
Add more GUIManager code #ifdef:ed out.

The popups should be working now exept for protocol help.
Help with testing and cleaning up apreciated.
GTK 2.6 requred, I'll look into that too later if no one beats me to it.

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

9 years agoBug #5127 from Guenter Strubreiter:
sfisher [Wed, 15 Sep 2010 20:29:31 +0000 (20:29 +0000)]
Bug #5127 from Guenter Strubreiter:

for avoiding doubled definition of a table needed also by a tcap subdissector
plugin a definition in libwirshark.def is needed:

isup_calling_partys_category_value

Me: Change extern to WS_VAR_IMPORT in header file

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

9 years agoMissed this one (check_col() removal)
martinm [Wed, 15 Sep 2010 16:17:16 +0000 (16:17 +0000)]
Missed this one (check_col() removal)

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

9 years agoRemove a few more calls to check_col()
martinm [Wed, 15 Sep 2010 16:16:23 +0000 (16:16 +0000)]
Remove a few more calls to check_col()

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

9 years agoAdd expert info for timing adjustment control message, and tweak a label.
martinm [Wed, 15 Sep 2010 15:52:30 +0000 (15:52 +0000)]
Add expert info for timing adjustment control message, and tweak a label.

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

9 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 differently:
morriss [Wed, 15 Sep 2010 15:13:40 +0000 (15:13 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 differently:

On Windows, rename inet_pton() to ws_inet_pton() so that builds on Vista or
later systems (that have inet_pton() natively) will still work on pre-Vista
systems.

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

9 years agoRevert 34081 and 34093 in preparation for a cleaner fix.
morriss [Wed, 15 Sep 2010 15:13:17 +0000 (15:13 +0000)]
Revert 34081 and 34093 in preparation for a cleaner fix.

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

9 years agoFollow up to bug 5209 and rev 34115:
morriss [Wed, 15 Sep 2010 14:10:25 +0000 (14:10 +0000)]
Follow up to bug 5209 and rev 34115:

%hh is C99 so remove it from packet-ssl-utils and add it to the banned list
(similar to %ll) in checkAPIs.pl .

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

9 years agoClean up the icmp info column per discussion in bug #4014.
sfisher [Tue, 14 Sep 2010 21:38:54 +0000 (21:38 +0000)]
Clean up the icmp info column per discussion in bug #4014.

Change to using new ENC_[BIG|LITTLE]_ENDIAN instead of FALSE and TRUE
in the proto_tree_add_item() calls for the identifier and sequence numbers.

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

9 years agoAdd more GUIManager code #ifdef:ed out
etxrab [Tue, 14 Sep 2010 20:50:03 +0000 (20:50 +0000)]
Add more GUIManager code #ifdef:ed out

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

9 years agoRemove duplicate register_all_protocol_handoffs entry
sfisher [Tue, 14 Sep 2010 16:03:34 +0000 (16:03 +0000)]
Remove duplicate register_all_protocol_handoffs entry

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

9 years agoBug #5211 from Guenter Strubreiter:
sfisher [Tue, 14 Sep 2010 15:54:12 +0000 (15:54 +0000)]
Bug #5211 from Guenter Strubreiter:

for writing a TCAP subdissector as a plugin some functions are needed in
libwireshark.def for export

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

9 years agoFrom Cal Turney via bug 5209:
gerald [Tue, 14 Sep 2010 15:43:19 +0000 (15:43 +0000)]
From Cal Turney via bug 5209:

Decode of SETCLIENTID calls in the Windows x86 version fail with "[Dissector
bug, protocol NFS: STATUS_ACCESS_VIOLATION: dissector accessed an invalid
memory address]".  This error occurs in packet-nfs.c in
dissect_nfs_clientaddr4() where vars 'protocol' and 'universal_ip_address' get
stepped on following the call to scanf().  The b1-b10 vars are declared as
quint8.  While "hh" modifier used in the scanf() is documented in Linux to
correspond to an a signed/unsigned char arg, I cannot find a similar
designation in Windows (MSDN). The Windows C compiler interprets %hhu as
corresponding to a int16 rather than int8.

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

9 years agoFrom tieuthunhi:
etxrab [Tue, 14 Sep 2010 14:43:56 +0000 (14:43 +0000)]
From tieuthunhi:
 Add new time source for Gigamon header.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5210

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

9 years agoFrom Vincent Helfre:
etxrab [Tue, 14 Sep 2010 14:24:39 +0000 (14:24 +0000)]
From Vincent Helfre:
Incorrect decoding of List of ARFCN in BCCH frequency list.
When the range 1024 is selected, it can happen that 2 bytes need to be read for
W1, and also for W2. In the current version, when W1 ends on a byte boundary,
W2 will get an incorrect value, since it will be truncated by 1 bit.

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

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

9 years agoAdd more GUIManager code #ifdef:ed out
etxrab [Mon, 13 Sep 2010 20:21:41 +0000 (20:21 +0000)]
Add more GUIManager code #ifdef:ed out

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

9 years agoAttempt to fix the stack overflow reported at
gerald [Mon, 13 Sep 2010 18:49:55 +0000 (18:49 +0000)]
Attempt to fix the stack overflow reported at
http://seclists.org/bugtraq/2010/Sep/87 .

Unfortunately no one from the NCNIPC pen test team has contacted us or
provided a sample capture so the fix hasn't been verified.

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

9 years agoFrom Yaniv Kaul:
etxrab [Mon, 13 Sep 2010 16:51:10 +0000 (16:51 +0000)]
From Yaniv Kaul:
[PATCH] Add SSL cipher 'Transport Layer Security (TLS) Renegotiation Indication Extension' (RFC 5746)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5207

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

9 years agoset_menu_sensitivity() is used only if MENUS_USE_UIMANAGER is defined,
guy [Sun, 12 Sep 2010 22:36:52 +0000 (22:36 +0000)]
set_menu_sensitivity() is used only if MENUS_USE_UIMANAGER is defined,
so define it only if MENUS_USE_UIMANAGER is defined.

Clean up indentation.

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

9 years agoGet rid of /* within comment, clean up white space.
guy [Sun, 12 Sep 2010 21:53:26 +0000 (21:53 +0000)]
Get rid of /* within comment, clean up white space.

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

9 years agoRemove deprecated check_col().
etxrab [Sun, 12 Sep 2010 19:29:05 +0000 (19:29 +0000)]
Remove deprecated check_col().

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

9 years agoAdd more GUIManager code #ifdef:ed out
etxrab [Sun, 12 Sep 2010 19:26:42 +0000 (19:26 +0000)]
Add more GUIManager code #ifdef:ed out

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

9 years ago[Automatic manuf and enterprise-numbers update for 2010-09-12]
gerald [Sun, 12 Sep 2010 15:03:34 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-09-12]

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

9 years agoDecode SLL payloads using a dissector table based on sll.ltype.
rbalint [Sun, 12 Sep 2010 01:13:42 +0000 (01:13 +0000)]
Decode SLL payloads using a dissector table based on sll.ltype.
The idea and the original patch came from Sebastian Reichel
<elektranox@gmail.com> in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594390

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

9 years agoOnly check for 4 NOP in a row within a uint32 boundary.
stig [Fri, 10 Sep 2010 21:24:32 +0000 (21:24 +0000)]
Only check for 4 NOP in a row within a uint32 boundary.

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

9 years agoFrom Martin Peylo via bug 5198:
stig [Fri, 10 Sep 2010 21:22:29 +0000 (21:22 +0000)]
From Martin Peylo via bug 5198:
Added missing OIDs in CRMF (RFC 4211) dissector.

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

9 years agoUse absolute paths in link_directories.
stig [Fri, 10 Sep 2010 16:50:12 +0000 (16:50 +0000)]
Use absolute paths in link_directories.

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

9 years agoFollow TCP and expand description for "NOP" and "EOL" options to "No-Operation (NOP)"
stig [Fri, 10 Sep 2010 16:48:00 +0000 (16:48 +0000)]
Follow TCP and expand description for "NOP" and "EOL" options to "No-Operation (NOP)"
and "End of Options List (EOL)" respectively.

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

9 years agoPut the ": %u (multiply by %u)" back on the TCP window scaling option, so
sfisher [Fri, 10 Sep 2010 16:33:46 +0000 (16:33 +0000)]
Put the ": %u (multiply by %u)" back on the TCP window scaling option, so
users don't have to expand the tree to see the details that were there
before rev 34094.

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

9 years agoExpand description for "NOP" and "EOL" options to "No-Operation (NOP)" and
sfisher [Fri, 10 Sep 2010 16:23:58 +0000 (16:23 +0000)]
Expand description for "NOP" and "EOL" options to "No-Operation (NOP)" and
"End of Options List (EOL)" respectively.

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

9 years agoEnhance the TCP option display for window scaling.
sfisher [Fri, 10 Sep 2010 16:12:17 +0000 (16:12 +0000)]
Enhance the TCP option display for window scaling.

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

9 years agoFrom BBA via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :
morriss [Fri, 10 Sep 2010 13:52:42 +0000 (13:52 +0000)]
From BBA via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :

Followup to 34081: move libwsutil _all_ the way forward so that our inet_pton
is always linked in before wsock32's.  This means that our Windows-7 Win64
builds (on which there is a native inet_pton in wsock32) will still work on
pre-Vista Win64's.

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

9 years agoUpdate dsfield ECN according to RFC3168.
stig [Fri, 10 Sep 2010 11:16:29 +0000 (11:16 +0000)]
Update dsfield ECN according to RFC3168.

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

9 years agoAdd some hf blurbs (for fields whose description is an acronym)
morriss [Thu, 9 Sep 2010 18:36:20 +0000 (18:36 +0000)]
Add some hf blurbs (for fields whose description is an acronym)

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

9 years agoRemove what appear to be two redundant lines of code (AFAIKT).
wmeier [Thu, 9 Sep 2010 17:30:35 +0000 (17:30 +0000)]
Remove what appear to be two redundant lines of code (AFAIKT).

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

9 years agoResolve another issue the Windows buildbots are having after rev 34084:
sfisher [Thu, 9 Sep 2010 15:46:40 +0000 (15:46 +0000)]
Resolve another issue the Windows buildbots are having after rev 34084:
guint8 -> guint16 for th_flags variable in segment struct.

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

9 years agoTurn the TCP timestamp option into a subtree to also show the option kind,
sfisher [Wed, 8 Sep 2010 23:10:52 +0000 (23:10 +0000)]
Turn the TCP timestamp option into a subtree to also show the option kind,
option length and values with proto_tree_add_item() intead of _add_text().
The options tree still shows the same information as before until the sub-
tree is expanded.

The goal is to do this with all TCP and IP options.

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

9 years agoMask out the header length from th_flags.
stig [Wed, 8 Sep 2010 21:25:14 +0000 (21:25 +0000)]
Mask out the header length from th_flags.

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