Commit Graph

38050 Commits

Author SHA1 Message Date
Guy Harris 939feef06f If we're not running as a child process, report the interfaces on which
we're capturing.  (We do not require a -i flag; the message could be
useful if you don't specify the interface, as it lets you know which
interface was chosen, which might not be the interface you'd think it
would be.  Yes, that's arguably a libpcap bug, which I plan to look at;
it should probably try to figure out which interfaces are "active" if
possible, and prefer those.)

Use cmdarg_err() for invalid capture filters and other capture errors.

svn path=/trunk/; revision=39983
2011-11-22 10:08:26 +00:00
Balint Reczey aad9adc89d Add initial .gitignore files
svn path=/trunk/; revision=39982
2011-11-22 00:13:12 +00:00
Balint Reczey 333bc8f123 Don't hardcode 'python' for asn2wrs
svn path=/trunk/; revision=39981
2011-11-22 00:11:56 +00:00
Anders Broman 16be627c1a Get rid of Warnings.
svn path=/trunk/; revision=39980
2011-11-21 20:08:11 +00:00
Anders Broman a8ea39d6aa Typo
svn path=/trunk/; revision=39979
2011-11-21 20:06:26 +00:00
Anders Broman 7a6c01224d Get rid of Warnings.
svn path=/trunk/; revision=39978
2011-11-21 20:04:45 +00:00
Anders Broman 756113888a Get rid of Warnings.
svn path=/trunk/; revision=39977
2011-11-21 18:21:59 +00:00
Anders Broman 603173b64a From Vincent Helfre:
added the display of intermediate value used to decode ARFCN in 
range 1024/256 format.
So now the W(n) values can be displayed and localised in the tvb buffer.
The code was reworked a little to use the get_bit functions.

svn path=/trunk/; revision=39976
2011-11-21 18:16:19 +00:00
Bill Meier c60d239123 From Claudio: header value always computed twice
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6592

svn path=/trunk/; revision=39975
2011-11-21 17:58:47 +00:00
Guy Harris baa84e09f2 An SDNV length > 8 is also not dissectable. Should fix bug 6601.
svn path=/trunk/; revision=39974
2011-11-21 17:49:27 +00:00
Bill Meier 81a16331f8 'dissect_ImageLZ_JPEG()' is apparently not used; #if 0 the code for now.
svn path=/trunk/; revision=39973
2011-11-21 17:05:17 +00:00
Bill Meier 34c16b8c17 From Yaniv Kaul: Some enhancements, some fixes, to the Spice dissector:
- SASL authentication support - improved (and correct) state machine.
- indention, tab fixes
- macro to fetch PDU, simplifying the code (and improving its readability)
- properly show the length of agent messages and align them under the right tree.

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

From me: Fix some indentation & remove some trailing whitespace.

svn path=/trunk/; revision=39972
2011-11-21 16:43:01 +00:00
Martin Mathieson ab9ede8e8f Add the system frame number (SFN) to the context fields logged along with LTE MAC frames.
svn path=/trunk/; revision=39971
2011-11-21 16:18:33 +00:00
Jörg Mayer ffd84cbf3c Linking against GTK3 stoped working because only libgtk3 was linked
against and no libs that gtk3 depended on. Fix this.

svn path=/trunk/; revision=39970
2011-11-21 15:39:25 +00:00
Jörg Mayer 4ea7f38015 More warnings "set but not used" fixed
svn path=/trunk/; revision=39969
2011-11-21 15:03:17 +00:00
Jörg Mayer c946b6c3a2 Move generated dissctors that are causing problems to DIRTY.
packet-x11.c: hundreds of:

/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/x11-extension-implementation.h: In function ‘xselinuxGetClientContext’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/x11-extension-implementation.h:27994:9: warning: variable ‘f_resource’ set but not used [-Wunused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/x11-extension-implementation.h: In function ‘xselinuxGetClientContext_Reply’:

dissectors/packet-dcerpc-mapi.c: set but not used
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_req’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8592:14: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_repl’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8617:14: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_RecipSMTP’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8848:14: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]


