Commit Graph

154 Commits

Author SHA1 Message Date
Luis Ontanon 4c3b41917e Remove every remembrance of NET_SNMP from COPS
svn path=/trunk/; revision=22678
2007-08-26 21:38:09 +00:00
Luis Ontanon 42d99d2724 De-NET-SNMPize COPS
svn path=/trunk/; revision=22673
2007-08-26 20:16:35 +00:00
Luis Ontanon 00c5e48a17 get users of oid_resolv to use the new oids, rollout packet-snmp.c
svn path=/trunk/; revision=22651
2007-08-25 01:14:24 +00:00
Jörg Mayer b312e64f6a get_ber_length doesn't need the tree argument, get rid of it.
Rebuild asn1 dissectors.

svn path=/trunk/; revision=22627
2007-08-24 07:12:04 +00:00
Anders Broman f08cd1e5e3 actx in the rest of dissect_ber..()l
svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
Sebastien Tandel 3820cff29c ep_malloc -> ep_alloc !!
svn path=/trunk/; revision=21281
2007-03-30 08:27:20 +00:00
Sebastien Tandel 76a9512a73 remove some g_malloc/g_free
svn path=/trunk/; revision=21280
2007-03-30 08:22:08 +00:00
Stephen Fisher 8fd3ee0560 Remove almost all of the casts I committed recently and in place of
them, add -Wno-pointer-sign to CFLAGS when gcc will accept it.


svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
Stephen Fisher ab8f589336 Fix about 100 simple to fix warnings from gcc 4.0 in epan/dissectors
svn path=/trunk/; revision=21233
2007-03-27 22:50:11 +00:00
Ronnie Sahlberg d5d5159b6d From Sebastien Tandel
fixes for various compiler warnings

svn path=/trunk/; revision=21210
2007-03-26 11:06:26 +00:00
Martin Mathieson 7114ed8349 Turn an error that I've encountered into an easily findable expert item.
svn path=/trunk/; revision=21036
2007-03-16 14:09:12 +00:00
Martin Mathieson b731274da6 Use previously unused hf_cops_obj_c_type (cops.c_type) field
svn path=/trunk/; revision=20566
2007-01-26 12:14:06 +00:00
Martin Mathieson ebb948cd3c Make COPS dissector findable by name
svn path=/trunk/; revision=20564
2007-01-26 11:31:51 +00:00
Tomas Kukosa a68f0224c3 move asn1.c/.h files into plugins/asn1 directory as just this plugin uses it now
svn path=/trunk/; revision=20372
2007-01-10 07:09:30 +00:00
Jörg Mayer e26860607d Get rid of UCD SNMP support (it's not longer supported and
superseeded by net-snmp). Replace some_snmp by net_snmp
where appropriate.


svn path=/trunk/; revision=20071
2006-12-08 15:05:41 +00:00
Jörg Mayer dd26a7021b nikai@nikai.net:
Remaining fixes from:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1225

svn path=/trunk/; revision=19895
2006-11-14 20:32:29 +00:00
Ronnie Sahlberg 2d1bb39121 change the signature for the get_pdu_len() function pointer passed to tcp_dissect_pdus() to also include a packet_info pointer.
there are many reasons why some protocols actually need to be able to access the pinfo structure while determining the pdu size



svn path=/trunk/; revision=19751
2006-10-31 09:29:07 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Gerald Combs 8baf6e0ae2 The AMID type and tag are two bytes, not four. The PSID should be shown
in decimal, not hex.

svn path=/trunk/; revision=18116
2006-05-09 18:30:52 +00:00
Anders Broman b0d52994be Covierty bug fix.
svn path=/trunk/; revision=17705
2006-03-23 17:00:32 +00:00
Ronnie Sahlberg f331077a60 waste a couple of bytes per tcp conversation and make the tree for acked_packets (i.e. packets that have interesting tcp properties such as being retransmissions etc) hang off the per conversation tcpd struct instead of being global.
while this should improve performance by unmeasurably little it does have the sideeffect that once we finish the rewrite   tcp analysis might actually work and work well even for tcp over tcp tunnelling. 

this also means that if you include packet-tcp.h   you also need to include emem.h .




svn path=/trunk/; revision=17681
2006-03-20 10:52:53 +00:00
Gerald Combs 243fb39067 Add PacketCable Multimedia updates. Sponsored by CableLabs.
svn path=/trunk/; revision=17232
2006-02-09 19:41:20 +00:00
Gerald Combs f816511ea9 In packet-cops.c use proto_item_append_text() instead of creating a
separate buffer.  Fixes the current Buildbot failure.

Don't let the sprint_realloc_* functions reallocate ep_allocated memory.
Add comments warning against this in the future.

In emem.c, make sure we don't use an extra 100k every stinkin' time
someone wants to allocate memory when debugging is enabled.

Fixup whitespace.

