obnox/wireshark/wip.git
14 years agoDon't use %s as the format string in val_to_str().
morriss [Tue, 6 Apr 2010 15:45:11 +0000 (15:45 +0000)]
Don't use %s as the format string in val_to_str().

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

14 years agoMention elinks as an alternative to lynx [on *nix].
wmeier [Tue, 6 Apr 2010 15:34:07 +0000 (15:34 +0000)]
Mention elinks as an alternative to lynx [on *nix].

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

14 years agoDon't use %s as the format string in val_to_str(). This fixes the fuzz failure in...
morriss [Tue, 6 Apr 2010 13:40:06 +0000 (13:40 +0000)]
Don't use %s as the format string in val_to_str().  This fixes the fuzz failure in bug 4646.

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

14 years agoclear the store list before inserting all raws
kukosa [Tue, 6 Apr 2010 07:19:29 +0000 (07:19 +0000)]
clear the store list before inserting all raws

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

14 years agoThe third argument to val_to_str() is a format string that gets passed
guy [Tue, 6 Apr 2010 02:49:18 +0000 (02:49 +0000)]
The third argument to val_to_str() is a format string that gets passed
the value that couldn't be mapped to a string - it's an integer and
needs to be printed with an integer format.  Fixes bug 4644.

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

14 years agoFix gcc -Wshadow warnings.
wmeier [Tue, 6 Apr 2010 00:58:05 +0000 (00:58 +0000)]
Fix gcc -Wshadow warnings.

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

14 years agoGive David Aggeler credit for the VMLAB dissector (and also for enchancements to...
wmeier [Tue, 6 Apr 2010 00:13:45 +0000 (00:13 +0000)]
Give David Aggeler credit for the VMLAB dissector (and also for enchancements to the DICOM dissector).

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

14 years agoTreat the first block we read, when opening, specially:
guy [Mon, 5 Apr 2010 22:20:21 +0000 (22:20 +0000)]
Treat the first block we read, when opening, specially:

1) if it's not an SHB, just say "this is not a pcap-ng file",
   don't try to process it (we can't process it, as we haven't
   finished setting up all the state information yet);

2) if it has the right SHB type code, but isn't a valid SHB,
   just say "this is not a pcap-ng file".

For all other SHB's, treat anything that renders it invalid as an error.

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

14 years ago"Web Cache Coordination Protocol" ==> "Web Cache Communication Protocol"
wmeier [Mon, 5 Apr 2010 21:42:28 +0000 (21:42 +0000)]
"Web Cache Coordination Protocol" ==> "Web Cache Communication Protocol"

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

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

14 years agoAs requested by David Aggeler:
wmeier [Mon, 5 Apr 2010 21:14:05 +0000 (21:14 +0000)]
As requested by  David Aggeler:

About hf_, in

    { &hf_vmlab_flags_fragment, { "More Fragments", "vmlab.fragment",
        FT_UINT8, BASE_HEX, VALS(fragment_vals), 0x04, NULL, HFILL }},

I'd like to keep BASE_NONE to avoid the number to show in brackets.

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

14 years agoNote that -X stdin_descr stretches the original intent of the -X option.
gerald [Mon, 5 Apr 2010 21:13:00 +0000 (21:13 +0000)]
Note that -X stdin_descr stretches the original intent of the -X option.

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

14 years agoDisable the possible use of 'links' to generate release-notes.txt
wmeier [Mon, 5 Apr 2010 21:04:37 +0000 (21:04 +0000)]
Disable the possible use of 'links' to generate release-notes.txt
"Fixes" Bug #4631.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4631

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

14 years agoGet rid of a bunch of check_col().
etxrab [Mon, 5 Apr 2010 20:04:52 +0000 (20:04 +0000)]
Get rid of a bunch of check_col().

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

14 years agoAdd coment about why 'links' fails if it is used to generate release-notes.txt
wmeier [Mon, 5 Apr 2010 19:42:07 +0000 (19:42 +0000)]
Add coment about why 'links' fails if it is used to generate release-notes.txt

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

14 years agoRemove 'if (tree)' around code so that ethertype always gets called with correct...
wmeier [Mon, 5 Apr 2010 17:55:57 +0000 (17:55 +0000)]
Remove 'if (tree)' around code so that ethertype always gets called with correct values.

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

