7 years agocd ../gtk ==> cd ../ui/gtk
wmeier [Sun, 15 Jan 2012 23:13:01 +0000 (23:13 +0000)]
cd ../gtk ==> cd ../ui/gtk

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

7 years agoMissed another .. -> ../.. case
jmayer [Sun, 15 Jan 2012 23:07:44 +0000 (23:07 +0000)]
Missed another .. -> ../.. case

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

7 years agoMore .. -> ../.. changes after gtk/ move
jmayer [Sun, 15 Jan 2012 22:40:03 +0000 (22:40 +0000)]
More .. -> ../.. changes after gtk/ move

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

7 years agoMore .. -> ../.. changes after gtk/ move
jmayer [Sun, 15 Jan 2012 22:22:28 +0000 (22:22 +0000)]
More .. -> ../.. changes after gtk/ move

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

7 years agoClean up after gtk/ move: Makefile.am.inc is now at ../..
jmayer [Sun, 15 Jan 2012 22:12:28 +0000 (22:12 +0000)]
Clean up after gtk/ move: Makefile.am.inc is now at ../..

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

7 years agoAdd back revision 40517 which got lost during gtk/ move
jmayer [Sun, 15 Jan 2012 22:09:43 +0000 (22:09 +0000)]
Add back revision 40517 which got lost during gtk/ move

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

7 years agoRemove gtk-dir
jmayer [Sun, 15 Jan 2012 22:05:02 +0000 (22:05 +0000)]
Remove gtk-dir

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

7 years agoMove gtk to ui/gtk.
jmayer [Sun, 15 Jan 2012 21:59:11 +0000 (21:59 +0000)]
Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.

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

7 years agoHave the time field in the Graph Analyzis windos use the same time format as used...
etxrab [Sun, 15 Jan 2012 20:14:22 +0000 (20:14 +0000)]
Have the time field in the Graph Analyzis windos use the same time format as used to view the trace.

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

7 years agoThe warning fix overdid things: It removed functionality.
jmayer [Sun, 15 Jan 2012 17:07:55 +0000 (17:07 +0000)]
The warning fix overdid things: It removed functionality.
Now I only remove the variable ft and everything looks good.

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

7 years ago[Automatic manuf, services and enterprise-numbers update for 2012-01-15]
gerald [Sun, 15 Jan 2012 15:03:26 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-01-15]

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

7 years agoThe last commit failed to check in the deleted files
jmayer [Sun, 15 Jan 2012 12:30:52 +0000 (12:30 +0000)]
The last commit failed to check in the deleted files

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

7 years agoRename crypt-xxx to xxx
jmayer [Sun, 15 Jan 2012 12:29:44 +0000 (12:29 +0000)]
Rename crypt-xxx to xxx

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

7 years agoAccidentally checked in Makefile.in
jmayer [Sun, 15 Jan 2012 12:28:01 +0000 (12:28 +0000)]
Accidentally checked in Makefile.in

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

7 years agoShuffle the ett[] array elements around a bit, and add blank lines, to
guy [Sun, 15 Jan 2012 09:07:54 +0000 (09:07 +0000)]
Shuffle the ett[] array elements around a bit, and add blank lines, to
match their definitions; add two missing elements that turned up.  That
should fix bug 6736.

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

7 years agowth->phdr.pkt_encap isn't set on a seek-and-read; pass the encapsulation
guy [Sat, 14 Jan 2012 20:58:41 +0000 (20:58 +0000)]
wth->phdr.pkt_encap isn't set on a seek-and-read; pass the encapsulation
directly to k12text_set_pseudo_header(), so that it's passed the right
encapsulation for seek-and-read as well as for read.  Fixes the
"malformed frames when reading some K12 text files" problem for which
we're using bug 6735.

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

7 years agoRemove obsolete comments referring to mem_chunks.
wmeier [Sat, 14 Jan 2012 20:14:43 +0000 (20:14 +0000)]
Remove obsolete comments referring to mem_chunks.

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