svn path=/trunk/; revision=17051
2006-01-18 20:02:19 +00:00
Jörg Mayer f905ad1862 packet-fcswils.c: Fix incorrect use of g_snprintf return
packet-wccp.c: Fix incorrect use of g_snprintf return
packet-cops.c: Fix incorrect use of g_snprintf return value
packet-wtp.c: Fix incorrect use of g_snprintf return value


svn path=/trunk/; revision=17046
2006-01-17 10:56:06 +00:00
Anders Broman 2044d02bcb Move def of subid_t to format-oid.h don't include asn1.h in cops any more.
svn path=/trunk/; revision=16440
2005-11-08 22:18:06 +00:00
Guy Harris ba324831a0 Don't try to strip the last byte from a zero-byte OID. Fixes bug 503.
svn path=/trunk/; revision=16132
2005-10-05 21:41:12 +00:00
Guy Harris 399bf74c47 Even a null object has a non-zero length (for the BER identifier and
length); update the offset when dissecting one.

svn path=/trunk/; revision=16118
2005-10-04 18:21:04 +00:00
Guy Harris 72dd04b43c We can just use "get_ber_identifier()" and "get_ber_length()" to fetch
BER identifier and length information; calling
"dissect_ber_identifier()" and "dissect_ber_length()" with a null tree
argument doesn't have any advantages over that.

Don't put an octet string into the protocol tree twice, once with
"dissect_ber_octet_string()" and once with the real value; once is enough.

svn path=/trunk/; revision=16112
2005-10-04 10:17:45 +00:00
Guy Harris a275cd2495 Move the Diameter dictionary files to a "diameter" subdirectory, along
the lines of what's done for RADIUS.  That keeps them together (and
separate from other files), and makes the layout of the top-level source
directory closer to the layout of the installation directory, so that if
you run Ethereal or Tethereal from the top-level directory on Windows
it'll pick up the Diameter dictionary files (if it supports loading
them), and can do so on UN*X if we support a mechanism to let it find
its control files in the directory in which the binary resides.

Use the diameter_DATA, dtds_DATA, and radius_DATA macros in the
EXTRA_DIST macro, so you only have to change the lists of Diameter, DTD,
and RADIUS files in one place if you add or remove a file.

svn path=/trunk/; revision=16050
2005-09-29 02:20:29 +00:00
Anders Broman 510476e2ea Remove dependencies on asn1.c, stil endes to be included to define subid_t.
svn path=/trunk/; revision=16010
2005-09-26 18:18:06 +00:00
Anders Broman 7981470317 Change some of the asn1 functions to use packet-ber ones.
svn path=/trunk/; revision=15857
2005-09-18 20:04:04 +00:00
Guy Harris ab2dca9114 Move some headers for stuff defined by a dissector into epan/dissectors
- and rename smb.h to packet-smb.h, as it's packet-smb.c's header file.

svn path=/trunk/; revision=15845
2005-09-17 00:31:15 +00:00
Guy Harris b7b80d94be Move a pile of protocol-related headers from the top-level source
directory to the epan directory.  Some of them should perhaps ultimately
be moved to epan/dissectors, if they pertain only to stuff exported by a
particular dissector.

Fix Gerald's e-mail address in files we're moving.

svn path=/trunk/; revision=15844
2005-09-17 00:02:31 +00:00
Guy Harris 25c4bc9379 Replace tvb_memcpy() calls that extract IPv4 addresses into a guint32,
and that extract IPv6 addresses into a "struct e_in6_addr", with
tvb_get_ipv4() and tvb_get_ipv6() calls - except for some that we
remove, by using proto_tree_add_item(), rather than replacing.

Have epan/tvbuff.h include epan/ipv6-utils.h, to define "struct
e_in6_addr" (not necessary to declare the tvbuff routines, but including
it there means "struct e_in6_addr" is guaranteed to be defined before
those declarations, so we don't get compiler complaints if we define it
*after* those declarations).

svn path=/trunk/; revision=15758
2005-09-11 21:25:37 +00:00
Ronnie Sahlberg a6adeb0b2c value_strings are terminated with {0,NULL} not {0xff,NULL}
svn path=/trunk/; revision=15578
2005-08-28 01:57:13 +00:00
Guy Harris bcb91d2f45 The OID strings returned by new_format_oid(), and the OID string
returned by format_oid(), are allocated with the ep_alloc routines;
don't free them.

svn path=/trunk/; revision=15525
2005-08-25 03:31:54 +00:00
Ronnie Sahlberg bc3abb6ace remove gmalloc and sprintf
svn path=/trunk/; revision=15491
2005-08-21 01:14:43 +00:00
Ulf Lamping 994496a184 several times replacing:
sprintf -> g_snprintf
snprintf -> g_snprintf
vsnprintf -> g_vsnprintf
strdup -> g_strdup

svn path=/trunk/; revision=15412
2005-08-18 19:31:15 +00:00
Jörg Mayer 34493e8f9e char -> const char warning fixes
svn path=/trunk/; revision=15126
2005-07-28 07:53:38 +00:00
Guy Harris ab797734dd Get rid of the private "my_match_strval()" routine in many dissectors;
add a "match_strval_idx()" routine that does the same thing, and have
"match_strval()" call it.

