obnox/wireshark/wip.git
15 years agoNew protocol: PKCS#1 (rfc2313 pplus some extra oid's)
sahlberg [Thu, 29 Jul 2004 12:10:44 +0000 (12:10 +0000)]
New protocol: PKCS#1   (rfc2313 pplus some extra oid's)

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

15 years agoadd some algorithm oid's to x509af(for the time being)
sahlberg [Thu, 29 Jul 2004 09:52:14 +0000 (09:52 +0000)]
add some algorithm oid's to x509af(for the time being)
(only those that take no parameters for the time being)

create a dummy ber oid callback for callbacks that are NULL

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

15 years agoprettify the oid printing of ber oid's
sahlberg [Thu, 29 Jul 2004 09:32:13 +0000 (09:32 +0000)]
prettify the oid printing of ber oid's

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

15 years agofor very large integers, print them in hex thats better than nothing
sahlberg [Thu, 29 Jul 2004 08:41:51 +0000 (08:41 +0000)]
for very large integers,  print them in hex   thats better than nothing
but we can not filter on them anymore

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

15 years agoFrom Lars Roland: MSVC make fixes.
obiot [Thu, 29 Jul 2004 07:25:11 +0000 (07:25 +0000)]
From Lars Roland: MSVC make fixes.

Many people have recently reported many problems with the nmake build
process. It seems that these problems come from using
epan/makefile.nmake to compile the DISSECTOR_SUPPORT_SOURCES which are
located in /trunk.

Nmake from MSVC6 puts the object code of the DISSECTOR_SUPPORT_SOURCES
in /epan although Nmake expects the object code in /trunk when it
checkes dependencies. Thus DISSECTOR_SUPPORT_OBJECTS are built every
time even when they are already there.

Nmake Version 1.5 (MSVC 2003 Toolkit) puts the object code of the
DISSECTOR_SUPPORT_SOURCES in /trunk instead.
This makes it impossible to use epan/makefile.nmake for compiling the
DISSECTOR_SUPPORT_SOURCES and to make it work for both versions of nmake.

We have to use /trunk/makefile.nmake for compiling the
DISSECTOR_SUPPORT_SOURCES to solve these issues.

It should also be possible to build ethereal without libethereal.dll again.

Once we have moved all DISSECTOR_SUPPORT_SOURCES into a subdirectory of
epan we can get rid of this patchwork in the nmake makefiles.

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

15 years agoFix a null pointer dereference.
gerald [Thu, 29 Jul 2004 02:25:54 +0000 (02:25 +0000)]
Fix a null pointer dereference.

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

15 years agoAdd capinfo targets.
gerald [Thu, 29 Jul 2004 02:01:59 +0000 (02:01 +0000)]
Add capinfo targets.

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

15 years agoFrom Lars Roland: With this patch print.(c/h) and ps.(c/h) don't belong to
obiot [Thu, 29 Jul 2004 00:11:14 +0000 (00:11 +0000)]
From Lars Roland: With this patch print.(c/h) and ps.(c/h) don't belong to
the DISSECTOR_SUPPORT_xy files any longer and as a consequence they
won't be linked into libethereal.

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

15 years agoAdd capinfo to the Windows installer.
obiot [Wed, 28 Jul 2004 23:09:12 +0000 (23:09 +0000)]
Add capinfo to the Windows installer.

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

15 years agoPartial fix after some files being moved between directories.
obiot [Wed, 28 Jul 2004 22:41:19 +0000 (22:41 +0000)]
Partial fix after some files being moved between directories.

There is still a problem with MSVC builds as 3 objects get built twice (once
at the top level, and once in epan: xmlstub.obj, print.obj and ps.obj).

This fix allows to compile again with MSVC if debug symbols are NOT enabled
while building Ethereal.  Do this by editing config.nmake and replacing
"LOCAL_LDFLAGS=/DEBUG" with "LOCAL_LDFLAGS=". In other words: Ethereal CANNOT
be built right now with debug symbols in the object code, for MSVC builds.

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

15 years agoAdd the MSWIN RC information for capinfo.
obiot [Wed, 28 Jul 2004 21:13:27 +0000 (21:13 +0000)]
Add the MSWIN RC information for capinfo.

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

15 years agoFrom Ian Schorr: capinfo - provides capture file information.
obiot [Wed, 28 Jul 2004 20:51:29 +0000 (20:51 +0000)]
From Ian Schorr: capinfo - provides  capture file information.

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

