osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
38608 commits 26 branches 0 tags 795 MiB
Commit graph

38608 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bill Meier
48ca3d4742 Use GSlice API instead of GMemChunk API for some memory allocation. 
svn path=/trunk/; revision=40547
 2012-01-16 19:05:32 +00:00
Bill Meier
49eff359e1 Fix a typo in an error message. 
svn path=/trunk/; revision=40546
 2012-01-16 18:12:18 +00:00
Guy Harris
6b50d94836 The frame number is an unsigned integer, so there's no guarantee that it 
won't equal (guint32)-1.

Fortunately, frame numbers are 1-based, so there *is* a guarantee that
it won't equal 0.

svn path=/trunk/; revision=40545
 2012-01-16 08:16:50 +00:00
Guy Harris
7e4c02ee18 The frame number is an unsigned integer, so there's no guarantee that it 
won't equal (guint32)-1.

Fortunately, frame numbers are 1-based, so there *is* a guarantee that
it won't equal 0.

svn path=/trunk/; revision=40544
 2012-01-16 08:10:49 +00:00
Guy Harris
cc0c99a01f The frame number is an unsigned integer, so there's no guarantee that it 
won't equal (guint32)-1.

Fortunately, frame numbers are 1-based, so there *is* a guarantee that
it won't equal 0.

svn path=/trunk/; revision=40543
 2012-01-16 08:01:58 +00:00
Jörg Mayer
333b9e0fa8 move alert box for cmake builds as well 
svn path=/trunk/; revision=40542
 2012-01-16 03:25:55 +00:00
Guy Harris
31badacab3 Move alert_box.c back up to the top-level directory for now, to fix the 
Windows build.  We probably want to construct a "ui" (static) library
the same way we construct the libwireshark (dynamic) library, out of
stuff in the ui directory and the relevant subdirectories.

svn path=/trunk/; revision=40541
 2012-01-16 03:23:22 +00:00
Bill Meier
d8c13bcee1 #include "simple_dialog.h" ==> #include "ui/simple-dislog.h" 
svn path=/trunk/; revision=40540
 2012-01-16 02:56:00 +00:00
Guy Harris
edad4a0d41 Another fixup for the move of win32 to ui\win32. 
svn path=/trunk/; revision=40539
 2012-01-16 02:37:06 +00:00
Jörg Mayer
a7d99d703f alert_box.c moved to ui/ 
svn path=/trunk/; revision=40538
 2012-01-16 02:28:38 +00:00
Guy Harris
b423352edf Just include it from the current directory. 
svn path=/trunk/; revision=40537
 2012-01-16 02:17:03 +00:00
Guy Harris
821166ff8b Another fix for the move of the win32 directory. 
svn path=/trunk/; revision=40536
 2012-01-16 02:16:30 +00:00
Guy Harris
7ee87d9ae5 Another change for the move of the top-level win32 directory into the ui 
directory.

svn path=/trunk/; revision=40535
 2012-01-16 01:56:18 +00:00
Guy Harris
8b96d4930d Fix up for the move from the top-level directory to the ui directory. 
svn path=/trunk/; revision=40534
 2012-01-16 01:45:26 +00:00
Guy Harris
375399181c Reflect the move of simple_dialog.h to the ui directory. 
svn path=/trunk/; revision=40533
 2012-01-16 01:31:08 +00:00
Guy Harris
21ddeed32b Reflect the move of the top-level win32 directory into the ui directory. 
svn path=/trunk/; revision=40532
 2012-01-16 01:29:08 +00:00
Guy Harris
0db1b9ae17 Make the win32 directory a subdirectory of the ui directory. 
svn path=/trunk/; revision=40531
 2012-01-16 01:26:46 +00:00
Guy Harris
ee1e0a0368 Reflect the move of some header files to the ui directory. 
svn path=/trunk/; revision=40530
 2012-01-16 01:18:56 +00:00
Guy Harris
d7b2aad043 Move some headers for UI stuff, and the alert_box.c UI-specific file, to 
the ui directory.  (Perhaps some other files that would be used by all
flavors of Wireshark, for any GUI toolkit or for someting such as
ncurses, and not for any command-line tool such as TShark, should be
moved there as well.)

Shuffle some #includes to put the "ui/XXX.h" includes together.

svn path=/trunk/; revision=40529
 2012-01-16 01:07:52 +00:00
Jörg Mayer
624de2e37f Fix bootstrap parameters for cmake 
Conditionally display build instructions for the cmake case

svn path=/trunk/; revision=40528
 2012-01-16 00:05:14 +00:00
Bill Meier
a28901b226 Fix a typo in a comment .... 
svn path=/trunk/; revision=40527
 2012-01-15 23:26:23 +00:00
Guy Harris
f9d7903641 The name of the target for ui/gtk/libui.lib is "gtk", not "ui\gtk". 
svn path=/trunk/; revision=40526
 2012-01-15 23:23:40 +00:00