14 years agoCleanup:
wmeier [Mon, 5 Apr 2010 17:31:28 +0000 (17:31 +0000)]
Cleanup:
 - hf[] array:fix some "Display" fields: eg: FT_BOOLEAN to BASE_HEX
 - There's no prefs: thus no need for prefs_register_protocol
 - whitespace;
 ...

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

14 years agoPut volatile back - without it, the compiler warns you.
guy [Mon, 5 Apr 2010 17:16:08 +0000 (17:16 +0000)]
Put volatile back - without it, the compiler warns you.

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

14 years agoRemove volatile
krj [Mon, 5 Apr 2010 16:36:58 +0000 (16:36 +0000)]
Remove volatile

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

14 years agoGet rid of unused variable.
guy [Mon, 5 Apr 2010 16:17:42 +0000 (16:17 +0000)]
Get rid of unused variable.

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

14 years agoAdded packet-vmlab.c
stig [Mon, 5 Apr 2010 15:57:29 +0000 (15:57 +0000)]
Added packet-vmlab.c

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

14 years agoFrom David Aggeler:
etxrab [Mon, 5 Apr 2010 15:48:11 +0000 (15:48 +0000)]
From David Aggeler:
Support for VMware Lab Manager Host Spanning
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4186

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

14 years agoFrom David Aggeler:
etxrab [Mon, 5 Apr 2010 09:24:25 +0000 (09:24 +0000)]
From David Aggeler:
Fixed wrong declaration in packet-vlan.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4186

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

14 years agoFrom David Aggeler:
etxrab [Mon, 5 Apr 2010 09:21:48 +0000 (09:21 +0000)]
From David Aggeler:
Added 0x88DE to etypes.h
Added ETHERTYPE_VMLAB
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4186

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

14 years agoFrom Toshihiro KATAOKA:
etxrab [Mon, 5 Apr 2010 07:37:04 +0000 (07:37 +0000)]
From Toshihiro KATAOKA:
The decoded MSISDN AVP in 3GPP diameter AVP and the decoded MSISDN IE in 3GPP
GTPv2 IE are not correct.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4638

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

14 years agoReplace GtkCList by GtkTreeView.
jake [Sun, 4 Apr 2010 21:32:27 +0000 (21:32 +0000)]
Replace GtkCList by GtkTreeView.

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

