Commit Graph

48 Commits

Author SHA1 Message Date
Pascal Quantin a383e692c8 Revert "tap: change glib functions to wmem."
This reverts commit 2e9f3c5d36.

It breaks the registration of codec, dissector and libwiretap plugins.

Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
Reviewed-on: https://code.wireshark.org/review/16012
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-19 10:47:10 +00:00
Dario Lombardo 2e9f3c5d36 tap: change glib functions to wmem.
Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf
Reviewed-on: https://code.wireshark.org/review/15270
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-17 15:38:03 +00:00
Guy Harris bc5a0374bf Add the packet number to the packet_info structure, and use it.
That removes most of the uses of the frame number field in the
frame_data structure.

Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:41:28 +00:00
Michael Mann 1474f49f19 new_register_dissector -> register_dissector for remaining uses.
Mostly plugins, but also LUA and generated skinny dissector.

Change-Id: Ifeb4205442f9a60875266b4e82841ff38b4fdb63
Reviewed-on: https://code.wireshark.org/review/12515
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-11 03:42:37 +00:00
Michael Mann 57e18b0034 register_dissector -> new_register_dissector
Change-Id: Ifc8208e1b96e2a3bf297912500a5f252bfa8eed9
Reviewed-on: https://code.wireshark.org/review/12073
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-23 17:36:39 +00:00
Jeff Morriss ea753e4288 Fix capitalization in MATE's "you need to restart to reconfigure" message.
Fix up some formatting and white space while we're there.

Change-Id: I869659d6fb1f8b4946f6e13a928ecd53dbabf1a4
Reviewed-on: https://code.wireshark.org/review/10807
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-05 19:09:12 +00:00
Jeff Morriss 0472d1ecad mate.released_time is added as a float so register it as such.
As noted in:
https://ask.wireshark.org/questions/45835/wireshark-mate-correlation-multiple-gops

Realistically all MATE's times should probably be converted to
FT_RELATIVE_TIMEs but that's a project for another day.

Change-Id: I11f640be769d16ccfd787ae2d7f3837fa03ad379
Reviewed-on: https://code.wireshark.org/review/10537
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-09-15 17:18:41 +00:00
Michael Mann c62dac1a77 Eliminate proto_tree_add_text from packet-mate.c
Change-Id: I3f4b3eb23b91b219df373b3012fbefa63abfa4d3
Reviewed-on: https://code.wireshark.org/review/5350
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-19 12:47:06 +00:00
Bill Meier 0111e46193 plugins: Add editor modelines; Adjust whitespace as needed.
Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088
Reviewed-on: https://code.wireshark.org/review/4488
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 01:42:32 +00:00
Michael Mann e6c87fe6b1 convert to proto_tree_add_subtree[_format] for plugin dissectors
Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97
Reviewed-on: https://code.wireshark.org/review/2974
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-10 01:51:21 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Anders Broman 451c30ef81 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54528
2014-01-01 12:17:57 +00:00
Bill Meier 48af69f95f From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10409

svn path=/trunk/; revision=48449
2013-03-21 03:07:23 +00:00
Anders Broman 1ae38887b6 From Evan Huus:
Grab-bag of unused variables.

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

svn path=/trunk/; revision=43616
2012-07-09 01:49:02 +00:00
Jakub Zawadzki b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
Jeff Morriss 4fdc3c3cc2 Create, and start using, file name preferences.
File name preferences are basically just string preferences except that the
GUI will present a "Browse" button that allows the user to go and find the
file s/he wants (rather than having to blindly type in the full path).

svn path=/trunk/; revision=43228
2012-06-13 01:13:12 +00:00
Guy Harris d6fdc37988 More fun with GArrays: cast away some warnings that don't report real
alignment problems and that wouldn't even happen if the "data" member of
a GArray were a "void *".

svn path=/trunk/; revision=36855
2011-04-25 21:19:54 +00:00
Alexis La Goutte 2fc740d7d1 Fix (latest) Dead Store (Dead nested assignment) Warning found by Clang
svn path=/trunk/; revision=36802
2011-04-22 13:11:52 +00:00
Bill Meier 6e079af172 Whitespace cleanup (remove trailing blanks from lines).
svn path=/trunk/; revision=35711
2011-01-30 22:57:00 +00:00
Bill Meier cc3a2c97a8 Use find_dissector() instead of create_dissector_handle();
Fix some indentation.

svn path=/trunk/; revision=29273
2009-08-03 16:18:06 +00:00
Guy Harris cf91fdf16b Have tap listeners specify whether the "packet" routine requires
a protocol tree;

	the column values.

This includes stats-tree listeners.

