Add an additional "title" attribute for UAT fields; that's what's

[obnox/wireshark/wip.git] / epan / ipv4.c

diff --git a/epan/ipv4.c b/epan/ipv4.c
index 203c6d770b88a3658cf068827ce51109202315aa..5fe49a0e7e534c603eee3ea8352be8f5361b3771 100644 (file)
--- a/epan/ipv4.c
+++ b/epan/ipv4.c
@@ -3,25 +3,24 @@
  * IPv4 address class. They understand how to take netmasks into consideration
  * during equivalence testing.
  *
- * Gilbert Ramirez <gram@xiexie.org>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: ipv4.c,v 1.1 2000/09/28 03:52:12 gram Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -34,18 +33,9 @@
 #include <glib.h>
 #include <stdio.h>
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
 #include "ipv4.h"
 #include "packet.h" /* for ip_to_str */
 
-static guint32 create_nmask(gint net_bits);
 
 ipv4_addr*
 ipv4_addr_new(void)
@@ -72,20 +62,33 @@ ipv4_addr_set_host_order_addr(ipv4_addr *ipv4, guint32 new_addr)
 void
 ipv4_addr_set_net_order_addr(ipv4_addr *ipv4, guint32 new_addr)
 {
-       ipv4->addr = ntohl(new_addr);
+       ipv4->addr = g_ntohl(new_addr);
 }
 
 void
 ipv4_addr_set_netmask_bits(ipv4_addr *ipv4, guint new_nmask_bits)
 {
-/*     ipv4->nmask_bits = new_nmask_bits;*/
-       ipv4->nmask = create_nmask(new_nmask_bits);
+       static guint32 bitmasks[33] = {
+               0x00000000,
+               0x80000000, 0xc0000000, 0xe0000000, 0xf0000000,
+               0xf8000000, 0xfc000000, 0xfe000000, 0xff000000,
+               0xff800000, 0xffc00000, 0xffe00000, 0xfff00000,
+               0xfff80000, 0xfffc0000, 0xfffe0000, 0xffff0000,
+               0xffff8000, 0xffffc000, 0xffffe000, 0xfffff000,
+               0xfffff800, 0xfffffc00, 0xfffffe00, 0xffffff00,
+               0xffffff80, 0xffffffc0, 0xffffffe0, 0xfffffff0,
+               0xfffffff8, 0xfffffffc, 0xfffffffe, 0xffffffff,
+       };
+
+       g_assert(new_nmask_bits <= 32);
+
+       ipv4->nmask = bitmasks[new_nmask_bits];
 }
 
 guint32
 ipv4_get_net_order_addr(ipv4_addr *ipv4)
 {
-       return htonl(ipv4->addr);
+       return g_htonl(ipv4->addr);
 }
 
 guint32
@@ -94,31 +97,12 @@ ipv4_get_host_order_addr(ipv4_addr *ipv4)
        return ipv4->addr;
 }
 
-gchar*
-ipv4_addr_str(ipv4_addr *ipv4)
-{
-       guint32 ipv4_host_order = htonl(ipv4->addr);
-       return ip_to_str((gchar*)&ipv4_host_order);
-}
-
-static guint32
-create_nmask(gint net_bits)
+/* We're assuming the buffer is at least MAX_IP_STR_LEN (16 bytes) */
+void
+ipv4_addr_str_buf(const ipv4_addr *ipv4, gchar *buf)
 {
-       static guint32 bitmasks[33] = {
-               0x00000000,
-               0x80000000, 0xc0000000, 0xe0000000, 0xf0000000,
-               0xf8000000, 0xfc000000, 0xfe000000, 0xff000000,
-               0xff800000, 0xffc00000, 0xffe00000, 0xfff00000,
-               0xfff80000, 0xfffc0000, 0xfffe0000, 0xffff0000,
-               0xffff8000, 0xffffc000, 0xffffe000, 0xfffff000,
-               0xfffff800, 0xfffffc00, 0xfffffe00, 0xffffff00,
-               0xffffff80, 0xffffffc0, 0xffffffe0, 0xfffffff0,
-               0xfffffff8, 0xfffffffc, 0xfffffffe, 0xffffffff,
-       };
-
-       g_assert(net_bits <= 32);
-
-       return bitmasks[net_bits];
+       guint32 ipv4_host_order = g_htonl(ipv4->addr);
+       ip_to_str_buf((guint8*)&ipv4_host_order, buf, MAX_IP_STR_LEN);
 }