Make those routines, and "val_to_str()", return a "const" pointer. 
Update dissectors as necessary to squelch compiler warnings produced by
that.

Use "val_to_str()" rather than using "match_strval()" and then, if the
result is null, substituting a specific string.  Clean up some other
"match_strval()"/"val_to_str()" usages.

Add a null pointer check in the NDPS dissector's "attribute_value()"
routine, as it's not clear that "global_attribute_name" won't be null at
that point.

Make some global variables in the AFS4INT dissector local.

Make some routines not used outside the module they're in static.

Make some tables "static const".

Clean up white space.

Fix Gerald's address in some files.

svn path=/trunk/; revision=14786
2005-06-26 19:56:52 +00:00
Ulf Lamping fdb5b1af02 just to get things straight: a dissector should *never* do any g_assert() calls!
in a simple approach, I've replaced all g_assert() and g_assert_not_reached() calls by their exception throwing counterparts DISSECTOR_ASSERT() and DISSECTOR_ASSERT_NOT_REACHED()

this will replace application crash by showing a dissector bug, which is the desired behaviour

there were some g_assert calls in the protocol registering functions, which might not be acting as expected now, but to be able to simply search for g_assert in the future I've replaced that calls too

one g_assert remained, the one when someone throws an unknown exception "into" packet_frame.c, but IMHO this one should remain.

svn path=/trunk/; revision=14608
2005-06-10 18:28:22 +00:00
Gilbert Ramirez 46788b3336 Remove bitmasks from field definitions for FT_IPv4
and FT_IPv6 fields.

svn path=/trunk/; revision=14504
2005-05-31 14:03:34 +00:00
Lars Roland ec9ca01616 Move the following files from /trunk to /trunk/epan:
asn1.[ch]
follow.[ch]
ptvcursor.[ch]
reassemble.[ch]
xmlstub.[ch]

fix #include statements accordingly.

svn path=/trunk/; revision=13366
2005-02-09 23:38:00 +00:00
Guy Harris 636d4690d7 Make the object length variable in some routines an "int"; we fetch a
16-bit unsigned value into it, but we might round it up to a multiple of
4 bytes, which could overflow a guint16.  Make arguments corresponding
to them "int" as well.

Use the reported length in "cops_analyze_packetcable_mm_obj()".

svn path=/trunk/; revision=13075
2005-01-16 20:26:19 +00:00
Guy Harris 81df0567ab Use "tvb_format_text()" to generate the text to use in
"proto_tree_add_text()" calls, so that we handle non-printable
characters if they happen to appear in the strings.

svn path=/trunk/; revision=12951
2005-01-05 09:46:43 +00:00
Gerald Combs 5d3012bd86 PacketCable byte view highlighting was offset 4 bytes for many tree view items.
Fix the offset.

svn path=/trunk/; revision=12712
2004-12-10 16:14:08 +00:00
Gerald Combs ff7494014b The PacketCable MM code was displaying the secondary record keeping server
IP address where it should have displayed the CCC ID.

svn path=/trunk/; revision=12708
2004-12-09 23:25:01 +00:00
Gerald Combs 536cfec083 Fix a cut-and-paste error.
svn path=/trunk/; revision=12306
2004-10-15 19:02:47 +00:00
Guy Harris ab5a687178 Get rid of C++ comments.
Add more COPS client type values from the IANA cops-parameters page.

Get rid of per-dissection static variables - pass them as parameters.

Make functions not used outside packet-cops.c static.

svn path=/trunk/; revision=12294
2004-10-14 07:42:31 +00:00
Gerald Combs 0d1e6348c2 Remove an unused variable.
svn path=/trunk/; revision=12242
2004-10-08 17:24:18 +00:00
Gerald Combs 628bde2034 Add support for the PacketCable Multimedia Specification (PKT-SP-MM-
I02-040930).  The code had to be integrated with the existing D-QoS code,
and has not been extensively tested.  Add ports for PacketCable D-QoS
(2126) and Multimedia (3918).  Code contributed by CableLabs.


svn path=/trunk/; revision=12232
2004-10-07 19:22:54 +00:00
Guy Harris bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Ulf Lamping d530bd4e14 Prevent the word "desegmentation" at the GUI, but use reassembling at that places, as we also use "defragmentation" and "reassembling". Use reassembling as the general term for such actions.
I (hopefully) didn't changed any protocol fields or preference file names, but only the GUI labels appearing in the protocol display and the protocol preferences.

Also added a note to the protocol preferences (where appropriate), that you have to enable "Allow subdissectors to reassemble TCP streams" at the corresponding protocol settings for TCP reassembling to take effect.

If you encounter any mistakes I've made here, please let me know...

svn path=/trunk/; revision=11784
2004-08-21 09:02:52 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00