osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Joerg Mayer: 

Use the GLib macros to convert from network to host byte order.

svn path=/trunk/; revision=5879
This commit is contained in:
Guy Harris 2002-07-15 20:55:51 +00:00
parent 4c86bb6b38
commit 736c64296e
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packet-pflog.c
View File

@ -1,7 +1,7 @@
/* packet-pflog.c
* Routines for pflog (OpenBSD Firewall Logging) packet disassembly
*
* $Id: packet-pflog.c,v 1.4 2002/04/08 02:02:27 guy Exp $
* $Id: packet-pflog.c,v 1.5 2002/07/15 20:55:51 guy Exp $
*
* Copyright 2001 Mike Frantzen
* All rights reserved.
@ -77,7 +77,7 @@ capture_pflog(const u_char *pd, int offset, int len, packet_counts *ld)
/* Copy out the pflog header to insure alignment */
memcpy(&pflogh, pd, sizeof(pflogh));
NTOHL(pflogh.af);
pflogh.af = g_ntohl(pflogh.af);
switch (pflogh.af) {
@ -141,11 +141,11 @@ dissect_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb_memcpy(tvb, (guint8 *)&pflogh, 0, sizeof(pflogh));
/* Byteswap the header now */
NTOHL(pflogh.af);
NTOHS(pflogh.rnr);
NTOHS(pflogh.reason);
NTOHS(pflogh.action);
NTOHS(pflogh.dir);
pflogh.af = g_ntohl(pflogh.af);
pflogh.rnr = g_ntohs(pflogh.rnr);
pflogh.reason = g_ntohs(pflogh.reason);
pflogh.action = g_ntohs(pflogh.action);
pflogh.dir = g_ntohs(pflogh.dir);
if (tree) {
ti = proto_tree_add_protocol_format(tree, proto_pflog, tvb, 0,

16
packet-pflog.h
View File

@ -1,6 +1,6 @@
/* packet-pflog.h
*
* $Id: packet-pflog.h,v 1.3 2002/02/05 00:43:59 guy Exp $
* $Id: packet-pflog.h,v 1.4 2002/07/15 20:55:51 guy Exp $
*
* Copyright 2001 Mike Frantzen
* All rights reserved.
@ -51,20 +51,6 @@ struct pfloghdr {
#define PF_IN 0
#define PF_OUT 1
/* BSDisms */
#ifndef NTOHL
# define NTOHL(x) x = ntohl(x)
#endif
#ifndef NTOHS
# define NTOHS(x) x = ntohs(x)
#endif
#ifndef HTONL
# define HTONL(x) x = htonl(x)
#endif
#ifndef HTONS
# define HTONS(x) x = htons(x)
#endif
# define BSD_PF_INET 2
# define BSD_PF_INET6 24