diff options
Diffstat (limited to 'wiretap/ipfix.c')
| -rw-r--r-- | wiretap/ipfix.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/wiretap/ipfix.c b/wiretap/ipfix.c index 7d63c26fa8..64740f4cd0 100644 --- a/wiretap/ipfix.c +++ b/wiretap/ipfix.c @@ -128,7 +128,7 @@ ipfix_read_message_header(ipfix_message_header_t *pfx_hdr, FILE_T fh, int *err, /* go back to before header */ if (file_seek(fh, 0 - IPFIX_MSG_HDR_SIZE, SEEK_CUR, err) == -1) { - ws_debug("ipfix_read: couldn't go back in file before header"); + ws_debug("couldn't go back in file before header"); return FALSE; } @@ -179,7 +179,7 @@ ipfix_open(wtap *wth, int *err, gchar **err_info) ipfix_message_header_t msg_hdr; ipfix_set_header_t set_hdr; - ws_debug("ipfix_open: opening file"); + ws_debug("opening file"); /* number of records to scan before deciding if this really is IPFIX */ if ((s = getenv("IPFIX_RECORDS_TO_CHECK")) != NULL) { @@ -196,7 +196,7 @@ ipfix_open(wtap *wth, int *err, gchar **err_info) for (i = 0; i < records_for_ipfix_check; i++) { /* read first message header to check version */ if (!ipfix_read_message_header(&msg_hdr, wth->fh, err, err_info)) { - ws_debug("ipfix_open: couldn't read message header #%d with err code #%d (%s)", + ws_debug("couldn't read message header #%d with err code #%d (%s)", i, *err, *err_info); if (*err == WTAP_ERR_BAD_FILE) { *err = 0; /* not actually an error in this case */ @@ -220,7 +220,7 @@ ipfix_open(wtap *wth, int *err, gchar **err_info) break; } if (file_seek(wth->fh, IPFIX_MSG_HDR_SIZE, SEEK_CUR, err) == -1) { - ws_debug("ipfix_open: failed seek to next message in file, %d bytes away", + ws_debug("failed seek to next message in file, %d bytes away", msg_hdr.message_length); return WTAP_OPEN_NOT_MINE; } @@ -232,7 +232,7 @@ ipfix_open(wtap *wth, int *err, gchar **err_info) err, err_info)) { if (*err == WTAP_ERR_SHORT_READ) { /* Not a valid IPFIX Set, so not an IPFIX file. */ - ws_debug("ipfix_open: error %d reading set", *err); + ws_debug("error %d reading set", *err); return WTAP_OPEN_NOT_MINE; } @@ -242,7 +242,7 @@ ipfix_open(wtap *wth, int *err, gchar **err_info) set_hdr.set_length = g_ntohs(set_hdr.set_length); if ((set_hdr.set_length < IPFIX_SET_HDR_SIZE) || ((set_hdr.set_length + checked_len) > msg_hdr.message_length)) { - ws_debug("ipfix_open: found invalid set_length of %d", + ws_debug("found invalid set_length of %d", set_hdr.set_length); return WTAP_OPEN_NOT_MINE; } @@ -250,7 +250,7 @@ ipfix_open(wtap *wth, int *err, gchar **err_info) if (file_seek(wth->fh, set_hdr.set_length - IPFIX_SET_HDR_SIZE, SEEK_CUR, err) == -1) { - ws_debug("ipfix_open: failed seek to next set in file, %d bytes away", + ws_debug("failed seek to next set in file, %d bytes away", set_hdr.set_length - IPFIX_SET_HDR_SIZE); return WTAP_OPEN_ERROR; } @@ -290,10 +290,10 @@ ipfix_read(wtap *wth, wtap_rec *rec, Buffer *buf, int *err, gchar **err_info, gint64 *data_offset) { *data_offset = file_tell(wth->fh); - ws_debug("ipfix_read: offset is initially %" G_GINT64_MODIFIER "d", *data_offset); + ws_debug("offset is initially %" G_GINT64_MODIFIER "d", *data_offset); if (!ipfix_read_message(wth->fh, rec, buf, err, err_info)) { - ws_debug("ipfix_read: couldn't read message header with code: %d\n, and error '%s'", + ws_debug("couldn't read message header with code: %d\n, and error '%s'", *err, *err_info); return FALSE; } @@ -309,15 +309,15 @@ ipfix_seek_read(wtap *wth, gint64 seek_off, wtap_rec *rec, { /* seek to the right file position */ if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1) { - ws_debug("ipfix_seek_read: couldn't read message header with code: %d\n, and error '%s'", + ws_debug("couldn't read message header with code: %d\n, and error '%s'", *err, *err_info); return FALSE; /* Seek error */ } - ws_debug("ipfix_seek_read: reading at offset %" G_GINT64_MODIFIER "u", seek_off); + ws_debug("reading at offset %" G_GINT64_MODIFIER "u", seek_off); if (!ipfix_read_message(wth->random_fh, rec, buf, err, err_info)) { - ws_debug("ipfix_seek_read: couldn't read message header"); + ws_debug("couldn't read message header"); if (*err == 0) *err = WTAP_ERR_SHORT_READ; return FALSE; |