7 years agoSeveral minor changes:
wmeier [Sat, 14 Jan 2012 17:18:26 +0000 (17:18 +0000)]
Several minor changes:
- use consistent indentation;
- use tvb_reported_length_remaining() in one case;
- reformat a long line.

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

7 years agoMinor updates:
wmeier [Sat, 14 Jan 2012 17:03:34 +0000 (17:03 +0000)]
Minor updates:
 - checkcol() not req'd in a few cases;
 - Add an XXX comment about the (mis?)use of tvb_length();
 - lenght -> length;

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

7 years agoUse REPORT_DISSECTOR_BUG() instead of g_print(); Other minor cleanup.
wmeier [Sat, 14 Jan 2012 16:18:16 +0000 (16:18 +0000)]
Use REPORT_DISSECTOR_BUG() instead of g_print(); Other minor cleanup.

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

7 years agocheck_col() not req'd and other minor cleanups ....
wmeier [Sat, 14 Jan 2012 15:47:40 +0000 (15:47 +0000)]
check_col() not req'd and other minor cleanups ....

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

7 years agoMaybe adding $(GNUTLS_CFLAGS) will fix the build problem.
jmayer [Sat, 14 Jan 2012 15:46:25 +0000 (15:46 +0000)]
Maybe adding $(GNUTLS_CFLAGS) will fix the build problem.

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

7 years agocommit 40500 missed the asn1 directory
jmayer [Sat, 14 Jan 2012 15:23:04 +0000 (15:23 +0000)]
commit 40500 missed the asn1 directory

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

7 years agoEd Beroset <beroset@mindspring.com> via bug 5531
jmayer [Sat, 14 Jan 2012 15:22:10 +0000 (15:22 +0000)]
Ed Beroset <beroset@mindspring.com> via bug 5531

The ANSI C12.22 protocol is a smart grid protocol for utility meters, including
gas, water and electric.  The dissector implemented in the patch file includes
full support for all EPSEM (Extended Protocol Specification for Electricity
Metering) services and includes a full implementation of the C12.22 security


To decrypt the attached sample file, you need to set up the key table in the
preferences to include key 0 with a value of 6624C7E23034E4036FE5CB3A8B5DAB44.

Me: Fixes for:

