Skip to content

Commit f92be23

Browse files
committed
iterators/parsers: change expected return codes (based on libfds update)
1 parent 7e740ce commit f92be23

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

extra_plugins/output/lnfstore/translator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ translator_translate(translator_t *trans, struct fds_drec *ipfix_rec, lnf_rec_t
513513
const size_t table_rec_size = sizeof(trans->table[0]);
514514
uint8_t * const buffer_ptr = trans->rec_buffer;
515515

516-
while (fds_drec_iter_next(&it) != FDS_ERR_NOTFOUND) {
516+
while (fds_drec_iter_next(&it) != FDS_EOC) {
517517
// Find a conversion function
518518
const struct fds_tfield *info = it.field.info;
519519

src/core/parser.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ parser_parse_tset(struct ipx_parser_data *pdata, struct fds_ipfix_set_hdr *tset)
790790
return rc_parse;
791791
}
792792

793-
if (rc_iter != FDS_ERR_NOTFOUND) {
793+
if (rc_iter != FDS_EOC) {
794794
const struct ipx_msg_ctx *msg_ctx = &pdata->ipfix_msg->ctx;
795795
PARSER_ERROR(pdata->parser, msg_ctx, "Failed to parse an IPFIX (Options) Template (%s).",
796796
fds_tset_iter_err(&it));
@@ -872,7 +872,7 @@ parser_parse_dset(struct ipx_parser_data *pdata, struct fds_ipfix_set_hdr *dset)
872872
pdata->data_recs++;
873873
}
874874

875-
if (rc == FDS_ERR_NOTFOUND) {
875+
if (rc == FDS_EOC) {
876876
return IPX_OK;
877877
}
878878

@@ -962,7 +962,7 @@ parser_parse_message(struct ipx_parser_data *pdata)
962962
return rc_parse;
963963
}
964964

965-
if (rc_iter != FDS_ERR_NOTFOUND) {
965+
if (rc_iter != FDS_EOC) {
966966
const struct ipx_msg_ctx *msg_ctx = &pdata->ipfix_msg->ctx;
967967
PARSER_ERROR(pdata->parser, msg_ctx, "Failed to parse an IPFIX Set (%s).",
968968
fds_sets_iter_err(&it));

src/plugins/intermediate/anonymization/anonymization.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ ipx_plugin_process(ipx_ctx_t *ctx, void *cfg, ipx_msg_t *msg)
160160
struct fds_drec_iter it;
161161
fds_drec_iter_init(&it, &rec->rec, 0);
162162

163-
while (fds_drec_iter_next(&it) != FDS_ERR_NOTFOUND) {
163+
while (fds_drec_iter_next(&it) != FDS_EOC) {
164164
const struct fds_tfield *info = it.field.info;
165165
if (info->def == NULL) {
166166
// Skip unknown fields

src/plugins/output/json/src/Storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ Storage::convert(struct fds_drec &rec)
708708
struct fds_drec_iter iter;
709709
fds_drec_iter_init(&iter, &rec, flags);
710710

711-
while (fds_drec_iter_next(&iter) != FDS_ERR_NOTFOUND) {
711+
while (fds_drec_iter_next(&iter) != FDS_EOC) {
712712
// Separate fields
713713
if (added != 0) {
714714
// Add comma

0 commit comments

Comments
 (0)