Remove a bunch of duplicate semicolons.

[obnox/wireshark/wip.git] / packet-ripng.c

diff --git a/packet-ripng.c b/packet-ripng.c
index 0baba5b6c4fff56fc299c73f6321484798228c00..581503394239560335dcf409d8e35e809ed98301 100644 (file)
--- a/packet-ripng.c
+++ b/packet-ripng.c
@@ -3,40 +3,32 @@
  * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
  * derived from packet-rip.c
  *
- * $Id: packet-ripng.c,v 1.23 2001/12/10 00:25:33 guy Exp $
+ * $Id: packet-ripng.c,v 1.27 2002/08/28 21:00:29 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
- 
-#include "config.h"
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
 #include "packet-ripng.h"
 
 #ifndef offsetof
@@ -58,14 +50,14 @@ static const value_string cmdvals[] = {
     { 0, NULL },
 };
 
-static void 
+static void
 dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     int offset = 0;
     struct rip6 rip6;
     struct netinfo6 ni6;
     proto_tree *ripng_tree = NULL;
     proto_tree *subtree = NULL;
-    proto_item *ti; 
+    proto_item *ti;
 
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
         col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIPng");
@@ -74,16 +66,15 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
     /* avoid alignment problem */
     tvb_memcpy(tvb, (guint8 *)&rip6, offset, sizeof(rip6));
-  
+
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
         col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "RIPng version %u", rip6.rip6_vers);
     if (check_col(pinfo->cinfo, COL_INFO))
        col_add_str(pinfo->cinfo, COL_INFO,
-           val_to_str(rip6.rip6_cmd, cmdvals, "Unknown command (%u)")); 
+           val_to_str(rip6.rip6_cmd, cmdvals, "Unknown command (%u)"));
 
     if (tree) {
-       ti = proto_tree_add_item(tree, proto_ripng, tvb, offset,
-           tvb_length_remaining(tvb, offset), FALSE);
+       ti = proto_tree_add_item(tree, proto_ripng, tvb, offset, -1, FALSE);
        ripng_tree = proto_item_add_subtree(ti, ett_ripng);
 
        proto_tree_add_uint(ripng_tree, hf_ripng_cmd, tvb, offset, 1,
@@ -100,7 +91,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
                                        ip6_to_str(&ni6.rip6_dest),
                                        ni6.rip6_plen,
                                        ni6.rip6_metric,
-                                       ntohs(ni6.rip6_tag));
+                                       g_ntohs(ni6.rip6_tag));
                    } else {
                        ti = proto_tree_add_text(ripng_tree, tvb, offset,
                                        sizeof(ni6), "IP Address: %s/%u, Metric: %u",
@@ -116,7 +107,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
                    proto_tree_add_text(subtree, tvb,
                                offset + offsetof(struct netinfo6, rip6_tag),
                                sizeof(ni6.rip6_tag), "Tag: 0x%04x",
-                               ntohs(ni6.rip6_tag));
+                               g_ntohs(ni6.rip6_tag));
                    proto_tree_add_text(subtree, tvb,
                                offset + offsetof(struct netinfo6, rip6_plen),
                                sizeof(ni6.rip6_plen), "Prefix length: %u",