15 years agomove the File/Close item back to it's former position. Add an explanatory comment...
ulfl [Wed, 28 Jul 2004 17:19:17 +0000 (17:19 +0000)]
move the File/Close item back to it's former position. Add an explanatory comment why it's placed there, in difference to the Gnome HIG.

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

15 years agocollect some thoughts about a GTK win32 printing dialog (from Guy Harris and me)
ulfl [Wed, 28 Jul 2004 16:54:46 +0000 (16:54 +0000)]
collect some thoughts about a GTK win32 printing dialog (from Guy Harris and me)

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

15 years agoremoved print_packet_header, as it seems to be no longer used/available and will...
ulfl [Wed, 28 Jul 2004 16:48:58 +0000 (16:48 +0000)]
removed print_packet_header, as it seems to be no longer used/available and will result in a link error

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

15 years agoFrom Greg Morris:
guy [Wed, 28 Jul 2004 08:23:52 +0000 (08:23 +0000)]
From Greg Morris:

check whether "match_strval()" returned a null pointer before
using its return value;

mark the end-of-burst packet.

Clean up white space.

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

15 years agox509ce use implicit tags.
sahlberg [Wed, 28 Jul 2004 07:55:57 +0000 (07:55 +0000)]
x509ce use implicit tags.
the compiler does not yet support this.
change the definition file to make the implicit keyword explicit

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

15 years agoFrom Ming Zhang: update to the latest draft.
guy [Wed, 28 Jul 2004 07:46:54 +0000 (07:46 +0000)]
From Ming Zhang: update to the latest draft.

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

15 years agoFrom Lars Roland: yes, it probably *should* be "retap_packets()", so use
guy [Wed, 28 Jul 2004 07:16:33 +0000 (07:16 +0000)]
From Lars Roland: yes, it probably *should* be "retap_packets()", so use
that instead of "redissect_packets()".

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

15 years agoIn the GNOME HIG, the File -> Close menu item is in the last group,
guy [Tue, 27 Jul 2004 23:32:44 +0000 (23:32 +0000)]
In the GNOME HIG, the File -> Close menu item is in the last group,
right above File -> Quit.

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

15 years agoNote that, when we add the ability to build a GNOMEified Ethereal as
guy [Tue, 27 Jul 2004 22:39:43 +0000 (22:39 +0000)]
Note that, when we add the ability to build a GNOMEified Ethereal as
well as a GTK+-only Ethereal, we could use "gnome_url_show()" in
GNOMEified Ethereal.

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

15 years agoSuggest the possibility of not using the Windows print dialog to print
guy [Tue, 27 Jul 2004 21:12:40 +0000 (21:12 +0000)]
Suggest the possibility of not using the Windows print dialog to print
on Windows.

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

15 years agoMove the code to open the printer/print file from "print_packets()" to
guy [Tue, 27 Jul 2004 20:10:02 +0000 (20:10 +0000)]
Move the code to open the printer/print file from "print_packets()" to
"print_ok_cb()", and have "print_packets()" just work on a
"print_stream_t" handed to it, so that different platforms can open the
printer/print file in different ways (opening the file is probably not
going to be platform-dependent, but opening the printer will be).

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