14 years agoFrom Jelmer Vernooij via bug 4640:
stig [Sun, 4 Apr 2010 20:30:33 +0000 (20:30 +0000)]
From Jelmer Vernooij via bug 4640:
This patch adds a dissector for the Git smart server protocol (git://),
splitting the stream up into packets.

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

14 years ago[Automatic manuf and enterprise-numbers update for 2010-04-04]
gerald [Sun, 4 Apr 2010 15:03:28 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-04-04]

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

14 years agopacket-ssl-utils.h now includes <stdio.h> itself.
guy [Sun, 4 Apr 2010 03:06:25 +0000 (03:06 +0000)]
packet-ssl-utils.h now includes <stdio.h> itself.

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

14 years agoFix to match changes to the signatures of the real versions of those
guy [Sun, 4 Apr 2010 03:05:27 +0000 (03:05 +0000)]
Fix to match changes to the signatures of the real versions of those
functions.

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

14 years agoNeeds #include <stdio.h>.
wmeier [Sun, 4 Apr 2010 02:25:32 +0000 (02:25 +0000)]
Needs #include <stdio.h>.

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

14 years agopacket-ssl-utils.h uses "FILE *"; at least on Solaris, we need to
guy [Sun, 4 Apr 2010 00:48:17 +0000 (00:48 +0000)]
packet-ssl-utils.h uses "FILE *"; at least on Solaris, we need to
include <stdio.h> to get "FILE *" declared.

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

14 years agoRemove unneeded #include <stdio.h>
wmeier [Sat, 3 Apr 2010 21:55:23 +0000 (21:55 +0000)]
Remove unneeded #include <stdio.h>

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

14 years ago(Trivial): indentation & whitespace cleanup.
wmeier [Sat, 3 Apr 2010 19:20:07 +0000 (19:20 +0000)]
(Trivial): indentation & whitespace cleanup.

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

14 years ago From Yaniv Kaul: constify parameters
wmeier [Sat, 3 Apr 2010 18:18:50 +0000 (18:18 +0000)]
 From Yaniv Kaul: constify parameters
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422

 From me: Fix a number of instances where the function prototype or
  the function definition wasn't changed so there was a mismatch
  thus causing Windows (but not gcc) compilation errors.

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

14 years agoMake UDP Multicast Stream dialog work again.
jake [Sat, 3 Apr 2010 11:42:18 +0000 (11:42 +0000)]
Make UDP Multicast Stream dialog work again.

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

14 years agoFix compile error caused by the previous commit.
rbalint [Fri, 2 Apr 2010 21:14:30 +0000 (21:14 +0000)]
Fix compile error caused by the previous commit.

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

14 years agoFix crash when double clicking in packet list area before capturing any packet.
rbalint [Fri, 2 Apr 2010 20:40:20 +0000 (20:40 +0000)]
Fix crash when double clicking in packet list area before capturing any packet.
The crash does not happen when using the new packet list.

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

14 years agoRevert SVN #32360 until Windows compilation errors corrected.
wmeier [Fri, 2 Apr 2010 15:18:03 +0000 (15:18 +0000)]
Revert SVN #32360 until Windows compilation errors corrected.

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

14 years agoFrom Yaniv Kaul: constify parameters
wmeier [Fri, 2 Apr 2010 14:37:49 +0000 (14:37 +0000)]
From Yaniv Kaul: constify parameters
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422

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

14 years agoMake the test compile.
jake [Fri, 2 Apr 2010 06:03:44 +0000 (06:03 +0000)]
Make the test compile.

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

14 years agoAdd -X stdin_descr to the man page.
gerald [Fri, 2 Apr 2010 02:04:54 +0000 (02:04 +0000)]
Add -X stdin_descr to the man page.

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

14 years agoKeep a copy of the interface description and capture filter around so that
gerald [Thu, 1 Apr 2010 21:55:01 +0000 (21:55 +0000)]
Keep a copy of the interface description and capture filter around so that
we can use it in the main window title during and after capture. Add a
"-X" option for providing a description for stdin.

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

14 years agoFrom sangaran:
etxrab [Thu, 1 Apr 2010 20:49:07 +0000 (20:49 +0000)]
From sangaran:
8-bit Bit Flag decoder method needed in wimaxasncp plugin dissecto.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4608

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

14 years agoFrom KATAOKA Toshihiro:
etxrab [Thu, 1 Apr 2010 20:20:25 +0000 (20:20 +0000)]
From KATAOKA Toshihiro:
Protocol preference for x2ap port.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4634

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

14 years agoFix Tag value wrong in ansi_map.asn file for ServiceId in ServiceRequest message.
etxrab [Thu, 1 Apr 2010 20:07:17 +0000 (20:07 +0000)]
Fix Tag value wrong in ansi_map.asn file for ServiceId in ServiceRequest message.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4637

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

14 years agoFrom Aniruddha A: ANCP (Access Node Control Protocol) Dissector.
wmeier [Thu, 1 Apr 2010 17:49:26 +0000 (17:49 +0000)]
From Aniruddha A: ANCP (Access Node Control Protocol) Dissector.
  see: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4590

From me: A few minor changes:
- Make ancp_info a local variable rather than a static global variable;
- Use Stats ! ANCP   rather than Stats ! ANCP ! Packet Types.

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

14 years agoAdd Yi Yu (see bug 3543)
morriss [Thu, 1 Apr 2010 12:51:33 +0000 (12:51 +0000)]
Add Yi Yu (see bug 3543)

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

14 years agoAdd readme to track modules
krj [Thu, 1 Apr 2010 10:13:47 +0000 (10:13 +0000)]
Add readme to track modules

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

14 years agoSync ZLIB from CMake trunk
krj [Thu, 1 Apr 2010 10:10:48 +0000 (10:10 +0000)]
Sync ZLIB from CMake trunk

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

14 years agoExpand the comment explaining the workaround for the Snow Leopard
guy [Thu, 1 Apr 2010 00:27:25 +0000 (00:27 +0000)]
Expand the comment explaining the workaround for the Snow Leopard
timeout bug.

Make the code for the workaround assume any 10.6.x release other than
10.6.2 requires it; that way we don't have to update the code until
either

1) Apple fixes the bug in a later 10.6.x update

or

2) Apple comes out with a major release that still has, or
   reintroduces, the bug.

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

14 years agoEnable pcap timeout workaround for Mac OS X 10.6.3, since the bug seems to be
tuexen [Wed, 31 Mar 2010 23:37:42 +0000 (23:37 +0000)]
Enable pcap timeout workaround for Mac OS X 10.6.3, since the bug seems to be
back.

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