[ 64%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o
../../asn1/c1222/packet-c1222-template.c: In function ‘dissect_epsem’:
../../asn1/c1222/packet-c1222-template.c:860:15: error: variable ‘ft’ set but not used [-Werror=unused-but-set-variable]

[  5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o
../../asn1/c1222/packet-c1222-template.c:103:19: error: ‘c1222_flags’ defined but not used [-Werror=unused-variable]

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

7 years agoFix unused parameter warnings
etxrab [Sat, 14 Jan 2012 14:47:37 +0000 (14:47 +0000)]
Fix unused parameter warnings

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

7 years agoOptionally build cmake, document why we need xz
jmayer [Sat, 14 Jan 2012 14:40:58 +0000 (14:40 +0000)]
Optionally build cmake, document why we need xz

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

7 years agoAdd another warning (-Warray-bounds) to sync with cmake
jmayer [Sat, 14 Jan 2012 14:39:30 +0000 (14:39 +0000)]
Add another warning (-Warray-bounds) to sync with cmake

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

7 years agoThis seams to leave fewer graphical artefacts.
etxrab [Sat, 14 Jan 2012 12:52:56 +0000 (12:52 +0000)]
This seams to leave fewer graphical artefacts.

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

7 years agoNetMon 1.x format does *not* support per-packet encapsulation.
guy [Sat, 14 Jan 2012 10:31:25 +0000 (10:31 +0000)]
NetMon 1.x format does *not* support per-packet encapsulation.

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

7 years agoIn the list of supported file types, put the file type of the file being
guy [Sat, 14 Jan 2012 09:16:31 +0000 (09:16 +0000)]
In the list of supported file types, put the file type of the file being
saved at the beginning of the list, if it's supported (it might not be
if we don't support writing that file format).  If that happens to be
pcap, put pcap-NG right after it (if we can write something out as pcap,
we can always write it out as pcap-NG); if it happens to be pcap-NG, put
pcap right after it if it's supported (if it has per-packet
encapsulation, pcap won't be supported).

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

7 years agoGet rid of unused WTAP_FILE_WTAP file type.
guy [Sat, 14 Jan 2012 09:12:05 +0000 (09:12 +0000)]
Get rid of unused WTAP_FILE_WTAP file type.

Move pcap-NG right after standard pcap in the list of file types, so
that it shows up early in the list of output file types in the "Save
As..." dialog box (if, that is, it's supported; if not, neither is pcap,
as they use the same link-layer header type values).

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

7 years agoWTAP_ENCAP_UNKNOWN should never appear as an actual encapsulation type,
guy [Sat, 14 Jan 2012 09:00:37 +0000 (09:00 +0000)]
WTAP_ENCAP_UNKNOWN should never appear as an actual encapsulation type,
and can't be supported as an output encapsulation in any case.

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

7 years agoGet rid of some unused #defines.
guy [Sat, 14 Jan 2012 03:56:22 +0000 (03:56 +0000)]
Get rid of some unused #defines.

Use surface_height for various heights, and set it.

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

7 years agoRemove obsolete GLIB_CHECK_VERSION(2,10,0) checks
jmayer [Sat, 14 Jan 2012 03:21:28 +0000 (03:21 +0000)]
Remove obsolete GLIB_CHECK_VERSION(2,10,0) checks

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

7 years agoAdd some debugging output to help track down an intermittent problem on
gerald [Sat, 14 Jan 2012 01:25:33 +0000 (01:25 +0000)]
Add some debugging output to help track down an intermittent problem on
one of the buildbots.

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

7 years agoInitial status bar functionality. Promote the main window's status bar
gerald [Sat, 14 Jan 2012 00:16:16 +0000 (00:16 +0000)]
Initial status bar functionality. Promote the main window's status bar
to a MainStatusBar. Add a "LabelStack" widget, which MainStatusBar uses
to duplicate features in GtkStatusbar. Make the protocol tree a
full-blown ProtoTree widget. Move main_cf_callback from main to
WiresharkApplication. Duplicate a lot of the cf callbacks as signals and
slots. Use Q_UNUSED in a few places.

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

7 years agoIn all these cases, i is a guint32, so if c_match is <= i, c_match fits
guy [Fri, 13 Jan 2012 22:27:59 +0000 (22:27 +0000)]
In all these cases, i is a guint32, so if c_match is <= i, c_match fits
in a guint32; cast it to one to squelch compiler warnings.

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

7 years agoMinor cleanup:
wmeier [Fri, 13 Jan 2012 22:04:09 +0000 (22:04 +0000)]
Minor cleanup:
- Move a global var to be local to a fcn;
- Remove an unneeded forward declaration;
- Do some minor reformatting.

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

7 years agoMinor cleanup:
wmeier [Fri, 13 Jan 2012 21:44:13 +0000 (21:44 +0000)]
Minor cleanup:
- Remove set but unused variable;
- Fix indentation to match that specified by the Editor Modelines

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

7 years agodfs and mapi do create warnings. move them back to dirty
jmayer [Fri, 13 Jan 2012 21:25:27 +0000 (21:25 +0000)]
dfs and mapi do create warnings. move them  back to dirty

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

7 years agoFix Bug #6276: "Find Packet" Bug:
wmeier [Fri, 13 Jan 2012 21:09:33 +0000 (21:09 +0000)]
Fix Bug #6276: "Find Packet" Bug:

 'The search query e.g. (ASCII or hex) "abac" doesn't find the packet(s)
  containing the string "ababac".'


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

7 years agoIntroduce a dissector table to be used for proprietary tags.
etxrab [Fri, 13 Jan 2012 20:45:02 +0000 (20:45 +0000)]
Introduce a dissector table to be used for proprietary tags.

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

7 years agoFix a copy paste error.
etxrab [Fri, 13 Jan 2012 20:43:07 +0000 (20:43 +0000)]
Fix a copy paste error.

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

7 years agoEliminate duplicate entries created by a merging error
jmayer [Fri, 13 Jan 2012 20:11:48 +0000 (20:11 +0000)]
Eliminate duplicate entries created by a merging error

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

7 years agoOnly one instance of packet-dcerpc-mapi.c and packet-dcerpc-mapi.h,
guy [Fri, 13 Jan 2012 20:06:49 +0000 (20:06 +0000)]
Only one instance of packet-dcerpc-mapi.c and packet-dcerpc-mapi.h,

Move some generated DCERPC dissectors back to the clean list; if they
actually *do* generate warnings, move them back.

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

7 years agoSync filelists between autofoo and cmake.
jmayer [Fri, 13 Jan 2012 19:29:58 +0000 (19:29 +0000)]
Sync filelists between autofoo and cmake.
Move some dissectors that throw warnings to DIRTY_
Whitespace cleanups

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

7 years agoAdd comment about possible expert item
jmayer [Fri, 13 Jan 2012 19:27:01 +0000 (19:27 +0000)]
Add comment about possible expert item

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

7 years agoUpdate ISAKMP to last IANA Parameters (2011-11-07)
alagoutte [Fri, 13 Jan 2012 16:59:22 +0000 (16:59 +0000)]
Update ISAKMP to last IANA Parameters (2011-11-07)
Add new ISAKMP Attribut of RFC6407 and new IKE type (GAP ID 22)

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:37:21 +0000 (16:37 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:37:04 +0000 (16:37 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:36:07 +0000 (16:36 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:34:32 +0000 (16:34 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:34:15 +0000 (16:34 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:33:57 +0000 (16:33 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:33:40 +0000 (16:33 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:33:04 +0000 (16:33 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:30:39 +0000 (16:30 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:28:54 +0000 (16:28 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:27:50 +0000 (16:27 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:26:45 +0000 (16:26 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:24:44 +0000 (16:24 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:22:50 +0000 (16:22 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:21:08 +0000 (16:21 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:20:23 +0000 (16:20 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:19:24 +0000 (16:19 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:18:39 +0000 (16:18 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix some Dereference of null pointer Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:17:26 +0000 (16:17 +0000)]
Fix some Dereference of null pointer Warning found by Clang

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

7 years agoFix some Dereference of null pointer Warning found by Clang
alagoutte [Fri, 13 Jan 2012 16:16:41 +0000 (16:16 +0000)]
Fix some Dereference of null pointer Warning found by Clang

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

7 years agoAdd H248-2 Dissector to CMake (Miss in revision 40439)
alagoutte [Fri, 13 Jan 2012 16:13:40 +0000 (16:13 +0000)]
Add H248-2 Dissector to CMake (Miss in revision 40439)

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

7 years agoFix some typos.
cmaynard [Fri, 13 Jan 2012 16:05:23 +0000 (16:05 +0000)]
Fix some typos.

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

7 years agoFix:
wmeier [Fri, 13 Jan 2012 14:18:07 +0000 (14:18 +0000)]
packet-gsm_a_rr.c:3867:101: error: parameter 'len' set but not used [-Werror=unused-but-set-parameter]
packet-gsm_a_rr.c:6837:46: warning: variable 'bit_offset_sav2' set but not used [-Wunused-but-set-variable]
packet-gsm_a_rr.c:7458:18: warning: variable 'curr_offset' set but not used [-Wunused-but-set-variab

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

7 years agoMinor cleanup:
wmeier [Fri, 13 Jan 2012 14:03:10 +0000 (14:03 +0000)]
Minor cleanup:
 Merge packet-meta.h into packet-meta.c;
 Remove an unneeded #include;
 Remove an unused variable.

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

7 years agoFix:
etxrab [Fri, 13 Jan 2012 06:42:46 +0000 (06:42 +0000)]
packet-gsm_a_rr.c:3289: warning: unused parameter 'len'
packet-gsm_a_rr.c:3412: warning: unused parameter 'len'
packet-gsm_a_rr.c:4449: warning: unused variable 'bit_len'
packet-gsm_a_rr.c:4444: warning: unused parameter 'len'
packet-gsm_a_rr.c:4557: warning: unused parameter 'len'
packet-gsm_a_rr.c:6285: warning: unused parameter 'len'
packet-gsm_a_rr.c:6765: warning: unused variable 'bit_len'
packet-gsm_a_rr.c:6759: warning: unused parameter 'len'
packet-gsm_a_rr.c:6987: warning: unused variable 'bit_len'
packet-gsm_a_rr.c:6979: warning: unused parameter 'len'
packet-gsm_a_rr.c:7457: warning: unused parameter 'len'

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

7 years agoFrom Yi Zhang:
etxrab [Fri, 13 Jan 2012 06:34:07 +0000 (06:34 +0000)]
From Yi Zhang:
DSG_DA_TO_DSID_ASSOCIATION_DA/DSID is not correctly parsed in DOCSIS MDD packet.


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

7 years agoFrom Yi Zhang:
etxrab [Fri, 13 Jan 2012 06:29:03 +0000 (06:29 +0000)]
From Yi Zhang:
The DCD_CLID_BCAST_ID TLV is not supported in DOCSIS plugin.


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

7 years agoFrom Edward Sheldrake:
etxrab [Fri, 13 Jan 2012 06:22:56 +0000 (06:22 +0000)]
From  Edward Sheldrake:
Wireshark crashes if you open the file import dialog and choose something from the "Encapsulation type" list.


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

7 years agoFrom Mike Morrin:
etxrab [Fri, 13 Jan 2012 06:11:44 +0000 (06:11 +0000)]
From Mike Morrin:
This is largely a cosmetic update of the gsm_a_rr dissector:

•    TBF starting time is now fully decoded.
•    “Double indenting” of IE groups (where an IE dissector adds a subtree just
after the generic dissector adds a subtree) has been eliminated.
•    “Null” break points in CSN.1 IEs have been added where they were
previously missing (this could have caused some correct PDUs to be reported as
•    The calculation of CSN.1 IE lengths has been corrected: ((a – b)>>3)+1 is
not the same as (a>>3)-(b>>3)+1 .
•    The handling of CSN.1 padding bits is slightly improved.
•    The handling of CSN.1 “truncated” bits is slightly improved.
•    Eliminated superfluous checks for len==0 at the beginning of some
rest-octet dissectors (the generic dissector won’t call the CSN.1 dissector if
len is 0).
•    A few minor corrections to text strings and formatting.


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

7 years agoVarious minor mods;
wmeier [Thu, 12 Jan 2012 22:25:42 +0000 (22:25 +0000)]
Various minor mods;
- check-col() not needed;
- use tvb_new_subset_remaining() iso tvb_new();
- #if 0 (currently ?) unused 'erf_handle';
- Convert some '4 space tabs' to 4 spaces;
- other reformatting.

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

7 years agoFrom Tobias Witek: Add dissector table to 'meta' dissector.
wmeier [Thu, 12 Jan 2012 22:13:09 +0000 (22:13 +0000)]
From Tobias Witek: Add dissector table to 'meta' dissector.

  The attached patch adds a dissector table to the 'meta' dissector
  so that other protocol dissectors can register for specific values
  of 'meta.proto'.

  Additionally, the patch also adds three more protocol values.


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

7 years agoDon't do fcn calls in arg of g_?to??(); Macro may very well eval args multiple times.
wmeier [Thu, 12 Jan 2012 20:40:23 +0000 (20:40 +0000)]
Don't do fcn calls in arg of g_?to??(); Macro may very well eval args multiple times.

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

7 years agoCMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before
gerald [Thu, 12 Jan 2012 19:16:15 +0000 (19:16 +0000)]
CMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before
register_tap_files so that the "-z" flag works for TShark.

epan/stat_cmd_args.c: Fixup whitespace.

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

7 years agoRe-indent for readability.
wmeier [Thu, 12 Jan 2012 15:04:09 +0000 (15:04 +0000)]
Re-indent for readability.

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

7 years ago"Call nas-eps" dissector for nas_rrc_r8_lte and nas_rrc_r9_lte frames that have L3...
martinm [Wed, 11 Jan 2012 21:31:11 +0000 (21:31 +0000)]
"Call nas-eps" dissector for nas_rrc_r8_lte and nas_rrc_r9_lte frames that have L3 payloads.

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

7 years agoDon't do tvb_get...() in arg of g_htonl(); Macro evals args multiple times.
wmeier [Wed, 11 Jan 2012 20:12:51 +0000 (20:12 +0000)]
Don't do tvb_get...() in arg of g_htonl(); Macro evals args multiple times.

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

7 years agoAdd a dissector for h248.2 packages.
etxrab [Wed, 11 Jan 2012 19:31:45 +0000 (19:31 +0000)]
Add a dissector for h248.2 packages.

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

7 years agoCopy over updates from the 1.6 branch.
gerald [Wed, 11 Jan 2012 17:03:54 +0000 (17:03 +0000)]
Copy over updates from the 1.6 branch.

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

7 years agoFrom Martin Kaiser:
etxrab [Wed, 11 Jan 2012 06:38:25 +0000 (06:38 +0000)]
From Martin Kaiser:
DVB-CI / CI+ dissect sac message body.


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

7 years agoFrom Lei Chen:
etxrab [Wed, 11 Jan 2012 06:30:20 +0000 (06:30 +0000)]
From Lei Chen:
An error in eutran_measurement_param_desc of GSM si2qua rest octet.

From me fix similar bugs.

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

7 years agoFrom mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6722
alagoutte [Tue, 10 Jan 2012 15:12:13 +0000 (15:12 +0000)]
From mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6722
Small corrections in the Alcatel UA dissector

The most important change is to add a condition in dissector for TLV with ID equal to 104 as in the case of the 120. No condition causing 'malformed packet'.

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

7 years agoFrom Jose Pedro Oliveira via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
alagoutte [Tue, 10 Jan 2012 13:59:27 +0000 (13:59 +0000)]
From Jose Pedro Oliveira  via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6719
pcapio.c: bug in libpcap_write_interface_description_block

The attached patch fixes a copy_and_paste error in the code of the function libpcap_write_interface_description_block(): strlen(name) instead of strlen(filter).

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

7 years agoFrom Wojciech Dubowik via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6720
alagoutte [Tue, 10 Jan 2012 12:08:43 +0000 (12:08 +0000)]
From Wojciech Dubowik via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6720
Add STBC flag to MCS field in radiotap packet dissector.

From me:
Replace VALS by TFS (and use boolean hf)

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

7 years agoRemove some debug logging.
gerald [Mon, 9 Jan 2012 19:31:31 +0000 (19:31 +0000)]
Remove some debug logging.

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

7 years agoIt appears that the intent of r35027 was to use reset_tap_update_timer() not
morriss [Mon, 9 Jan 2012 19:05:00 +0000 (19:05 +0000)]
It appears that the intent of r35027 was to use reset_tap_update_timer() not
just on Windows or when we have threads, so make it so.

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 9 Jan 2012 16:36:56 +0000 (16:36 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

Try to compile with cmake in Ubuntu 11.10

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 9 Jan 2012 16:33:47 +0000 (16:33 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

Try to compile with cmake in Ubuntu 11.10

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 9 Jan 2012 16:32:53 +0000 (16:32 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

Try to compile with cmake in Ubuntu 11.10

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

7 years agoRemove a generated file (pointed out by Gisle Vanem).
gerald [Mon, 9 Jan 2012 06:21:19 +0000 (06:21 +0000)]
Remove a generated file (pointed out by Gisle Vanem).

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

7 years agoFrom Martin Kaiser:
etxrab [Sun, 8 Jan 2012 15:34:23 +0000 (15:34 +0000)]
From Martin Kaiser:
DVB-CI / CI+ decrypt SAC messages.


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

7 years agoFrom Mike Morrin:
etxrab [Sun, 8 Jan 2012 15:30:05 +0000 (15:30 +0000)]
From Mike Morrin:
GSM RR CCCH dissection ignores last octet of PDU.


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

7 years ago[Automatic manuf, services and enterprise-numbers update for 2012-01-08]
gerald [Sun, 8 Jan 2012 15:03:27 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-01-08]

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