Commit Graph

31941 Commits

Author SHA1 Message Date
Guy Harris ae3049a04f Move the seekback stuff out of esc_read() to the one place where it's
done.

Use the wtap_dump_file_ routines to write out capture files, and check
for errors.

Use the phton macros, when available, to translate to big-endian byte
order.  Add a new phton24() macro.

Clean up indentation.

svn path=/trunk/; revision=33114
2010-06-06 19:37:49 +00:00
Guy Harris 1bf478fdef Rename wtap_dump_file_write_all() to wtap_dump_file_write(), and have
everybody use it; the places using the old wtap_dump_file_write() were
using it in the same way the old wtap_dump_file_write_all() did.

That also lets us get rid of wtap_dump_file_ferror().

Also, have the new wtap_dump_file_write() check for errors from
gzwrite() and fwrite() differently - the former returns 0 on error, the
latter can return a short write on error.

svn path=/trunk/; revision=33113
2010-06-06 19:14:32 +00:00
Anders Broman 1b3be7a754 From Jim Young:
Remove unneeded "gtk_tree_path_free(path);" from case
"GDK_Return:" in tree_view_key_pressed_cb() that was reverted in r32957 to restore X11 functionality lost in refactored code from r32323.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4847

svn path=/trunk/; revision=33112
2010-06-06 16:25:41 +00:00
Gerald Combs 906556a849 [Automatic manuf and enterprise-numbers update for 2010-06-06]
svn path=/trunk/; revision=33109
2010-06-06 15:03:33 +00:00
Kovarththanan Rajaratnam d62ee4e1c0 Add 32bit Ubuntu 10.04 to supported platforms
svn path=/trunk/; revision=33108
2010-06-06 06:09:26 +00:00
Guy Harris de4eefa3b1 From Rolf Fiedler: support for writing EyeSDN trace files.
svn path=/trunk/; revision=33107
2010-06-05 22:59:20 +00:00
Guy Harris 22c9dd27f7 First check for the new GTK+/OS X integration functions, then the old
ones; it appears that at least one user's -ligemacintegration has both
(see bug 4823), and we should choose the new ones in that case.

Also, always set have_ige_mac if we have the functions.

Fix tpyoes while we're at it.

svn path=/trunk/; revision=33106
2010-06-05 22:04:28 +00:00
Jaap Keuter f7ed15f39e From John Fitzgibbon:
When specifying SA keys for AES-CTR, Wireshark expects a key length of 160, 224
or 288 bits, (i.e. 128, 192 or 256 bits, followed by the 32 bit nonce value),
but gcry_cipher_setkey() in packet_ipsec.c fails, as it expects 128, 192 or 256
bits.

Omitting the nonce won't work -- even if Wireshark liked those key lengths,
gcrypt wouldn't be able to decrypt without it.

svn path=/trunk/; revision=33105
2010-06-05 09:22:45 +00:00
Guy Harris 7559d34b7b Clean up indentation.
svn path=/trunk/; revision=33104
2010-06-05 02:19:45 +00:00
Guy Harris cc574686ba Clarify an error message (and the corresponding comment).
Fix the no-libpcap build.

svn path=/trunk/; revision=33103
2010-06-05 01:55:06 +00:00
Gerald Combs 423669df7d Back out r33088 for now.
svn path=/trunk/; revision=33102
2010-06-05 00:29:31 +00:00
Jeff Morriss 2ee1711957 From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4831 :
Add the data read/write length to the NFS tree so it is filterable.

From me: don't bother incrementing the offset just to decrement it again.
Change the hf info a bit.

(Ideally the RPC dissector would add the length to the tree not as a text
item; that is left for future work.)

svn path=/trunk/; revision=33101
2010-06-05 00:25:46 +00:00
Guy Harris 71ada2c31b Catch some cases that don't currently work.
svn path=/trunk/; revision=33100
2010-06-05 00:08:37 +00:00
Gerald Combs 28d7c73588 From Chris Maynard via bug 1546:
Add units to the rate.

svn path=/trunk/; revision=33099
2010-06-04 23:16:31 +00:00
Guy Harris 37f5173e0f Thou shalt not have a tap whose listener is always active; that means,
for example, that, if it's a TShark tap, TShark can never be run with
"-w -", as it means that TShark will always have to dissect the packets.

svn path=/trunk/; revision=33098
2010-06-04 23:08:08 +00:00
Jeff Morriss 3be92af2d9 Add a preference that allows the user to decide if they want the calling and
called GTs (if RI=GT) put in the (pinfo) source and destination (and thus into
the source and destination columns).

This may help (if the PCs change but the GT does not) or hurt (if the GT or RI
change but the PCs do not) TCAP's ability to identify which messages belong to
which TCAP "session."

svn path=/trunk/; revision=33097
2010-06-04 20:52:02 +00:00
Jeff Morriss 967caad77c Use a gboolean to store a boolean and change the plurality on the preference name
svn path=/trunk/; revision=33096
2010-06-04 20:48:45 +00:00
Jeff Morriss 6534b8ce4f Add a preference that allows the user to decide if they want the source and
destination address PC or GT (depending on the RI) put in the (pinfo) source and
destination (and thus into the source and destination columns).

