various string related changes, mainly replace sprintf/snprintf by g_snprintf

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

diff --git a/packet-ripng.h b/packet-ripng.h
index 9c2ce4144eb43f5eb96c9da6f937cd105a594198..d141a98a3fb7ac2fcf2f70ffc34d51984e31ffe7 100644 (file)
--- a/packet-ripng.h
+++ b/packet-ripng.h
@@ -2,23 +2,23 @@
  * RIPng definition
  * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
  *
- * $Id: packet-ripng.h,v 1.2 2000/02/15 21:02:59 gram Exp $
+ * $Id: packet-ripng.h,v 1.6 2002/08/28 21:00:29 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -27,15 +27,8 @@
 #ifndef __PACKET_RIPNG_H_DEFINED__
 #define __PACKET_RIPNG_H_DEFINED__
 
-#ifndef __GLOBALS_H__
 #include "globals.h"
-#endif
-
-#ifndef __PACKET_IPV6_H_DEFINED__
 #include "packet-ipv6.h"
-#endif
-
-void dissect_ripng(const u_char *, int, frame_data *, proto_tree *);
 
 /*
  * KAME Header: /cvsroot/kame/kame/kame/kame/route6d/route6d.h,v 1.1.1.1 1999/08/08 23:31:35 itojun Exp
@@ -44,7 +37,7 @@ void dissect_ripng(const u_char *, int, frame_data *, proto_tree *);
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -56,7 +49,7 @@ void dissect_ripng(const u_char *, int, frame_data *, proto_tree *);
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -77,15 +70,15 @@ void dissect_ripng(const u_char *, int, frame_data *, proto_tree *);
 
 struct netinfo6 {
        struct  e_in6_addr      rip6_dest;
-       u_short rip6_tag;
-       u_char  rip6_plen;
-       u_char  rip6_metric;
+       gushort rip6_tag;
+       guchar  rip6_plen;
+       guchar  rip6_metric;
 };
 
 struct rip6 {
-       u_char  rip6_cmd;
-       u_char  rip6_vers;
-       u_char  rip6_res1[2];
+       guchar  rip6_cmd;
+       guchar  rip6_vers;
+       guchar  rip6_res1[2];
        union {
                struct  netinfo6        ru6_nets[1];
                char    ru6_tracefile[1];