dissecots/packet-dcerpc-drsuapi.c: set but not used
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-drsuapi.c: In function ‘drsuapi_dissect_DsGetNCChangesCtr7’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-drsuapi.c:2920:17: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]

Btw.: Does it really make sense to use an extra CMakefile for the dcerpc/ dir?
      I'd rather the the idl2wrs.c in tools/ and the generatorstuff in epan/CMake

More files with the same problem.

svn path=/trunk/; revision=39968
2011-11-21 13:52:35 +00:00
Jörg Mayer ffc843e501 Another case of written to only variable.
svn path=/trunk/; revision=39967
2011-11-21 12:13:36 +00:00
Jörg Mayer 80ec54b369 new_offset was was written to but never read.
svn path=/trunk/; revision=39966
2011-11-21 12:11:35 +00:00
Jörg Mayer 57969662c7 Move a generated file into file lists that do not treat warnings
as errors:

/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_req’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8592:14: error: variable ‘tree’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_repl’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8617:14: error: variable ‘tree’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_RecipSMTP’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8848:14: error: variable ‘tree’ set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=39965
2011-11-21 12:08:10 +00:00
Guy Harris 272c011d19 On an I/O error, merge_read_packet() and merge_append_read_packet() need
to return a pointer to the merge_in_file_t that got the error.  Set *err
to 0 on success and an error code on an err, treat a null return as an
EOF indication, and if we don't get a null return check for a non-zero
error code and treat that as an I/O error.

svn path=/trunk/; revision=39964
2011-11-21 06:26:03 +00:00
Chris Maynard f2e8579ba3 Fix potential infinite loop introduced with r39961 and find by the buildbot. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6599
svn path=/trunk/; revision=39963
2011-11-21 02:01:59 +00:00
Chris Maynard 3c8e31e055 Fix bug 6561: IPv4 UDP/TCP Checksum incorrect if routing header present.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6561

svn path=/trunk/; revision=39961
2011-11-20 15:47:14 +00:00
Chris Maynard 1e6a19e48a Fix "'Closing File!' Dialog Hangs" bug 3046: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3046
svn path=/trunk/; revision=39959
2011-11-20 15:11:15 +00:00
Gerald Combs d1cdba1c13 [Automatic manuf, services and enterprise-numbers update for 2011-11-20]
svn path=/trunk/; revision=39958
2011-11-20 15:03:25 +00:00
Anders Broman 62866c78a0 Get rid of Warnings.
svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
Anders Broman 8fdb6af097 Remove export.
svn path=/trunk/; revision=39956
2011-11-20 10:27:26 +00:00
Anders Broman 03b2005957 See if this fixes it, why it worked on my system is anybodys guess.
svn path=/trunk/; revision=39955
2011-11-20 09:51:03 +00:00
Anders Broman 42b44648c8 Get rid of Warnings.
svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
Guy Harris 56903273cc Expand a comment.
svn path=/trunk/; revision=39953
2011-11-20 03:15:53 +00:00
Guy Harris 8f06e3af4b The URI parameter parser always has to advance current_offset in the
loop, otherwise you get stuck in an infinite loop.

(Where in RFC 3261 does it mention the use of commas in URI parameters?)

Should fix bug 6598.

svn path=/trunk/; revision=39952
2011-11-19 22:57:13 +00:00
Anders Broman faea2d624c Get rid of Warnings.
svn path=/trunk/; revision=39951
2011-11-19 22:42:51 +00:00
Guy Harris 00884a10f2 Clean up indentation.
svn path=/trunk/; revision=39950
2011-11-19 20:49:15 +00:00
Guy Harris 2929c93ea2 When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.

When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem.  (We could show both.  We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)

file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.

Clean up indentation.

