aboutsummaryrefslogtreecommitdiffstats
path: root/epan/crc10-tvb.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-08-08 11:08:35 -0700
committerGuy Harris <guy@alum.mit.edu>2014-08-08 18:09:02 +0000
commit6f104a0ffbfe2f01bb2b002aea91ea336daf8bf6 (patch)
tree9753037cdcff766f412af2800f4ad3ed4c7b5db1 /epan/crc10-tvb.c
parent9b9005eb94d9c89a02d93e8dda0c19b8e2d1a6d7 (diff)
Clean up the CRC-10 code.
Have the wsutil routine just accumulate the stuff from the buffer handed to us. Have the IUUP dissector deal with the extra stuff. Add a update_crc10_by_bytes_tvb() routine, which is passed a tvbuff, offset, and length, and use that rather than using tvb_get_ptr() in dissectors. Change-Id: Iadd0823c764080e60d1339abb94d2e19150eabfe Reviewed-on: https://code.wireshark.org/review/3509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/crc10-tvb.c')
-rw-r--r--epan/crc10-tvb.c40
1 files changed, 40 insertions, 0 deletions
diff --git a/epan/crc10-tvb.c b/epan/crc10-tvb.c
new file mode 100644
index 0000000000..072feb8e64
--- /dev/null
+++ b/epan/crc10-tvb.c
@@ -0,0 +1,40 @@
+/* crc10-tvb.c
+ * CRC-10 tvb routines
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <epan/tvbuff.h>
+#include <wsutil/crc10.h>
+#include <epan/crc10-tvb.h>
+
+/* update the data block's CRC-10 remainder one byte at a time */
+guint16
+update_crc10_by_bytes_tvb(guint16 crc10, tvbuff_t *tvb, int offset, int len)
+{
+ const guint8 *buf;
+
+ tvb_ensure_bytes_exist(tvb, offset, len); /* len == -1 not allowed */
+ buf = tvb_get_ptr(tvb, offset, len);
+
+ return update_crc10_by_bytes(crc10, buf, len);
+}