Have the routines to build the packet list, and to retap packets, honor
those requirements.  This means that cf_retap_packets() no longer needs
an argument to specify whether to construct the column values or not, so
get rid of that argument.

This also means that there's no need for a tap to have a fake filter
to ensure that the protocol tree will be built, so don't set up a fake
"frame" filter.

While we're at it, clean up some cases where "no filter" was represented
as a null string rather than a null pointer.

Have a routine to return an indication of the number of tap listeners
with filters; use that rather than the global num_tap_filters.

Clean up some indentation and some gboolean vs. gint items.

svn path=/trunk/; revision=28645
2009-06-05 22:42:47 +00:00
Anders Broman db57e7b724 Ethereal->Wireshark
svn path=/trunk/; revision=18231
2006-05-28 16:32:49 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Luis Ontanon 1ff8c4272f Add register_postdissector() to the API.
Dissectors registered with register_postdissector() will be called after all other dissectors have been called.

Use it to register mate.


svn path=/trunk/; revision=17089
2006-01-24 00:26:57 +00:00
Luis Ontanon 088ffa504e - add Debug and Default declarations.
- supress unwanted console printouts.


svn path=/trunk/; revision=16769
2005-12-12 23:23:32 +00:00
Jörg Mayer a0f94c125f Last set of trivial fixes for "no previous declaration" warnings.
svn path=/trunk/; revision=15191
2005-08-02 08:30:33 +00:00
Jörg Mayer 30a8557868 More 'char*' -> 'const char*' changes to fix warnings.
svn path=/trunk/; revision=15015
2005-07-23 11:41:25 +00:00
Luis Ontanon 86a30241db PDU, GOP and GOG should be at the same level not nested
svn path=/trunk/; revision=14415
2005-05-21 15:47:18 +00:00
Luis Ontanon 047baf2c38 MATE has a grammar.
Although not yet fully implemented I want this version as a reference. 


svn path=/trunk/; revision=14373
2005-05-16 13:28:35 +00:00
Luis Ontanon 96c41e1293 - fix a crash in new_avpl_strict_match when the operator avpl was empty
- change the name of the preference mate.config_filename: into mate.config:


svn path=/trunk/; revision=13488
2005-02-24 04:11:31 +00:00
Luis Ontanon 80ec76c622 Changed the GopTree in GogDef and GogExtra from a boolean to a string
GopTree={BasicTree|NoTree|FullTree}
    NoTree: just an item for each gop
    BasicTree: (default) some essential information regarding the gop
    FullTree: the Gop's full tree

added Id and eol-style to examples


svn path=/trunk/; revision=13435
2005-02-20 02:21:04 +00:00
Luis Ontanon 9151efab45 Get rid of some useless lines from the last patch
svn path=/trunk/; revision=13424
2005-02-18 20:11:30 +00:00
Luis Ontanon f7a7af313d Add a pointer to the start frame of each gop in the gog's tree
svn path=/trunk/; revision=13423
2005-02-18 20:02:40 +00:00
Luis Ontanon f152359ac3 avoid freeing the gop_key more than once and do not reregister the tap at every reload
svn path=/trunk/; revision=13382
2005-02-11 00:04:25 +00:00
Luis Ontanon 24b8161e82 mate runtime did not get initialized when configured after loading a capture file
svn path=/trunk/; revision=13381
2005-02-10 17:14:31 +00:00
Luis Ontanon f660b69b4f add "mate" as a protocol to its tree
svn path=/trunk/; revision=13380
2005-02-10 16:55:08 +00:00
Ulf Lamping b3b3f5cbcc use MATE (not mate) for protocol name and protocol tree
svn path=/trunk/; revision=13191
2005-01-28 23:24:04 +00:00
Lars Roland 4bf362f863 A new patch for mate from Luis Ontanon:
- move mate_packet into packet-mate.c and remove it frome mate.h
  - supressed some warnings

svn path=/trunk/; revision=13190
2005-01-28 13:53:14 +00:00
Jörg Mayer 491ceb3905 Some trivial warning fixes in mate
svn path=/trunk/; revision=13073
2005-01-16 15:45:21 +00:00
Lars Roland 2b88200a3a One more patch for mate:
- renamed analyze_frame() into mate_analyze_frame().
- prepare mate to be statically linked
- use report_open_failure() , report_read_failure() and
report_failure() in case there's an error while loading the config
- some cleanup in mate_util.c
- some fixes and cleanup in examples and matelib

svn path=/trunk/; revision=13001
2005-01-10 02:37:19 +00:00
Lars Roland 603c9edd83 From Luis Ontanon:
A new patch for mate