This may help (if the IP addresses change but the PC or GT do not) or hurt (if
the PC, GT, or RI change but the IP addresses do not) TCAP's ability to identify
which messages belong to which TCAP "session."

svn path=/trunk/; revision=33094
2010-06-04 20:36:43 +00:00
Jeff Morriss 0a7ced6eb4 Add BIN_DIR. If it is '.' then set WIRESHARK_RUN_FROM_BUILD_DIRECTORY so that we test plugins
svn path=/trunk/; revision=33093
2010-06-04 19:57:11 +00:00
Gerald Combs d123b9e737 Add a checkapis target.
svn path=/trunk/; revision=33092
2010-06-04 19:49:12 +00:00
Jeff Morriss 6f6fbeadb2 Increase LENGTH_OID a bit to give us more room for ACNs (probably more than will ever be used).
svn path=/trunk/; revision=33091
2010-06-04 19:37:31 +00:00
Guy Harris 82d5079c41 Fix comments.
svn path=/trunk/; revision=33090
2010-06-04 19:29:26 +00:00
Jeff Morriss 2efec6f8c5 tcaphash_context_t.oid is of size LENGTH_OID+1, not LENGTH_OID. Just use sizeof(tcaphash_context_t.oid) instead of LENGTH_OID so we can use that last byte. This allows us to retrieve the whole ACN when the ACN is LENGTH_OID bytes long.
svn path=/trunk/; revision=33089
2010-06-04 19:28:39 +00:00
Gerald Combs f6b2458924 From Matt Poduska via bug 1957 (with minor changes):
New dissector (plugin) to support decode of the EPCglobal Low-Level Reader
protocol (see llrp.org for more information). This dissector has passed fuzz
testing.

svn path=/trunk/; revision=33088
2010-06-04 18:45:02 +00:00
Gerald Combs cfe5890af7 According to RFC 3220 section 7 the max UDVM message size is 65536,
not 65535. Hopefully fixes bug 4837.

svn path=/trunk/; revision=33087
2010-06-04 18:28:02 +00:00
Bill Meier 44f9eec459 From Samu Varjonen: Whitespace cleanup
Tabs converted to 8 spaces and trailing whitespaces removed, etc.

svn path=/trunk/; revision=33086
2010-06-04 17:59:53 +00:00
Gerald Combs e5def72fe7 If BIN_DIR is ".", set WIRESHARK_RUN_FROM_BUILD_DIRECTORY so that we
test plugins.