svn path=/trunk/; revision=39949
2011-11-19 20:18:01 +00:00
Anders Broman 4b2aa811e1 Fix Warnings.
svn path=/trunk/; revision=39948
2011-11-19 17:21:35 +00:00
Anders Broman 87eafedef0 Revert 39946
svn path=/trunk/; revision=39947
2011-11-19 16:24:19 +00:00
Anders Broman 3d13938fa4 See if this fixes "warning: initializer element is not computable at load time"
svn path=/trunk/; revision=39946
2011-11-19 16:15:07 +00:00
Anders Broman b431591727 Get rod of " warning: identifier ‘class’ conflicts with C++ keyword"
svn path=/trunk/; revision=39945
2011-11-19 09:08:50 +00:00
Guy Harris 7694a8659d Fail if somebody tries to write out a packet with an unsupported
encapsulation.

svn path=/trunk/; revision=39944
2011-11-18 21:39:18 +00:00
Gerald Combs c95e2e88ce Try to preserve native line endings when we rewrite files.
svn path=/trunk/; revision=39938
2011-11-18 16:51:40 +00:00
Martin Mathieson 4ad5ff513b From Pascal Quantin:
For status Bitmap, don't show FSN in the info column twice.

svn path=/trunk/; revision=39937
2011-11-18 13:42:55 +00:00
Martin Mathieson 556a0558b9 Make it easier to see:
- bitmap entries
- MRW and MRW-ACK
- RESET and RESET-ACK
- when the Poll bit is set for data

svn path=/trunk/; revision=39936
2011-11-18 12:45:50 +00:00
Alexis La Goutte b662e6250c Ethereal => Wireshark
svn path=/trunk/; revision=39935
2011-11-18 12:41:48 +00:00
Alexis La Goutte 9eb1835a10 Regenerate GIOP dissector plugins (after change in generator !) for fix Warning found by Clang (>100 !)
svn path=/trunk/; revision=39934
2011-11-18 12:39:35 +00:00
Alexis La Goutte 9e045961d3 Fix major (> 100) Dead Store (Dead assignement/Dead increment) Warning found by Clang in IDL "generator" of GIOP Plugins
svn path=/trunk/; revision=39933
2011-11-18 12:37:33 +00:00
Alexis La Goutte 331fa3af93 Regenerate GIOP dissector plugins (after change in generator !) with following commmands :
:~/wireshark/tools$ ../idl2wrs ../idl/cosnaming.idl > ../plugins/giop/packet-cosnaming.c
:~/wireshark/tools$ ../idl2wrs ../idl/coseventcomm.idl > ../plugins/giop/packet-coseventcomm.c
:~/wireshark/tools$ ../idl2wrs ../idl/parlay/Parlay.idl > ../plugins/giop/packet-parlay.c
:~/wireshark/tools$ ../idl2wrs ../idl/tango.idl > ../plugins/giop/packet-tango.c 

For packet-cosnaming.c, only some white return change
For packet-parley.c, lot of change but only the functions is not in the same order...?! (Order change in 17911)

svn path=/trunk/; revision=39932
2011-11-18 12:34:16 +00:00
Alexis La Goutte f207b03503 Some modification in generated GIOP dissector plugins in not include in "generator" (wireshark_gen.py)
* Remove some uneeded #includes (Revision 32419)
* Don't guard col_set_str (COL_PROTOCOL) with col_check (Revision 29340)
* Add missing #pragma warning disable, now using _MSC_VER (Revision 21222, 21227, 21240)



svn path=/trunk/; revision=39931
2011-11-18 10:30:46 +00:00
Guy Harris 680b3d3a86 Make sure pcap-ng supports a particular encapsulation type before
trying to write out an interface description block for an interface with
that type.

svn path=/trunk/; revision=39930
2011-11-18 07:13:33 +00:00
Anders Broman 1b7b2dd067 Use tvb_bcd_dig_to_ep_str().
svn path=/trunk/; revision=39929
2011-11-18 07:01:10 +00:00
Gerald Combs d7bb2160f6 Use the source directory argument.
svn path=/trunk/; revision=39926
2011-11-18 01:35:58 +00:00
Gerald Combs 873e0bdd71 Maybe it's not a good idea to modify configure.in or config.nmake during
compilation. Add a "--set-svn" option which only affects svnversion.h and
make it the default behavior.

svn path=/trunk/; revision=39923
2011-11-18 01:17:31 +00:00