14 years ago1.3.4 -> 1.3.5.
gerald [Wed, 31 Mar 2010 22:54:07 +0000 (22:54 +0000)]
1.3.4 -> 1.3.5.

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

14 years agoFrom Jouni Malinen:
etxrab [Wed, 31 Mar 2010 19:10:43 +0000 (19:10 +0000)]
From Jouni Malinen:
Dissect IEEE 802.11r and IEEE 802.11w features.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4626
With extra minor code cleanup.

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

14 years agoBuild 1.3.4.
gerald [Wed, 31 Mar 2010 16:29:45 +0000 (16:29 +0000)]
Build 1.3.4.

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

14 years agoUse IANA asigned PPID and port.
etxrab [Wed, 31 Mar 2010 08:53:00 +0000 (08:53 +0000)]
Use IANA asigned PPID and port.

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

14 years agoFrom KATAOKA Toshihiro:
etxrab [Wed, 31 Mar 2010 08:51:29 +0000 (08:51 +0000)]
From KATAOKA Toshihiro:
Add sctp default port for S1AP.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4630

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

14 years agoInsert the function which analyzes Q.708 ISPCs in libwireshark.def
dimeg [Wed, 31 Mar 2010 05:36:31 +0000 (05:36 +0000)]
Insert the function which analyzes Q.708 ISPCs in libwireshark.def

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

14 years ago(Trivial) cleanup some indentation/whitespace.
wmeier [Wed, 31 Mar 2010 02:30:52 +0000 (02:30 +0000)]
(Trivial) cleanup some indentation/whitespace.

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

14 years agoAdd missing svn properties
jmayer [Tue, 30 Mar 2010 23:44:25 +0000 (23:44 +0000)]
Add missing svn properties

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

14 years agoAdd routine and tables for analyzing International Signalling Point
dimeg [Tue, 30 Mar 2010 22:05:47 +0000 (22:05 +0000)]
Add routine and tables for analyzing International Signalling Point
Codes (ISPCs) according to Q.708. Update the MTP3 dissector to use
this function when the routing label carries ISPCs

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

14 years agoRevert commit 31798 and 31799 as requested by Johannes Berg
etxrab [Tue, 30 Mar 2010 21:20:48 +0000 (21:20 +0000)]
Revert commit 31798 and 31799 as requested by Johannes Berg
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4283
Follow up in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4421

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

14 years agoTemporary (?) fix for bug 4623.
gerald [Tue, 30 Mar 2010 21:12:52 +0000 (21:12 +0000)]
Temporary (?) fix for bug 4623.

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

