diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-03 20:35:50 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-03 20:35:50 +0000 |
| commit | 01e08ae582b9e01bd5d236e748f43b4a2cedee43 (patch) | |
| tree | 144a4d538a1b9801393b3a6ed896e15be740dcd5 /wiretap/peekclassic.c | |
| parent | f98625c0d00ce32fb4cb8d7065a830f31f4bf269 (diff) | |
| download | wireshark-01e08ae582b9e01bd5d236e748f43b4a2cedee43.tar.gz | |
wiretap: start using <wsutil/pint.h>
svn path=/trunk/; revision=53764
Diffstat (limited to 'wiretap/peekclassic.c')
| -rw-r--r-- | wiretap/peekclassic.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c index f516775d47..6873953ec4 100644 --- a/wiretap/peekclassic.c +++ b/wiretap/peekclassic.c @@ -436,15 +436,15 @@ static int peekclassic_read_packet_v7(wtap *wth, FILE_T fh, /* Extract the fields from the packet */ #if 0 - protoNum = pntohs(&ep_pkt[PEEKCLASSIC_V7_PROTONUM_OFFSET]); + protoNum = pntoh16(&ep_pkt[PEEKCLASSIC_V7_PROTONUM_OFFSET]); #endif - length = pntohs(&ep_pkt[PEEKCLASSIC_V7_LENGTH_OFFSET]); - sliceLength = pntohs(&ep_pkt[PEEKCLASSIC_V7_SLICE_LENGTH_OFFSET]); + length = pntoh16(&ep_pkt[PEEKCLASSIC_V7_LENGTH_OFFSET]); + sliceLength = pntoh16(&ep_pkt[PEEKCLASSIC_V7_SLICE_LENGTH_OFFSET]); #if 0 flags = ep_pkt[PEEKCLASSIC_V7_FLAGS_OFFSET]; #endif status = ep_pkt[PEEKCLASSIC_V7_STATUS_OFFSET]; - timestamp = pntohll(&ep_pkt[PEEKCLASSIC_V7_TIMESTAMP_OFFSET]); + timestamp = pntoh64(&ep_pkt[PEEKCLASSIC_V7_TIMESTAMP_OFFSET]); /* force sliceLength to be the actual length of the packet */ if (0 == sliceLength) { @@ -558,18 +558,18 @@ static gboolean peekclassic_read_packet_v56(wtap *wth, FILE_T fh, err_info); /* Extract the fields from the packet */ - length = pntohs(&ep_pkt[PEEKCLASSIC_V56_LENGTH_OFFSET]); - sliceLength = pntohs(&ep_pkt[PEEKCLASSIC_V56_SLICE_LENGTH_OFFSET]); + length = pntoh16(&ep_pkt[PEEKCLASSIC_V56_LENGTH_OFFSET]); + sliceLength = pntoh16(&ep_pkt[PEEKCLASSIC_V56_SLICE_LENGTH_OFFSET]); #if 0 flags = ep_pkt[PEEKCLASSIC_V56_FLAGS_OFFSET]; status = ep_pkt[PEEKCLASSIC_V56_STATUS_OFFSET]; #endif - timestamp = pntohl(&ep_pkt[PEEKCLASSIC_V56_TIMESTAMP_OFFSET]); + timestamp = pntoh32(&ep_pkt[PEEKCLASSIC_V56_TIMESTAMP_OFFSET]); #if 0 - destNum = pntohs(&ep_pkt[PEEKCLASSIC_V56_DESTNUM_OFFSET]); - srcNum = pntohs(&ep_pkt[PEEKCLASSIC_V56_SRCNUM_OFFSET]); + destNum = pntoh16(&ep_pkt[PEEKCLASSIC_V56_DESTNUM_OFFSET]); + srcNum = pntoh16(&ep_pkt[PEEKCLASSIC_V56_SRCNUM_OFFSET]); #endif - protoNum = pntohs(&ep_pkt[PEEKCLASSIC_V56_PROTONUM_OFFSET]); + protoNum = pntoh16(&ep_pkt[PEEKCLASSIC_V56_PROTONUM_OFFSET]); #if 0 memcpy(protoStr, &ep_pkt[PEEKCLASSIC_V56_PROTOSTR_OFFSET], sizeof protoStr); |