Commit graph

16836 commits

Author SHA1 Message Date
Anders Broman
fa04b29920 As per Olivier Jacques mail,
"preferences/mtp3 must be changed accordingly (it is explicitly indicated that the "network address format" is ..."
Change the text and som names.

svn path=/trunk/; revision=16827
2005-12-16 20:36:09 +00:00
Gerald Combs
18abcfc988 If "CLIENTNAME" is set (which indicates that we're using RDP) use
"not tcp port 3389" instead of "not ip host $CLIENTNAME", since it
seems to be more reliable.

Make sure we remove dumpcap.obj when we clean.

This also tests the content-type "text/plain; charset=utf-8" for commit
messages.  Maybe Stig B's name will show up correctly now.

svn path=/trunk/; revision=16826
2005-12-16 17:53:44 +00:00
Jörg Mayer
0beb951745 Some updates
svn path=/trunk/; revision=16825
2005-12-16 17:52:05 +00:00
Jörg Mayer
743ab00c60 Don't link dumpcap against libethereal etc.
It might be, that I've removed too many options:

in that case, replace
@PCAP_LIBS@
by some of
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@

and let me know which of the options are needed

svn path=/trunk/; revision=16824
2005-12-16 17:05:37 +00:00
Jörg Mayer
d62a8cf029 Jaap Keuter:
I'm seeing a variant of the registered Ethernet address for MS NLB
multicast being used.

Changed to remove "multicast" from the name as it isn't a multicast
address.

svn path=/trunk/; revision=16823
2005-12-16 16:40:31 +00:00
Anders Broman
6f23144e46 From Jaap Keuter:
- Editcap 
Mikko Tiihonen filed bug 379 including a patch for editcap. This wasn't picked up so far. I've ported the patch to svn 16820 and included a documentation patch.

-packet-ieee80211.c
Radek Vokal of RedHat filed a bug found by Vladimir Kondratiev of Intel in the 802.11 dissector. Radek provided a sample capture and Vladimir a oneliner patch. I've ported the patch to svn 16820 and tested it against the provided capture. Works well.


-From Kan Sasaki
A patch for packet-ospf.c is attached:
 - Fix the handling of the DN-bit of options field.
 - Add a new function dissect_ospf_bitfield() to dissect a bitfield
   such as options, flags. The following functions are merged by
   using this function.
     - dissect_ospf_lls_extended_options()
     - dissect_ospf_dbd()


     - dissect_ospf_options()
     - dissect_ospf_v3_prefix_options()
 - dissect the flags and prefix-options bitfield.

- lldp Bugfix Bug 596  LLDP TIA Network Policy Decode is not correct 

- Camel make it possible to dissect based on OID.

svn path=/trunk/; revision=16822
2005-12-16 16:37:03 +00:00
Anders Broman
9269a3b4f2 From Jaap Keuter:
Bug 373 complains about a field type. Trivial fix attached.

svn path=/trunk/; revision=16821
2005-12-16 16:31:46 +00:00
Ulf Lamping
f2291acd18 Declare the GTK 2.6 as the official mainline now!!!
(as per mailing list discussions and mainly as the Gimp windows port also uses this version)


fix the NSIS install settings for GTK 2.6 of GTK-Wimp

svn path=/trunk/; revision=16820
2005-12-16 08:20:22 +00:00
Ulf Lamping
fb6554117f some minor fixes: logging and comments fixed
svn path=/trunk/; revision=16819
2005-12-16 07:43:24 +00:00
Anders Broman
336086ca21 From Michael Rozhavsky:
This patch adds support for draft-nguyen-ospf-lls-05.txt, draft-nguyen-ospf-oob-resync-05.txt and draft-nguyen-ospf-restart-05.txt. These are an alternative way to do OSPF graceful restart.

These drafts are implemented by cisco and several other vendors that want to interoperate with cisco. My patch adds a dissectors for LLS TLVs.

I had to modify the existing ospf dissector as it assumed that all the data after IP header is OSPF packet. This is not true anymore and probably was not true before as well.

Also please find attached an example of OSPF packets with LLS data blocks.
-- 
   
   

svn path=/trunk/; revision=16818
2005-12-16 07:37:28 +00:00
Anders Broman
e0bec8bb86 From Jacques, Olivier (OCBU-Test Infra)
> here is a small patch for the flow graph feature. It allows 
> to have SS7 nodes (network indicator/point codes) to be 
> recognized as nodes in the graphs.
> The patch consists in using "pinfo->net_src" or 
> "pinfo->net_dst" instead of "pinfo->src" or "pinfo->dst".
> I did some tests with other IP protocols and behavior was 
> still the same as before. But I do not guaranty that it 
> doesn't have some bad side effects for some protocols.

svn path=/trunk/; revision=16817
2005-12-16 07:20:13 +00:00
Anders Broman
cdc5a94864 From Grame Lunt:
The new oid_resolv.c OID handling is more strict on what an OID is. It now requires the OID string representation to be a sequence of dotted integers - particularly when looking up an associated name.

The X.411 and DISP dissectors have [ab]used the OID handling to support the dissection of x.411 standard-extensions (which are indicated by a single
integer) and where the OID is sufficient by itself (disp). Have a look at x411.cnf and disp.cnf

Attached is a small patch to restore the previous functionality in the new handling. If this is something you don't wish to continue to support in the OID handling, then I'll look at alternate mechanisms.

Graeme

svn path=/trunk/; revision=16816
2005-12-16 07:18:52 +00:00
Anders Broman
8d05164bec Get rid of duplicted dissector tables for MTP3 Service indicator and SCCP ssn:s
svn path=/trunk/; revision=16815
2005-12-16 07:05:50 +00:00
Anders Broman
483ec5bd05 From Graeme Lunt:
* DOP - This has now been successfully tested and so is now enabled by default and workaround code removed. 
Also now uses the correct EXPORTs from the other modules/dissectors.

* X509SAT - Most of the selected attributes are now supported in addition to the DirectoryString syntax attributes. This includes restoring the correct DirectoryString syntax and also providing the basic syntaxes (e.g. OBJECT IDENTIFIER, PrintableString). The latter requires a sed line in the Makefile which I assume should be OK? Not all the SAT can be defined in x509sat - so some have been included in x509if and x509af - though x509sat.cnf contains the master list and references the other dissectors where appropriate.

(I still prefer a syntax registration approach but I don't think that is going to be agreed in the short term.)

* X509IF - a mechanism to register some formating, based upon the hf_index, that is used in the cnf file.

* A couple of fixes identified by Stig.

svn path=/trunk/; revision=16814
2005-12-16 06:47:22 +00:00
Ronnie Sahlberg
163252a41c From Stig B
Patch for COTP reassembly.

There does not seem to be any reasonable or cleaner way to fix COTP 
reassembly than adding the frame.[ch] patch.


svn path=/trunk/; revision=16813
2005-12-16 00:32:12 +00:00
Ronnie Sahlberg
f84e9e9bde from Jaap K
fix for bug 306


svn path=/trunk/; revision=16812
2005-12-15 23:17:01 +00:00
Ronnie Sahlberg
651a48c2e2 update to modbus/tcp
Make the dissector new-style and add simple (better than nothing) heuristics so that it can reject some packets that are obviously not modbus.

change the constants to upper case


 the horrors:
replace two instances where tvb_memcpy()  were used to read straight into a structure to instead read the structure field by field using tvb_get_...()
This may allow the modbus dissector to actually work.






svn path=/trunk/; revision=16811
2005-12-15 22:54:33 +00:00
Gerald Combs
7463a0e9fb Fix themeing for GTK+ 2.8. This hasn't been tested under 2.6 or 2.4.
svn path=/trunk/; revision=16810
2005-12-15 19:12:51 +00:00
Gerald Combs
0616a4bedb Make sure we install the libpng and cairo DLLs if needed.
svn path=/trunk/; revision=16809
2005-12-15 03:36:17 +00:00
Guy Harris
3cb89f382f Use the reported length, not the length, to figure out how much to
dissect (so that we report a packet cut short by the snapshot length).

Get rid of an unused variable..

As we restore "pinfo->fragmented" from "save_fragmented" regardless of
whether we're defragmenting or not, we have to save its previous value
in "save_fragmented" regardless of whether we're defragmenting or not.

svn path=/trunk/; revision=16808
2005-12-15 02:44:26 +00:00
Ulf Lamping
3b36e59113 remove the setting of no longer required command line options:
-H (Hide capture info dialog)
-m (font to use)

svn path=/trunk/; revision=16807
2005-12-15 00:48:59 +00:00
Ulf Lamping
0268ed5e2d remove a missplaced comment
svn path=/trunk/; revision=16806
2005-12-15 00:46:23 +00:00
Ulf Lamping
27b13556ec use capture_opts_trim_iface() instead of duplicated code
various minor code cleanup

svn path=/trunk/; revision=16805
2005-12-15 00:45:29 +00:00
Anders Broman
ef6bc891fa Fix Bug 628 Bugzilla 2.18.3
CAMEL - Connect decoding error 
- Calledparty number included first two octets

svn path=/trunk/; revision=16804
2005-12-14 21:46:56 +00:00
Anders Broman
13f87e6f52 Add possibility to try to dissect IP over TIPC.
svn path=/trunk/; revision=16803
2005-12-14 21:40:04 +00:00
Gerald Combs
253b96e81f Add support for GLib/GTK+ 2.8. Point to the latest tag.
svn path=/trunk/; revision=16802
2005-12-14 21:19:39 +00:00
Anders Broman
2c7bbf1fb1 From Jaap Keuter:
> Two patch files are attached adding UDP-Lite dissection to the UDP 
> dissector. Wiki page is available at the normal location, including 
> sample captures courtesy of Gerrit Renker of the University of 
> Aberdeen Electronics Research Group. The patch has been tested with 
> both the sample captures and Fuzz test.

And add Marc Petit-Huguenin to AUTHORS

svn path=/trunk/; revision=16801
2005-12-14 21:14:57 +00:00
Anders Broman
f3c3b8f577 Add makefiles
svn path=/trunk/; revision=16800
2005-12-14 21:04:42 +00:00
Anders Broman
404b556084 From Grame Lunt:
Attached is a patch that updates - 

* DOP - This has now been successfully tested and so is now enabled by default and workaround code removed. 
Also now uses the correct EXPORTs from the other modules/dissectors.

* X509SAT - Most of the selected attributes are now supported in addition to the DirectoryString syntax attributes. This includes restoring the correct DirectoryString syntax and also providing the basic syntaxes (e.g. OBJECT IDENTIFIER, PrintableString). The latter requires a sed line in the Makefile which I assume should be OK? Not all the SAT can be defined in x509sat - so some have been included in x509if and x509af - though x509sat.cnf contains the master list and references the other dissectors where appropriate.

(I still prefer a syntax registration approach but I don't think that is going to be agreed in the short term.)

* X509IF - a mechanism to register some formating, based upon the hf_index, that is used in the cnf file.

* A couple of fixes identified by Stig.

Note the patc for dop did not apply don't regenerate dissectors yet.

svn path=/trunk/; revision=16799
2005-12-14 21:02:56 +00:00
Anders Broman
7980c9295e From Graeme Lunt:
Here is a patch for packet-ber.c that only includes the upgraded dissect_unknown_ber()

svn path=/trunk/; revision=16798
2005-12-14 20:45:15 +00:00
Anders Broman
61c177ea6d From Marc Petit-Huguenin
This is a patch that add support for the latest drafts[1] in the STUN dissectors. I choose to add TURN directly in the STUN dissector instead of creating a new dissector because of the decision at the latest IETF meeting[2] to redefine TURN as an use case of STUN.


[1] ftp://ftp.rfc-editor.org/in-notes/internet-drafts/draft-ietf-behave-rfc3489bis-02.txt
ftp://ftp.rfc-editor.org/in-notes/internet-drafts/draft-rosenberg-midcom-turn-08.txt
ftp://ftp.rfc-editor.org/in-notes/internet-drafts/draft-camarillo-midcom-turn-ipv6-00.txt
[2] http://www3.ietf.org/proceedings/05nov/minutes/behave.txt

svn path=/trunk/; revision=16797
2005-12-14 20:43:39 +00:00
Anders Broman
1abb6c1031 Use src and dst instead of net_src.
svn path=/trunk/; revision=16796
2005-12-14 20:01:21 +00:00
Luis Ontanon
6124bdff49 Close the dictionary files after reading from them.
svn path=/trunk/; revision=16795
2005-12-14 09:50:11 +00:00
Ulf Lamping
4f567703de update Ethereal command line options -D and -i
svn path=/trunk/; revision=16794
2005-12-14 09:43:16 +00:00
Ulf Lamping
1b1b19458f document latest command line changes:
new: -D to list interfaces
changed: -i will also accept indices (rather than complete names only)

text copied from the tethereal.pod file

svn path=/trunk/; revision=16793
2005-12-14 09:16:30 +00:00
Guy Harris
66c394806a "a & b == c" is, in C, parsed as "a & (b == c)" - and if b and c are the
same, and have only one bit set, "(a & b) == c", which is what is
intended, is the same as "a & b".

In addition, we don't want to do desegmentation if "isup_apm_desegment"
isn't set, so that test should be ANDed with the other two tests.

svn path=/trunk/; revision=16792
2005-12-14 07:33:07 +00:00
Guy Harris
eaee2b68c5 Constify a bunch of arguments and variables, to squelch compiler
warnings.

Include "wiretap/libpcap.h" in "capture_loop.h", to get its declarations
of data structures for headers in libpcap files.  This lets us remove
the includes of "wiretap/libpcap.h from files including
"capture_loop.h".

Make "log_func_ignore()" in "tethereal.c" static, and declare some of
its arguments unused.  Also get rid of an unused variable.

Include <pcap.h> before including "wiretap/wtap-capture.h", to declare
"struct pcap_pkthdr".

svn path=/trunk/; revision=16791
2005-12-14 07:29:38 +00:00
Ulf Lamping
1f5bf52d6b hmmm, the include sequence might be important too ...
svn path=/trunk/; revision=16790
2005-12-14 01:45:09 +00:00
Ulf Lamping
292fa7814d add missing include
svn path=/trunk/; revision=16789
2005-12-14 00:10:23 +00:00
Ulf Lamping
0922a2b922 add a new directory 'test', currently containing an alpha test (using some simple bash scripts) of the ethereal/tethereal command line parameters. See the file README.test for details.
svn path=/trunk/; revision=16788
2005-12-13 23:15:20 +00:00
Ulf Lamping
79217bab2e HUGE STEP (hopefully toward the right direction):
remove a lot of redundant code from tethereal and use (move) stuff from capture_loop.c instead.

concentrate common capture related code in capture_opts.c, e.g. trying to find the right interface to capture from (command line option, preference, first usable) instead of duplicating this code over several files.

remove redundant code from dumpcap.c

this also implements command line option -D (and indexed interfaces at -i) for Ethereal and Dumpcap (as we have it in Tethereal already for a while)

svn path=/trunk/; revision=16787
2005-12-13 22:48:58 +00:00
Ulf Lamping
459c0b07b2 we don't use the command line option -W any longer, remove it from a comment
svn path=/trunk/; revision=16786
2005-12-13 22:35:28 +00:00
Ulf Lamping
ec87b13d49 make get_if_name() parameter if_text const, it's not changed inside
svn path=/trunk/; revision=16785
2005-12-13 22:33:55 +00:00
Luis Ontanon
d265d85d92 we are opening the file for writing....
svn path=/trunk/; revision=16784
2005-12-13 22:08:37 +00:00
Luis Ontanon
b40ff00e49 handle sccp connections.
(first step towards RANAP analysis).



svn path=/trunk/; revision=16783
2005-12-13 22:07:09 +00:00
Luis Ontanon
3728b83d2b Avoid the default sccp.ssn range to overwrite sccp.ssns of other dissectors.
svn path=/trunk/; revision=16782
2005-12-13 22:04:02 +00:00
Anders Broman
da8debc2ec Change reassembly to include first empty segment, check if SLR exists.
Change pinfo->src/dst to use SS7 address for reassembly to use the correct key.

svn path=/trunk/; revision=16781
2005-12-13 21:14:54 +00:00
Gerald Combs
fa312091ce Throw an exception if we have an invalid offset. Fixes bug 585.
svn path=/trunk/; revision=16780
2005-12-13 17:00:03 +00:00
Guy Harris
4ca1ee0a89 Fix some bit mask tests - & has lower priority than !=, so "a & b != c"
means "a & (b != c)", not "(a & b) != c".

Put in a comment noting a potential problem with defragmentation,
pointed out by a compiler warning that apm_Segmentation_local_ref might
not be set before it's used.

svn path=/trunk/; revision=16779
2005-12-13 10:59:33 +00:00
Guy Harris
77ff57e72a Escape question marks when they could be interpreted as part of a
trigraph.

svn path=/trunk/; revision=16778
2005-12-13 10:54:11 +00:00