14 years agoDo not reassemble messages if segment is not complete (packet size limited during...
kukosa [Tue, 30 Mar 2010 12:23:52 +0000 (12:23 +0000)]
Do not reassemble messages if segment is not complete (packet size limited during capture)

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

14 years agoFrom Richard Kümmel: Added the bitmasks for port 10 and port 11.
wmeier [Mon, 29 Mar 2010 16:52:47 +0000 (16:52 +0000)]
From Richard Kümmel: Added the bitmasks for port 10 and port 11.

From me: As per Richard: Fix definitions of the bitfield for hf_esl_crcerror and
hf_esl_alignerror.

See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3677#c10

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

14 years agoFrom Jim Young:
etxrab [Sun, 28 Mar 2010 20:22:09 +0000 (20:22 +0000)]
From Jim Young:
patch to gui_utils.c to allow the new packetlist to respond to left/right keystrokes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4614

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

14 years agoFix Bug 4388 "Expert Info Composite" : wrong font in tab "Details"
etxrab [Sun, 28 Mar 2010 20:13:31 +0000 (20:13 +0000)]
Fix Bug 4388 "Expert Info Composite" : wrong font in tab "Details"
By commenting out gtk_widget_modify_font() in expert_dlg_init_table() as per Geralds comment.

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

14 years agoFrom Robert Bullen: give the Bluetooth-H4-with-Linux-pseudo-header
guy [Sun, 28 Mar 2010 19:35:14 +0000 (19:35 +0000)]
From Robert Bullen: give the Bluetooth-H4-with-Linux-pseudo-header
encapsulation a name different from the no-pseudo-header H4
encapsulation.

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

14 years agoFrom Didier Gautheron via bug 4622:
stig [Sun, 28 Mar 2010 19:02:52 +0000 (19:02 +0000)]
From Didier Gautheron via bug 4622:
Double and float are BASE_NONE not BASE_DEC.

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

14 years agoFrom Ben Greear: Update to the LANforge dissector to handle newer protocol formats.
wmeier [Sun, 28 Mar 2010 18:27:40 +0000 (18:27 +0000)]
From Ben Greear: Update to the LANforge dissector to handle newer protocol formats.
   See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4611
From me:
 - Remove #if 0'd #includes;
 - Use tvb_reported_length_remaining (instead of tvb_length_remaining)
 - Other minor cleanup (including whitespace).

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

14 years ago[Automatic manuf and enterprise-numbers update for 2010-03-28]
gerald [Sun, 28 Mar 2010 15:03:15 +0000 (15:03 +0000)]
[Automatic manuf and enterprise-numbers update for 2010-03-28]

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

14 years agoConvert tabs to spaces as per the comment in the file.
wmeier [Sat, 27 Mar 2010 18:43:12 +0000 (18:43 +0000)]
Convert tabs to spaces as per the comment in the file.

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

14 years agoSquelch some compiler warnings.
guy [Sat, 27 Mar 2010 18:27:17 +0000 (18:27 +0000)]
Squelch some compiler warnings.

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

14 years agoSquelch some compiler warnings.
guy [Sat, 27 Mar 2010 18:24:05 +0000 (18:24 +0000)]
Squelch some compiler warnings.

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

14 years agoAdd proto_tree_add_bitmask_text to libwireshark.def
etxrab [Sat, 27 Mar 2010 18:19:31 +0000 (18:19 +0000)]
Add proto_tree_add_bitmask_text to libwireshark.def
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4621

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

14 years agoSquelch a compiler warning.
guy [Sat, 27 Mar 2010 18:17:19 +0000 (18:17 +0000)]
Squelch a compiler warning.

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

14 years ago- Make dfilter_sip_request_line() take offset as an argument to get the right offset...
etxrab [Sat, 27 Mar 2010 18:09:37 +0000 (18:09 +0000)]
- Make dfilter_sip_request_line() take offset as an argument to get the right offset in case there is more than one SIP message in an tvb.

- Use correct line end offset to dissect_sip_uri().
Fixes bug
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4570

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

14 years ago#include <stdio.h> not req'd; cleanup whitespace & indentation.
wmeier [Sat, 27 Mar 2010 17:06:22 +0000 (17:06 +0000)]
#include <stdio.h> not req'd; cleanup whitespace & indentation.

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

14 years agoFix an "unused variable" warning: remove 'infoStrings'
wmeier [Sat, 27 Mar 2010 15:46:36 +0000 (15:46 +0000)]
Fix an "unused variable" warning: remove 'infoStrings'

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

14 years agoFrom Chuck Kristofek:
etxrab [Sat, 27 Mar 2010 15:23:16 +0000 (15:23 +0000)]
From Chuck Kristofek:
DIS update to introduce hf_ based filtering and radio family dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4610

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

14 years agoSquelch some compiler warnings.
guy [Sat, 27 Mar 2010 06:47:47 +0000 (06:47 +0000)]
Squelch some compiler warnings.

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

14 years agoFix (or at least work around the crash in)
morriss [Sat, 27 Mar 2010 00:54:11 +0000 (00:54 +0000)]
Fix (or at least work around the crash in)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4119 :

Never insert more than 1000 silence frames (e.g., if the sequence number jumps
massively).  There may be a better way, but at least now we won't crash.
Leave a comment in the code indicating this.

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

14 years agoConstify an argument.
guy [Fri, 26 Mar 2010 23:40:48 +0000 (23:40 +0000)]
Constify an argument.

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

14 years agos/#if DEBUG/#ifdef DEBUG/
morriss [Fri, 26 Mar 2010 23:34:54 +0000 (23:34 +0000)]
s/#if DEBUG/#ifdef DEBUG/

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

14 years agog_strv_length() is only available in GLib 2.6 and later, and we don't
guy [Fri, 26 Mar 2010 22:49:24 +0000 (22:49 +0000)]
g_strv_length() is only available in GLib 2.6 and later, and we don't
require GLib 2.6, just 2.4 or later.

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

14 years agoPrint 32-bit counters with the right format.
guy [Fri, 26 Mar 2010 22:36:22 +0000 (22:36 +0000)]
Print 32-bit counters with the right format.

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

14 years agoIf we have more than 4294967295 items, we have a real problem, as we
guy [Fri, 26 Mar 2010 22:30:54 +0000 (22:30 +0000)]
If we have more than 4294967295 items, we have a real problem, as we
allocate memory for each item.

Use gboolean for Boolean flags.

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

14 years agoUse one space and a larger printf field width instead of many spaces and a
morriss [Fri, 26 Mar 2010 21:19:30 +0000 (21:19 +0000)]
Use one space and a larger printf field width instead of many spaces and a
smaller field width.  This allows printf to use those extra spaces if it needs
to, helping column alignment when the numbers are big.

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

14 years agoAdd another MCC for India
dimeg [Fri, 26 Mar 2010 21:19:19 +0000 (21:19 +0000)]
Add another MCC for India

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

14 years agoUse 64-bit counters throughout. This fixes https://bugs.wireshark.org/bugzilla/show_...
morriss [Fri, 26 Mar 2010 21:07:49 +0000 (21:07 +0000)]
Use 64-bit counters throughout.  This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3205
though most of the other taps also need such a change.

Note: the columns don't align with really big numbers.

Add support for 64-bit ftypes.

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

14 years agoFrom Mike Morrin:
etxrab [Fri, 26 Mar 2010 20:31:47 +0000 (20:31 +0000)]
From Mike Morrin:
There were 2 dissectors for GPRS-NS (GSM 48.016) protocol, packet-gprs-ns.c and
packet-gprs-ns.c.  packet-nsip.c seemed to be the more complete, and has a
cleaner output.

I have polished up nsip.c and changed it so that it identifies itself as the
dissector for gprs-ns.

packet-gprs-ns.c can be deleted.
(Removed from the makefile for now).

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

14 years agoFrom Andrej Kuehnal:
etxrab [Fri, 26 Mar 2010 20:15:55 +0000 (20:15 +0000)]
From Andrej Kuehnal:
tap-diameter-avp.patch:
- make diameter.cmd_code configurable rather than hard coded in
- more fields in the output
- documetation/man pages + usage examples
- switch option parser from stdlib to glib to avoid troubles with M$ c++

diameter-dict.patch
remove strage spaces in the AVP names.

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

14 years agoUpdate c-ares to 1.7.1.
gerald [Fri, 26 Mar 2010 18:36:27 +0000 (18:36 +0000)]
Update c-ares to 1.7.1.

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

14 years agoFrom Kovarththanan Rajaratnam via
morriss [Fri, 26 Mar 2010 18:04:09 +0000 (18:04 +0000)]
From Kovarththanan Rajaratnam via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3437 :

PSDK is now required when building with MSVC6.

From me: change some spacing around to make the table
in section 4.4.1 more readable in PDF form.

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

14 years agoUpdate MNC list with all amendments up to No. 17 (ITU
dimeg [Thu, 25 Mar 2010 22:52:55 +0000 (22:52 +0000)]
Update MNC list with all amendments up to No. 17 (ITU
Operational Bulletin 951)

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

14 years agoFrom Alexis La Goutte:
jake [Thu, 25 Mar 2010 22:41:46 +0000 (22:41 +0000)]
From Alexis La Goutte:
Add IKE Notify Message from RFC5685: Redirect Mechanism for IKEv2
Add IKE Notify Message from RFC5723: Session Resumption for IKEv2
Add IKE Notify Message from Cisco Unity

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

14 years agoRemove svn:executable property.
wmeier [Thu, 25 Mar 2010 22:35:29 +0000 (22:35 +0000)]
Remove svn:executable property.

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

14 years agoFrom Alexis La Goutte:
jake [Thu, 25 Mar 2010 22:29:17 +0000 (22:29 +0000)]
From Alexis La Goutte:
Add IKEv2 Config Attributes from Experimental RFC5739:
IPv6 Configuration in IKEv2
Updates missing IKEv2 Config Attributes from RFC4306 (SUPPORTED_ATTRIBUTES and INTERNAL_IP6_SUBNET)

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

14 years agoSet svn:executable property for some .py and .pl files
wmeier [Thu, 25 Mar 2010 22:22:45 +0000 (22:22 +0000)]
Set svn:executable property for some .py and .pl files

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

14 years agoUpdate for RFC 4578.
jake [Thu, 25 Mar 2010 22:15:11 +0000 (22:15 +0000)]
Update for RFC 4578.

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

14 years agoAdd svn:eol-style native property
wmeier [Thu, 25 Mar 2010 20:59:08 +0000 (20:59 +0000)]
Add svn:eol-style native property

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