- changed the default config file name to "" 
- avoid trying to confgure mate when the config filename is ""
- add filename and line to config errors, that way one can actually
find errors in config files
- teady up the config error strings ( made them uniform )
- fixed a crash when missing index AVPs (Name,For,On etc) in config AVPLS
- make sure we do not delete the config AVPs and AVPLs to avoid
references to unsubscribed strings been left arround
- fixed the len on LoALs 
- changed the way loal_from_file reports an error.
- matelib/sip.mate was missing the Name in a PduDef  (from Julien Leproust)
- matelib/h225_ras had a wrong field name (from Julien Leproust)

At this point mate is silent when it's not expressely configured by the user.

From me:
reduce compiler noise on MSVC

svn path=/trunk/; revision=12985
2005-01-07 18:07:18 +00:00
Lars Roland ccf44f7fb1 From Luis Ontanon:
Fix some MSVC warnings in MATE

svn path=/trunk/; revision=12969
2005-01-06 23:21:10 +00:00
Lars Roland b7642931ad From Luis Ontanon:
Another patch for mate:
 - adds a "GopTree={TRUE|FALSE}" attribute to Gogs
 - changes "ShowPduTree={NoTree|PduTree|FrameTree}"
 - adds "implicit stop" to Gops with no Stop declared

svn path=/trunk/; revision=12968
2005-01-06 12:39:54 +00:00
Lars Roland 2ce1e037f6 From Luis Ontanon for Mate:
- moved gop and gog indexes into gopcfgs, which is a propedeutic
change for upcoming changes in the way gops are to be grouped
-  changed the way gog-keys are kept in memory
- every gopkey attribute is copied into the gop->extras to avoid
redundancy in the configuration
- added timers to gogs mate.gog_type.StartTime and mate.gog_type.Time
- fixed a bug in scs_subscribe that mangled some strings
- minor interface improvement to scs propedeutic to having types avp
values in a future
- changed medium and large into mate_medium and mate_large in the
scs_collection
- fixed Mode=Replace in Transforms, now it works
- fixed a crash at reinit due to impropper initialization of mate_items

svn path=/trunk/; revision=12902
2004-12-31 14:27:38 +00:00
Lars Roland 5474c91d65 Fixes for Mate from Luis Ontanon:
- fixes crash at reinit when DiscardPduData=TRUE: check if there's an
avpl before deleting it.
- mate.pdu_type.RelativeTime had a dual use, add
mate.pdu_type.TimeInGop and leave the other alone.
- other fixes related to times (they now seem to be right)
- scs_subscribe doesn't use g_malloc anymore. it uses GMemChunks
(I had to rename two GMemChunks to make MSVC happy)
- fixes crash at reinit when DiscardPduData=TRUE: check if there's an
avpl before deleting it.
- mate.pdu_type.RelativeTime had a dual use, add
mate.pdu_type.TimeInGop and leave the other alone.
- other fixes related to times (they now seem to be right)
- fixed few things at reinit:
     - reset last_id 
     - remove the nodes in the items hash tables 

svn path=/trunk/; revision=12820
2004-12-23 08:27:30 +00:00
Lars Roland af8041a316 Patch for Mate Plugin.
From Luis Ontanon:
- moves mate configuration from proto_register to proto_register_handoff
- add the config file protocol preference
- every item (gop,gog,pdu) has it's own ett
- the tap doesn't do nothing, it just primes the tree
- analyze_frame()  what once was the tap now is called by the dissector
- should work with tethereal now (to be tested)

svn path=/trunk/; revision=12763
2004-12-16 19:36:23 +00:00
Lars Roland 62506c09d6 Fixes for Mate Plugin:
As suggested by Martin Regner:
- Use strtod() instead of strtof()

From Luis Ontanon:
- changes the id of mate items to be integer (the old string ID
imposed a lenght limit and as mate fileds had become dynamic it makes
no more sense anymore)

- fixes a huge avp leak on reinit (every avp object was leaked when a
new file was loaded)

- adds the "Lib" AVP to the Action=Include AVPL to include definitions
>from matelib

- rename mate.[dll/so] to zzmate.[dll/so] so it gets initialized as
the very last protocol (so that fields from every dissector can be
used).

svn path=/trunk/; revision=12728
2004-12-12 16:58:59 +00:00
Lars Roland 86d7ed9bae New Plugin from Luis Ontanon:
MATE -- Meta Analysis and Tracing Engine

Won't be compiled by default.

It is still not possible to link the plugin on Win32.

svn path=/trunk/; revision=12716
2004-12-11 01:00:17 +00:00