15 years ago"print_packet_header()" is no longer used (there's now a "generate
guy [Tue, 27 Jul 2004 19:19:00 +0000 (19:19 +0000)]
"print_packet_header()" is no longer used (there's now a "generate
bookmark" op in the lower-level print functions), so remove it.

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

15 years agoplace new windows (by calling window_new() with default placement (instead of placing...
ulfl [Tue, 27 Jul 2004 19:13:48 +0000 (19:13 +0000)]
place new windows (by calling window_new() with default placement (instead of placing it at the current mouse position).

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

15 years agoFrom Lars Roland: don't delete the generated header files with "make
guy [Tue, 27 Jul 2004 18:57:52 +0000 (18:57 +0000)]
From Lars Roland: don't delete the generated header files with "make
distclean", as those are part of the distribution.

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

15 years agoFrom Lars Roland:
guy [Tue, 27 Jul 2004 18:56:50 +0000 (18:56 +0000)]
From Lars Roland:

clean up the message printed when building libethereal.dll;

have "make distclean" clean out the "dissectors" subdirectory.

Clean up indentation.

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

15 years agofrom ian schorr: some performance improvements in conversation and hostlist tables...
ulfl [Tue, 27 Jul 2004 18:34:02 +0000 (18:34 +0000)]
from ian schorr: some performance improvements in conversation and hostlist tables, by keep freezing the clist(s) most of the time

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

15 years agoChange the display of identifiers from DEC to HEX.
tuexen [Tue, 27 Jul 2004 09:22:35 +0000 (09:22 +0000)]
Change the display of identifiers from DEC to HEX.

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

15 years agoFrom Ian Schorr: don't check the validity of the field name for an
guy [Tue, 27 Jul 2004 06:29:22 +0000 (06:29 +0000)]
From Ian Schorr: don't check the validity of the field name for an
advanced-mode graph if the graph isn't active.

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

15 years agoAdd the Ethertype for MAC Control frames, as per Clause 31 and Annexes
guy [Tue, 27 Jul 2004 06:05:20 +0000 (06:05 +0000)]
Add the Ethertype for MAC Control frames, as per Clause 31 and Annexes
31A and 31B in the 2000 and later 802.3 specs.  (Dissecting them is left
as an exercise for the student.)

Clean up whitespace a bit.

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

15 years agoFrom Tomas Kukosa:
guy [Tue, 27 Jul 2004 05:32:58 +0000 (05:32 +0000)]
From Tomas Kukosa:

  - only one function prototype is emitted if type is present in more
    than one cyclic dependency

  - field decoding functions has to be emitted immediately after a
    function prototype in case of cyclic dependency

  - few grammar changes

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

15 years agoFromm Tomas Kukosa: update to version 1.5.
guy [Tue, 27 Jul 2004 05:30:03 +0000 (05:30 +0000)]
Fromm Tomas Kukosa: update to version 1.5.

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

15 years ago"ps.c" isn't a header, so don't include it in ETHEREAL_COMMON_INCLUDES.
guy [Tue, 27 Jul 2004 03:27:20 +0000 (03:27 +0000)]
"ps.c" isn't a header, so don't include it in ETHEREAL_COMMON_INCLUDES.

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

15 years agoArrange that "x11-declarations.h" and "x11-register-info.h" be part of
guy [Tue, 27 Jul 2004 02:52:49 +0000 (02:52 +0000)]
Arrange that "x11-declarations.h" and "x11-register-info.h" be part of
the distribution, as was the case in the past.

Arrange that RCS IDs be expanded, and that the EOL style be native, for
epan/dissectors/Makefile.{am,common,nmake}.

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

15 years agoRename HEADER_FILES to NONGENERATED_HEADER_FILES, so that it's clear
guy [Tue, 27 Jul 2004 00:36:31 +0000 (00:36 +0000)]
Rename HEADER_FILES to NONGENERATED_HEADER_FILES, so that it's clear
that it contains only the .h files not generated from other files.

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

15 years agoAdd a missing backslash.
guy [Mon, 26 Jul 2004 22:00:05 +0000 (22:00 +0000)]
Add a missing backslash.

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

15 years agoAdd a Makefile.common for Wiretap, and have Makefile.am and
guy [Mon, 26 Jul 2004 20:46:54 +0000 (20:46 +0000)]
Add a Makefile.common for Wiretap, and have Makefile.am and
Makefile.nmake include it.

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

15 years agoFrom Anders Broman: Update libethereal.def to match recent changes in print.c.
gerald [Mon, 26 Jul 2004 14:11:28 +0000 (14:11 +0000)]
From Anders Broman: Update libethereal.def to match recent changes in print.c.

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

15 years agoupdate tox509ce virtually all of x509ce now implemented (but there are still bugs)
sahlberg [Mon, 26 Jul 2004 09:21:36 +0000 (09:21 +0000)]
update tox509ce   virtually all of x509ce now implemented (but there are still bugs)

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

15 years agoFix a comment, as per suggestions by Yaniv Kaul.
guy [Sun, 25 Jul 2004 18:49:24 +0000 (18:49 +0000)]
Fix a comment, as per suggestions by Yaniv Kaul.

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

15 years agoAdded support for registered UDP port.
tuexen [Sun, 25 Jul 2004 17:53:02 +0000 (17:53 +0000)]
Added support for registered UDP port.

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

15 years agoFix up the declaration of yy_accept().
gerald [Sun, 25 Jul 2004 17:35:57 +0000 (17:35 +0000)]
Fix up the declaration of yy_accept().

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

15 years agosome more extensions and their dissectors defined.
sahlberg [Sun, 25 Jul 2004 12:54:33 +0000 (12:54 +0000)]
some more extensions and their dissectors defined.

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

15 years agocms update forgot that Name had been commented out in one of the structure.
sahlberg [Sun, 25 Jul 2004 10:41:39 +0000 (10:41 +0000)]
cms update    forgot that Name had been commented out in one of the structure.

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

15 years ago large CMS update.
sahlberg [Sun, 25 Jul 2004 10:34:07 +0000 (10:34 +0000)]
 large CMS update.

most of cms is now implemented

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

15 years agoFrom Lars Roland: don't print the "echo Linking dissectors.lib" command
guy [Sun, 25 Jul 2004 09:58:08 +0000 (09:58 +0000)]
From Lars Roland: don't print the "echo Linking dissectors.lib" command
before running it (printing echo commands puts extra gunk into the
output), and remove some additional generated files when doing "make
distclean".

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

15 years agoFrom Lars Roland: _NEED_VAR_IMPORT_ has to be defined so that variables
guy [Sun, 25 Jul 2004 09:55:52 +0000 (09:55 +0000)]
From Lars Roland: _NEED_VAR_IMPORT_ has to be defined so that variables
are imported correctly from libethereal.dll when compiling with MSVC.

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

15 years agoFrom Lars Roland: <epan/packet.h> has to be included before <windows.h>
guy [Sun, 25 Jul 2004 09:54:37 +0000 (09:54 +0000)]
From Lars Roland: <epan/packet.h> has to be included before <windows.h>
on Win32.

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

15 years agoMake some generic print routines that take, as an argument, a pointer to
guy [Sun, 25 Jul 2004 08:53:38 +0000 (08:53 +0000)]
Make some generic print routines that take, as an argument, a pointer to
a structure containing a pointer to print operations for that object and
a pointer to the private subclass-dependent data for that object, with
subclasses for text and PostScript, and use those rather than the old
scheme where a print format was passed as an argument - or where (as in
the case of printing summary information in Tethereal) we just printed
as text even if "-T ps" was selected.

Check whether those routines succeed or get an I/O error writing output.

Clean up indentation.

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

15 years agoUse the GLib gint64 and guint64 types instead of u_int64_t or uint64_t,
guy [Sun, 25 Jul 2004 08:36:34 +0000 (08:36 +0000)]
Use the GLib gint64 and guint64 types instead of u_int64_t or uint64_t,
as those are what's used in Ethereal for 64-bit integers, and as there's
no guarantee that either of them will be defined on any particular
platform.

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

15 years ago"-T ps" should not imply "-V"; one should be able to get a list of
guy [Sun, 25 Jul 2004 08:32:32 +0000 (08:32 +0000)]
"-T ps" should not imply "-V"; one should be able to get a list of
packet summaries in PostScript.

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

15 years agoFix the declarations for "simple_dialog()" and "vsimple_dialog()" used
guy [Sun, 25 Jul 2004 08:02:06 +0000 (08:02 +0000)]
Fix the declarations for "simple_dialog()" and "vsimple_dialog()" used
for non-GCC 2.x compilers to match their definitions.

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

15 years agoget rid of the remaining compiler warnings.
sahlberg [Sat, 24 Jul 2004 22:59:02 +0000 (22:59 +0000)]
get rid of the remaining compiler warnings.
x509af is now virtually complete (the attribute userPassword still needs
an attribute dissector but after that, x509af is complete)

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

15 years agoAdd a lot of missing attribute dissectors
sahlberg [Sat, 24 Jul 2004 22:53:27 +0000 (22:53 +0000)]
Add a lot of missing attribute dissectors

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

15 years agoadded the userCertificate and cAcertificate attributes
sahlberg [Sat, 24 Jul 2004 22:30:49 +0000 (22:30 +0000)]
added the userCertificate and cAcertificate  attributes

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

15 years agoadd dissection of the structure : Extension
sahlberg [Sat, 24 Jul 2004 22:16:41 +0000 (22:16 +0000)]
add dissection of the structure : Extension

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

15 years agoIn "dissect_smb_server_type_flags()":
guy [Sat, 24 Jul 2004 09:59:00 +0000 (09:59 +0000)]
In "dissect_smb_server_type_flags()":

explicitly pass NULL as the tree argument to
"dissect_ndr_uint32()" - "tree", which was passed before, was
definitely null at that point, and the intent is that it not put
anything into the protocol tree;

use the correct offset when putting items into the protocol tree
(the offset has been advanced just past the end of the field at
the time the items are being put into the protocol tree).

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

15 years agoInclude "colors.h" to define BLACK and WHITE.
guy [Sat, 24 Jul 2004 06:38:33 +0000 (06:38 +0000)]
Include "colors.h" to define BLACK and WHITE.

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

15 years ago"color_filters.h" doesn't need to include "epan/dfilter/dfilter.h";
guy [Sat, 24 Jul 2004 02:39:15 +0000 (02:39 +0000)]
"color_filters.h" doesn't need to include "epan/dfilter/dfilter.h";
anything that includes "color_filters.h" also includes
"epan/dfilter/dfilter.h" either directly or indirectly.

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

15 years agoMove the color-filter related stuff out of "color.h" into
guy [Sat, 24 Jul 2004 02:29:14 +0000 (02:29 +0000)]
Move the color-filter related stuff out of "color.h" into
"color_filters.h", as that's the appropriate place for it - "color.h"
should just deal with "color_t".

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

15 years agoRename "create_color()" to "initialize_color()", as that reflects a bit
guy [Sat, 24 Jul 2004 02:08:42 +0000 (02:08 +0000)]
Rename "create_color()" to "initialize_color()", as that reflects a bit
better what it actually does.

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

15 years agoAdd some comments from Gerald's Windows version of color_filters.c.
guy [Sat, 24 Jul 2004 01:32:29 +0000 (01:32 +0000)]
Add some comments from Gerald's Windows version of color_filters.c.

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

15 years agoMove color_filters.c and color_filters.h up to the top-level directory,
guy [Sat, 24 Jul 2004 01:29:12 +0000 (01:29 +0000)]
Move color_filters.c and color_filters.h up to the top-level directory,
as they're now (theoretically) toolkit-independent (modulo changes that
might be required to the code to update filter lists when a new filter
is read in).

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

15 years agoMove the declaration of "color_add_filter_cb()" to "color.h", as,
guy [Sat, 24 Jul 2004 01:16:45 +0000 (01:16 +0000)]
Move the declaration of "color_add_filter_cb()" to "color.h", as,
although it currently takes a pointer to a GtkWidget as its second
argument, that argument is actually a "void *", so it's sort-of
toolkit-independent.

That lets us get rid of all GTK+ references in "gtk/color_filters.c", so
we can move it up to the top-level directory; get rid of the <gtk/gtk.h>
include, in favor of a <glib.h> include.

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

15 years agoMove the declaration of "create_color()" up to "color.h", so it's
guy [Sat, 24 Jul 2004 00:49:19 +0000 (00:49 +0000)]
Move the declaration of "create_color()" up to "color.h", so it's
declared in a toolkit-independent header file.  Get rid of
"gtk/color_utils.h", as there's nothing left in it.

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

15 years agoHave "gtk/color_utils.c" contain routines with toolkit-independent APIs,
guy [Sat, 24 Jul 2004 00:35:13 +0000 (00:35 +0000)]
Have "gtk/color_utils.c" contain routines with toolkit-independent APIs,
but toolkit-dependent implementations, for manipulating colors, and have
"gtk/color_utils.h" declare them (the header file should eventually be
moved to the top-level directory).  Move the routines to convert between
GdkColor and color_t out of there into "colors.c", and move their
declarations into "colors.h", as their APIs are toolkit-dependent.

Have the first such routine be a "create_color()" routine, which takes
RGB values and initializes a "color_t", including doing any
toolkit-dependent work necessary for that; use that in the
"gtk/color_filters.c" code (the goal is to remove as many of the toolkit
dependencies as possible from that code, and move it to the top-level
directory).

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

15 years agoGet rid of unneeded include of "colors.h".
guy [Sat, 24 Jul 2004 00:34:04 +0000 (00:34 +0000)]
Get rid of unneeded include of "colors.h".

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

15 years agoMake "new_color_filter()" GUI-independent - have it take two "color_t"
guy [Sat, 24 Jul 2004 00:08:19 +0000 (00:08 +0000)]
Make "new_color_filter()" GUI-independent - have it take two "color_t"
pointers, for the background and foreground color, as arguments, and
have its callers generate them from GdkColor values.

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

15 years ago"capture_combo_utils.{c,h}" don't use any GTK+ stuff, so move them to
guy [Fri, 23 Jul 2004 23:36:50 +0000 (23:36 +0000)]
"capture_combo_utils.{c,h}" don't use any GTK+ stuff, so move them to
the top-level directory.

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

15 years agoRemove set -/+x - they were added for debugging and not intended for commit
jmayer [Fri, 23 Jul 2004 23:34:15 +0000 (23:34 +0000)]
Remove set -/+x - they were added for debugging and not intended for commit

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

15 years agoTrivial warning fixes:
jmayer [Fri, 23 Jul 2004 23:28:08 +0000 (23:28 +0000)]
Trivial warning fixes:
- comma at end of enum
- function declarations with empty args instead of void
- c++ style comments

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

15 years agoadd nice text item for the case when we could not find the dissector for a specific...
sahlberg [Fri, 23 Jul 2004 23:12:31 +0000 (23:12 +0000)]
add nice text item for the case when we could not find the dissector for a specific OID/attribute to make it easier to see where we have missed implementing something.

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

15 years agoinside dissect_ber_sequence() we know the expected length of the field that follows.
sahlberg [Fri, 23 Jul 2004 23:06:38 +0000 (23:06 +0000)]
inside dissect_ber_sequence() we know the expected length of the field that follows.

use this and create a new tvbsubset so that
1, reading too much data is flagged as MALFORMED PACKET indicating a bug in the dissector (or a packet that IS malformed)
2, this also implicitely passes the length of the data through the ber.oid dissector handle in case we want to pick it up later.

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

15 years agoUse "format_text()" on strings to be put into the Info column and the
guy [Fri, 23 Jul 2004 22:39:08 +0000 (22:39 +0000)]
Use "format_text()" on strings to be put into the Info column and the
display representation of items in the protocol tree, so we don't get
hosed by non-printable characters.

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

15 years agoHave distclean remove built sources.
gerald [Fri, 23 Jul 2004 21:24:25 +0000 (21:24 +0000)]
Have distclean remove built sources.

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

15 years agoNothing here uses any GTK+ stuff, so get rid of the include of
guy [Fri, 23 Jul 2004 20:41:23 +0000 (20:41 +0000)]
Nothing here uses any GTK+ stuff, so get rid of the include of
<gtk/gtk.h>.  (It should ultimately be moved out of the gtk directory.)

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

15 years agoremove some more compiler warnings
sahlberg [Fri, 23 Jul 2004 14:00:34 +0000 (14:00 +0000)]
remove some more compiler warnings

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

15 years agomake the implicit_tag parameter _U_ to get rid of some compiler warnings in those...
sahlberg [Fri, 23 Jul 2004 13:21:48 +0000 (13:21 +0000)]
make the implicit_tag parameter  _U_  to get rid of some compiler warnings in those cases it is not used.

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

15 years agotelex and telephone number attributes
sahlberg [Fri, 23 Jul 2004 13:11:29 +0000 (13:11 +0000)]
telex and telephone number attributes

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

15 years agoRemove a compiler warning for a parameter that is not used
sahlberg [Fri, 23 Jul 2004 12:22:13 +0000 (12:22 +0000)]
Remove a compiler warning for a parameter that is not used
in the DirectoryString dissector

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

15 years agoIf there's no data in the authentication option, don't unescape and
guy [Fri, 23 Jul 2004 08:36:07 +0000 (08:36 +0000)]
If there's no data in the authentication option, don't unescape and
tvbuffify it.

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

15 years agoadd all the other (quite a lot of them) attributes that were of the type DirectoryString
sahlberg [Fri, 23 Jul 2004 08:21:51 +0000 (08:21 +0000)]
add all the other (quite a lot of them) attributes that were of the type DirectoryString

(see how good it is to put markers for emacs macros in the files, it was pretty quick, wasnt it? i even tested the resulting code.)

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

15 years agoUse "col_append_str()" and "col_append_fstr()" to build the Info column,
guy [Fri, 23 Jul 2004 07:59:15 +0000 (07:59 +0000)]
Use "col_append_str()" and "col_append_fstr()" to build the Info column,
rather than building a string, and use "tvb_format_text()" on the data,
so that non-printable characters are escaped.

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

15 years agoadd dissection of DirectoryString, this unfortunately had to be done manually inside...
sahlberg [Fri, 23 Jul 2004 07:46:12 +0000 (07:46 +0000)]
add dissection of DirectoryString,  this unfortunately had to be done manually inside the template.

Also implement the attribute  organizationName which is of this type.

(Add magic comments so emacs-macros will be happy.)

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

15 years agoregister ber oid functions through a special function in packet-ber.c which also...
sahlberg [Fri, 23 Jul 2004 07:08:14 +0000 (07:08 +0000)]
register ber oid functions through a special function in packet-ber.c which also takes (still unused) the name of the oid
so that sometime later it will be easy to add code to add the name of the oid to the dissection.

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

15 years ago"iax_lookup_circuit_details()" can return null; check whether it's null
guy [Fri, 23 Jul 2004 06:37:58 +0000 (06:37 +0000)]
"iax_lookup_circuit_details()" can return null; check whether it's null
before using it.

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

15 years agoFrom Graham Bloice: add resources to wiretap.dll.
guy [Fri, 23 Jul 2004 06:11:50 +0000 (06:11 +0000)]
From Graham Bloice: add resources to wiretap.dll.

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

15 years agoNote that you *MUST* make sure "match_strval()" doesn't return null
guy [Fri, 23 Jul 2004 01:37:35 +0000 (01:37 +0000)]
Note that you *MUST* make sure "match_strval()" doesn't return null
before using its value, or must check for a null return value and handle
it specially, otherwise you put Ethereal at risk of crashing with bad
packet data.

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

15 years agoWe are not guaranteed that "fchdr.r_ctl & 0x0F" is a valid frame type,
guy [Fri, 23 Jul 2004 01:32:42 +0000 (01:32 +0000)]
We are not guaranteed that "fchdr.r_ctl & 0x0F" is a valid frame type,
so don't use "match_strval()", use "val_to_str()".

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

15 years ago"dissect_x509if_AttributeTypeAndDistinguishedValue()" is static - don't
guy [Thu, 22 Jul 2004 20:08:08 +0000 (20:08 +0000)]
"dissect_x509if_AttributeTypeAndDistinguishedValue()" is static - don't
declare it as non-static in the header file.

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

15 years agouse gtk_clipboard_get(), so the "copy to clipboard" is available in all GTK2 versions
ulfl [Thu, 22 Jul 2004 18:42:50 +0000 (18:42 +0000)]
use gtk_clipboard_get(), so the "copy to clipboard" is available in all GTK2 versions

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

15 years agofrom Thomas Palmer: add "Copy to clipboard" button to the conversation table dialogs
ulfl [Thu, 22 Jul 2004 16:36:50 +0000 (16:36 +0000)]
from Thomas Palmer: add "Copy to clipboard" button to the conversation table dialogs

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

15 years agoadd the countryname attribute
sahlberg [Thu, 22 Jul 2004 13:11:13 +0000 (13:11 +0000)]
add the countryname attribute

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

15 years agostart dissecting AttributeTypeAnddistinguishedValue
sahlberg [Thu, 22 Jul 2004 10:29:17 +0000 (10:29 +0000)]
start dissecting  AttributeTypeAnddistinguishedValue
(which must be implemented by hand inside themplate)

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

15 years agodissect the x509if/Name all the way down to the AttributeTypeAndDistinguishedValue...
sahlberg [Thu, 22 Jul 2004 10:05:59 +0000 (10:05 +0000)]
dissect the x509if/Name all the way down to the AttributeTypeAndDistinguishedValue structure but not the structure itself.

we are getting there, slow but steady

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

15 years agominor update
sahlberg [Thu, 22 Jul 2004 08:00:33 +0000 (08:00 +0000)]
minor update

GeneralNames is defined in x509ce and not x509if

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

15 years agominor update
sahlberg [Thu, 22 Jul 2004 07:51:47 +0000 (07:51 +0000)]
minor update

UniqueIdentifier is imported from x509sat and not x509if

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

15 years agoFix the fix to krb5
jmayer [Wed, 21 Jul 2004 22:37:04 +0000 (22:37 +0000)]
Fix the fix to krb5

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

15 years agoAdd doxygen.cfg to the "clean" target.
gerald [Wed, 21 Jul 2004 22:12:49 +0000 (22:12 +0000)]
Add doxygen.cfg to the "clean" target.

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