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/ngsniffer.c | |
parent | f98625c0d00ce32fb4cb8d7065a830f31f4bf269 (diff) | |
download | wireshark-01e08ae582b9e01bd5d236e748f43b4a2cedee43.tar.gz |
wiretap: start using <wsutil/pint.h>
svn path=/trunk/; revision=53764
Diffstat (limited to 'wiretap/ngsniffer.c')
-rw-r--r-- | wiretap/ngsniffer.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 8c649e8f0d..af055a3cdb 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -618,7 +618,7 @@ ngsniffer_open(wtap *wth, int *err, gchar **err_info) return -1; } - type = pletohs(record_type); + type = pletoh16(record_type); if (type != REC_VERS) { *err = WTAP_ERR_BAD_FILE; @@ -676,7 +676,7 @@ ngsniffer_open(wtap *wth, int *err, gchar **err_info) * for BRI ISDN files, and 0 for non-ISDN files; is that something * the DOS Sniffer understands? */ - maj_vers = pletohs(&version.maj_vers); + maj_vers = pletoh16(&version.maj_vers); if (process_header_records(wth, err, err_info, maj_vers, version.network) < 0) return -1; @@ -694,7 +694,7 @@ ngsniffer_open(wtap *wth, int *err, gchar **err_info) * ... and this is a version 1 capture; look * at the first "rsvd" word. */ - switch (pletohs(&version.rsvd[0])) { + switch (pletoh16(&version.rsvd[0])) { case 1: case 2: @@ -736,7 +736,7 @@ ngsniffer_open(wtap *wth, int *err, gchar **err_info) ngsniffer = (ngsniffer_t *)g_malloc(sizeof(ngsniffer_t)); wth->priv = (void *)ngsniffer; ngsniffer->maj_vers = maj_vers; - ngsniffer->min_vers = pletohs(&version.min_vers); + ngsniffer->min_vers = pletoh16(&version.min_vers); /* We haven't allocated any uncompression buffers yet. */ ngsniffer->seq.buf = NULL; @@ -763,13 +763,13 @@ ngsniffer_open(wtap *wth, int *err, gchar **err_info) ngsniffer->network = version.network; /* Get capture start time */ - start_date = pletohs(&version.date); + start_date = pletoh16(&version.date); tm.tm_year = ((start_date&DOS_YEAR_MASK)>>DOS_YEAR_SHIFT) + DOS_YEAR_OFFSET; tm.tm_mon = ((start_date&DOS_MONTH_MASK)>>DOS_MONTH_SHIFT) + DOS_MONTH_OFFSET; tm.tm_mday = ((start_date&DOS_DAY_MASK)>>DOS_DAY_SHIFT); #if 0 /* The time does not appear to act as an offset; only the date */ - start_time = pletohs(&version.time); + start_time = pletoh16(&version.time); tm.tm_hour = (start_time&0xf800)>>11; tm.tm_min = (start_time&0x7e0)>>5; tm.tm_sec = (start_time&0x1f)<<1; @@ -826,7 +826,7 @@ process_header_records(wtap *wth, int *err, gchar **err_info, gint16 maj_vers, return 0; /* EOF */ } - type = pletohs(record_type); + type = pletoh16(record_type); if ((type != REC_HEADER1) && (type != REC_HEADER2) && (type != REC_HEADER3) && (type != REC_HEADER4) && (type != REC_HEADER5) && (type != REC_HEADER6) @@ -853,7 +853,7 @@ process_header_records(wtap *wth, int *err, gchar **err_info, gint16 maj_vers, return -1; } - length = pletohs(record_length); + length = pletoh16(record_length); /* * Is this is an "Internetwork analyzer" capture, and @@ -1109,12 +1109,12 @@ ngsniffer_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) /* Read error */ return FALSE; } - time_low = pletohs(&frame2.time_low); - time_med = pletohs(&frame2.time_med); + time_low = pletoh16(&frame2.time_low); + time_med = pletoh16(&frame2.time_med); time_high = frame2.time_high; time_day = frame2.time_day; - size = pletohs(&frame2.size); - true_size = pletohs(&frame2.true_size); + size = pletoh16(&frame2.size); + true_size = pletoh16(&frame2.true_size); length -= sizeof frame2; /* we already read that much */ @@ -1139,12 +1139,12 @@ ngsniffer_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) /* Read error */ return FALSE; } - time_low = pletohs(&frame4.time_low); - time_med = pletohs(&frame4.time_med); + time_low = pletoh16(&frame4.time_low); + time_med = pletoh16(&frame4.time_med); time_high = frame4.time_high; time_day = frame4.time_day; - size = pletohs(&frame4.size); - true_size = pletohs(&frame4.true_size); + size = pletoh16(&frame4.size); + true_size = pletoh16(&frame4.true_size); /* * XXX - it looks as if some version 4 captures have @@ -1170,12 +1170,12 @@ ngsniffer_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) /* Read error */ return FALSE; } - time_low = pletohs(&frame6.time_low); - time_med = pletohs(&frame6.time_med); + time_low = pletoh16(&frame6.time_low); + time_med = pletoh16(&frame6.time_med); time_high = frame6.time_high; time_day = frame6.time_day; - size = pletohs(&frame6.size); - true_size = pletohs(&frame6.true_size); + size = pletoh16(&frame6.size); + true_size = pletoh16(&frame6.true_size); length -= sizeof frame6; /* we already read that much */ @@ -1377,8 +1377,8 @@ ngsniffer_read_rec_header(wtap *wth, gboolean is_random, guint16 *typep, return -1; } - *typep = pletohs(record_type); - *lengthp = pletohs(record_length); + *typep = pletoh16(record_type); + *lengthp = pletoh16(record_length); return 1; /* success */ } @@ -1521,14 +1521,14 @@ set_pseudo_header_frame4(union wtap_pseudo_header *pseudo_header, * Map flags from frame4.atm_info.StatusWord. */ pseudo_header->atm.flags = 0; - StatusWord = pletohl(&frame4->atm_info.StatusWord); + StatusWord = pletoh32(&frame4->atm_info.StatusWord); if (StatusWord & SW_RAW_CELL) pseudo_header->atm.flags |= ATM_RAW_CELL; aal_type = frame4->atm_info.AppTrafType & ATT_AALTYPE; hl_type = frame4->atm_info.AppTrafType & ATT_HLTYPE; - vpi = pletohs(&frame4->atm_info.Vpi); - vci = pletohs(&frame4->atm_info.Vci); + vpi = pletoh16(&frame4->atm_info.Vpi); + vci = pletoh16(&frame4->atm_info.Vci); switch (aal_type) { @@ -1756,11 +1756,11 @@ set_pseudo_header_frame4(union wtap_pseudo_header *pseudo_header, } pseudo_header->atm.vpi = vpi; pseudo_header->atm.vci = vci; - pseudo_header->atm.channel = pletohs(&frame4->atm_info.channel); - pseudo_header->atm.cells = pletohs(&frame4->atm_info.cells); - pseudo_header->atm.aal5t_u2u = pletohs(&frame4->atm_info.Trailer.aal5t_u2u); - pseudo_header->atm.aal5t_len = pletohs(&frame4->atm_info.Trailer.aal5t_len); - pseudo_header->atm.aal5t_chksum = pntohl(&frame4->atm_info.Trailer.aal5t_chksum); + pseudo_header->atm.channel = pletoh16(&frame4->atm_info.channel); + pseudo_header->atm.cells = pletoh16(&frame4->atm_info.cells); + pseudo_header->atm.aal5t_u2u = pletoh16(&frame4->atm_info.Trailer.aal5t_u2u); + pseudo_header->atm.aal5t_len = pletoh16(&frame4->atm_info.Trailer.aal5t_len); + pseudo_header->atm.aal5t_chksum = pntoh32(&frame4->atm_info.Trailer.aal5t_chksum); } static gboolean @@ -2296,7 +2296,7 @@ SnifferDecompress(unsigned char *inbuf, size_t inlen, unsigned char *outbuf, if ( 0 == bit_mask ) { bit_mask = 0x8000; /* start with the high bit */ - bit_value = pletohs(pin); /* get the next 16 bits */ + bit_value = pletoh16(pin); /* get the next 16 bits */ pin += 2; /* skip over what we just grabbed */ if ( pin >= pin_end ) { @@ -2602,7 +2602,7 @@ read_blob(FILE_T infile, ngsniffer_comp_stream_t *comp_stream, int *err, return -1; } comp_stream->comp_offset += 2; - blob_len_host = pletohs(&blob_len); + blob_len_host = pletoh16(&blob_len); /* Compressed or uncompressed? */ if (blob_len_host < 0) { |