diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-05-27 18:33:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-05-27 18:33:13 +0000 |
| commit | 01844e151ad3b5882ef36893aac6339d4ccfd0a7 (patch) | |
| tree | de9cddb64f954a8a5c63aa0fe2c5e32bfac6ed06 /plugins/m2m | |
| parent | d99b6c0a8b53bcfd1b857e259d4cb1632302e408 (diff) | |
Use tvb_reported_length() to get the amount of data we should look at;
the number of bytes in the packet or subset of the packet is the
reported length, tvb_length() just gives you the amount of that data
that was actually captured.
Include <glib.h>, not <gmodule.h>, even in plugins.
Fix the version numbers in the rc files.
svn path=/trunk/; revision=21960
Diffstat (limited to 'plugins/m2m')
| -rw-r--r-- | plugins/m2m/moduleinfo.nmake | 6 | ||||
| -rw-r--r-- | plugins/m2m/packet-m2m.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/m2m/moduleinfo.nmake b/plugins/m2m/moduleinfo.nmake index 5003cd4930..bafbb1588f 100644 --- a/plugins/m2m/moduleinfo.nmake +++ b/plugins/m2m/moduleinfo.nmake @@ -6,9 +6,9 @@ PACKAGE=m2m # The version -MODULE_VERSION_MAJOR=0 -MODULE_VERSION_MINOR=0 -MODULE_VERSION_MICRO=1 +MODULE_VERSION_MAJOR=1 +MODULE_VERSION_MINOR=1 +MODULE_VERSION_MICRO=0 MODULE_VERSION_EXTRA=0 # diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index a61f227024..df50b7c116 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -36,7 +36,7 @@ #include "moduleinfo.h" #include <string.h> -#include <gmodule.h> +#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/reassemble.h> @@ -439,8 +439,8 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* we are being asked for details */ m2m_item = proto_tree_add_item(tree, proto_m2m, tvb, 0, -1, FALSE); m2m_tree = proto_item_add_subtree(m2m_item, ett_m2m); - /* get the tvb length */ - length = tvb_length(tvb); + /* get the tvb reported length */ + length = tvb_reported_length(tvb); /* add the size info */ /* proto_item_append_text(m2m_item, " (%u bytes) - Packet Sequence Number,Number of TLVs", length); |