Bill Meier
a74de18f21 cd ../gtk ==> cd ../ui/gtk 
svn path=/trunk/; revision=40525
 2012-01-15 23:13:01 +00:00
Jörg Mayer
fc9d227e3f Missed another .. -> ../.. case 
svn path=/trunk/; revision=40524
 2012-01-15 23:07:44 +00:00
Jörg Mayer
89ac6f314f More .. -> ../.. changes after gtk/ move 
svn path=/trunk/; revision=40523
 2012-01-15 22:40:03 +00:00
Jörg Mayer
ef356ef2ef More .. -> ../.. changes after gtk/ move 
svn path=/trunk/; revision=40522
 2012-01-15 22:22:28 +00:00
Jörg Mayer
308a103931 Clean up after gtk/ move: Makefile.am.inc is now at ../.. 
svn path=/trunk/; revision=40521
 2012-01-15 22:12:28 +00:00
Jörg Mayer
32ea7ecc41 Add back revision 40517 which got lost during gtk/ move 
svn path=/trunk/; revision=40520
 2012-01-15 22:09:43 +00:00
Jörg Mayer
3a67db5e41 Remove gtk-dir 
svn path=/trunk/; revision=40519
 2012-01-15 22:05:02 +00:00
Jörg Mayer
be706c6380 Move gtk to ui/gtk. 
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
 2012-01-15 21:59:11 +00:00
Anders Broman
6d69ef093c Have the time field in the Graph Analyzis windos use the same time format as used to view the trace. 
svn path=/trunk/; revision=40517
 2012-01-15 20:14:22 +00:00
Jörg Mayer
de0bf160b9 The warning fix overdid things: It removed functionality. 
Now I only remove the variable ft and everything looks good.

svn path=/trunk/; revision=40516
 2012-01-15 17:07:55 +00:00
Gerald Combs
b06856c589 [Automatic manuf, services and enterprise-numbers update for 2012-01-15] 
svn path=/trunk/; revision=40513
 2012-01-15 15:03:26 +00:00
Jörg Mayer
1d7f73360e The last commit failed to check in the deleted files 
svn path=/trunk/; revision=40512
 2012-01-15 12:30:52 +00:00
Jörg Mayer
2097912587 Rename crypt-xxx to xxx 
svn path=/trunk/; revision=40511
 2012-01-15 12:29:44 +00:00
Jörg Mayer
e05b847713 Accidentally checked in Makefile.in 
svn path=/trunk/; revision=40510
 2012-01-15 12:28:01 +00:00
Guy Harris
dfcec43973 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.

svn path=/trunk/; revision=40509
 2012-01-15 09:07:54 +00:00
Guy Harris
6224e81b9f 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.

svn path=/trunk/; revision=40508
 2012-01-14 20:58:41 +00:00
Bill Meier
439adbdbcc Remove obsolete comments referring to mem_chunks. 
svn path=/trunk/; revision=40507
 2012-01-14 20:14:43 +00:00
Bill Meier
ba04b5b113 Several minor changes: 
- use consistent indentation;
- use tvb_reported_length_remaining() in one case;
- reformat a long line.

svn path=/trunk/; revision=40506
 2012-01-14 17:18:26 +00:00
Bill Meier
0fee9f56d2 Minor updates: 
- checkcol() not req'd in a few cases;
 - Add an XXX comment about the (mis?)use of tvb_length();
 - lenght -> length;

svn path=/trunk/; revision=40505
 2012-01-14 17:03:34 +00:00
Bill Meier
6af379e903 Use REPORT_DISSECTOR_BUG() instead of g_print(); Other minor cleanup. 
svn path=/trunk/; revision=40504
 2012-01-14 16:18:16 +00:00
Bill Meier
d86186ac12 check_col() not req'd and other minor cleanups .... 
svn path=/trunk/; revision=40503
 2012-01-14 15:47:40 +00:00
Jörg Mayer
c710b63e26 Maybe adding $(GNUTLS_CFLAGS) will fix the build problem. 
svn path=/trunk/; revision=40502
 2012-01-14 15:46:25 +00:00
Jörg Mayer
39f8880747 commit 40500 missed the asn1 directory 
svn path=/trunk/; revision=40501
 2012-01-14 15:23:04 +00:00
Jörg Mayer
6197143d6c 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
modes.

[...]

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]



svn path=/trunk/; revision=40500
 2012-01-14 15:22:10 +00:00
Anders Broman
8e8453df1b Fix unused parameter warnings 
svn path=/trunk/; revision=40499
 2012-01-14 14:47:37 +00:00
Jörg Mayer
d038e58987 Optionally build cmake, document why we need xz 
svn path=/trunk/; revision=40498
 2012-01-14 14:40:58 +00:00
Jörg Mayer
bf44748c83 Add another warning (-Warray-bounds) to sync with cmake 
svn path=/trunk/; revision=40497
 2012-01-14 14:39:30 +00:00
Anders Broman
90f12d807d This seams to leave fewer graphical artefacts. 
svn path=/trunk/; revision=40496
 2012-01-14 12:52:56 +00:00