svn path=/trunk/; revision=33085
2010-06-04 16:59:49 +00:00
Graeme Lunt 397f576de2 Description for netscape-cert-type bit 4 (e.g. see http://docs.sun.com/source/816-5531-10/poli_ext.htm#1078885)
svn path=/trunk/; revision=33084
2010-06-04 15:07:17 +00:00
Graeme Lunt d6bd39b51f RCS 3280, which obsoletes RFC 2459, allows an IA5String CHOICE in the DisplayText of a UserNotice.
svn path=/trunk/; revision=33083
2010-06-04 14:36:53 +00:00
Stig Bjørlykke 946f225f9c From Holger Freyther via bug 4841:
Add a new dissector for the NexusWare C7 MTP over UDP/TCP protocol. One of
NexusWare's example applications provide a way to forward MTP Level 3 messages
via UDP/TCP. This is a dissector for this protocol (which is lacking an IANA
assigned port).

svn path=/trunk/; revision=33082
2010-06-04 12:14:18 +00:00
Jaap Keuter 525deb3f70 Set the right DPI for PDF production.
svn path=/trunk/; revision=33081
2010-06-04 05:57:05 +00:00
Bill Meier effff179f4 From Sven Eckelmann: Remove recursion for aggregated packets in batman dissector
"Different developers wanted to have the recursive dissector for aggregated
 packets changed to a iterative approach."

See Bug #4836: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4836

svn path=/trunk/; revision=33080
2010-06-04 01:32:21 +00:00
Bill Meier 80562f4620 From Cal Turney: The NFS FH hash (nfs.fh.hash) incorrectly matches multiple filehandles.
"The method used in packet-nfs.c to calculate a 32-bit hash representing the 
 32-byte filehandle is faulty in that the hash often matches multiple
 filehandles."

"This patch uses CRC-32 to calculate the hash.
 We (EMC GNS) have tested this patch for the past two years and we have not
 found a single case where the hash matched more than one filehandle."

See Bug #4839: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4839


svn path=/trunk/; revision=33079
2010-06-04 00:45:37 +00:00
Jaap Keuter 578638c7ac Bring more texts and examples up to date.
svn path=/trunk/; revision=33078
2010-06-03 21:39:38 +00:00
Bill Meier 5a307bb6d1 Fix a gcc -Wshadow warning
svn path=/trunk/; revision=33077
2010-06-03 19:14:18 +00:00
Jeff Morriss 673a9de331 Set the (pinfo) address if a PC is present (for now: regardless of whether routing is on GT or not).
svn path=/trunk/; revision=33076
2010-06-03 18:57:25 +00:00
Bill Meier 6dcdb5fee6 From Sven Eckelmann: Change recursion for aggregated packets to iteration.
See Bug #2631: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2631

svn path=/trunk/; revision=33075
2010-06-03 18:56:39 +00:00
Stig Bjørlykke bdc492cc40 Improved readability when displaying seconds with hours and minutes.
svn path=/trunk/; revision=33074
2010-06-03 13:53:03 +00:00
Jörg Mayer 09bbfe21dd - Add tap-sv.c and packet-sv.c to the list of files to build
- Whitespace fixes
- Add Fedora 64 bit to the list of platforms where cmake should
  work

svn path=/trunk/; revision=33073
2010-06-03 13:04:22 +00:00
Anders Broman 5b2722c6b3 Use g_hash_table_new_full().
svn path=/trunk/; revision=33072
2010-06-03 08:22:08 +00:00
Anders Broman 9ea0a509b5 From Pascal Quantin:
Avoid triggering a malformed packet error when decoding a simple UE terminated Detach Request when the EMM cause IE is not present:

svn path=/trunk/; revision=33071
2010-06-03 07:47:07 +00:00
Jaap Keuter c5502f37e3 Whitespace/indentation/code style cleanup.
svn path=/trunk/; revision=33070
2010-06-03 07:38:27 +00:00
Jeff Morriss fa15217ece From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4832 :
Add field 'nfs.ops.count' in the detail pane of NFSv4 calls and replies that
displays the number of operations in NFSv4 COMPOUND requests/replies.

From me: change the blurb wording a bit.

svn path=/trunk/; revision=33069
2010-06-03 02:23:36 +00:00
Jeff Morriss 6d1db36944 From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4830 :
Display the fsid (filesystem ID) in decimal as well as hex in the "attributes"
section of the header in NFSv3/v4 replies.

svn path=/trunk/; revision=33068
2010-06-03 02:15:32 +00:00
Jeff Morriss 584595fab3 From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4820 :
Mesa moved its API description file again.

Also, while I'm here, I noticed that they stopped using signed tags, so add
--tags to "git describe" for a better description of the mesa version used to
build the X11 dissector.

svn path=/trunk/; revision=33067
2010-06-03 02:05:52 +00:00
Bill Meier 9c859f5f10 From: Sven Eckelmann:Add support for v10 packet format
"v10 of the packet format was added recently and could be added
  to the wireshark dissector"
See: Bug #4833: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4833

From me:
- Fix a compile error: ...version=tvb_get_ntohs...
- Fix a missing = NULL.

svn path=/trunk/; revision=33066
2010-06-03 02:03:32 +00:00
Guy Harris 96d478e006 Sorry, I forgot that 8.6. UDVM Cycles says
Note that the number of UDVM cycles MUST NOT be increased if a
	request for additional compressed data fails.

so we *shouldn't* increase the cycle count further when
SIGCOMP_INSTR_INPUT_BYTES fails.  That does *NOT* of course, mean that
we shouldn't increase the cycle count by 1 for a failed INPUT-BYTES
instruction - that would leave UDVM vulnerable to infinite loops (as per
bug 4826), and I *really* doubt that was their intent; presumably, it
means it should not be increased *by the number of cycles for the
additional data*:

	Additionally, if the UDVM successfully requests n bits of
	compressed data using one of the INPUT instructions then the
	number of available UDVM cycles is increased by n *
	cycles_per_bit once the instruction has been executed.

if the attempt to get that additional data fails.

svn path=/trunk/; revision=33065
2010-06-03 01:22:18 +00:00
Bill Meier 8d05670e53 Add back a few 'if (check_col()...' removed by me in a previous commit.
Possibly it's better to use an 'if (checkcol()' if the enclosed call to
'col_...' has "complex" arguments.

svn path=/trunk/; revision=33064
2010-06-03 00:52:08 +00:00
Gerald Combs e1a9e4e84f From Reinhard Speyerer via bug 4779:
From reading the rawshark(1) manpage my assumption was that rawshark
could be used like
$ /usr/bml/bin/rawshark -s -r test.pcap -d encap:EN10MB ...

However rawshark either expects the -r argument to be -
(read from stdin) or a pipe which results in the following error
message:

rawshark: ".../test.pcap" is neither an interface nor a pipe

The proposed rawshark.pod patch updates the -r description to
the implemented rawshark functionality.

The patch also applies to the current SVN version.

svn path=/trunk/; revision=33063
2010-06-03 00:42:21 +00:00
Bill Meier 6aa673baa6 From Sven Eckelmann: Synchronize bat dissector with batadv dissector
"Different people made changes to enhance the batman-adv dissector. It seems
 that the batman dissector wasn't touched and misses those changes. Following
 patchset should improve the dissector the same way Gerald Combs, Guy Harris and
 Bill Meier improved batman-adv."
See Bug #4384: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4834

From me: Add back a few 'if (check_col()) ...';
 I probably went just a bit too far in changes I made in packet-batadv.c

svn path=/trunk/; revision=33062
2010-06-03 00:26:27 +00:00