coydog/zmap-freebsd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working new interface

Browse Source
This commit is contained in:
Zakir Durumeric
2013-08-29 14:29:59 -04:00
parent 7674433142
commit 0c83eabfd1
8 changed files with 81 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/output_modules/module_csv.c
View File

@ -22,7 +22,7 @@
static FILE *file = NULL;
int csv_init(struct state_conf *conf, fielddefset_t *fds)
int csv_init(struct state_conf *conf, char **fields, int fieldlens)
{
assert(conf);
if (conf->output_filename) {
@ -34,15 +34,18 @@ int csv_init(struct state_conf *conf, fielddefset_t *fds)
conf->output_filename);
}
}
} else {
log_warn("csv", "no output file selected. "
"no results will be provided.");
}
if (fieldlens > 1 && file) {
for (int i=0; i < fieldlens; i++) {
if (i) {
fprintf(file, ", ");
}
fprintf(file, "%s", fields[i]);
}
}
//// add output headers
(void)fds;
//for (int i=0; i < fds->len; i++) {
// if (i) {
// fprintf(file, ", ");
// }
// fprintf(file, "%s", fds->fielddefs[i].name);
//}
return EXIT_SUCCESS;
}
@ -66,6 +69,9 @@ static void hex_encode(FILE *f, unsigned char* readbuf, size_t len)
int csv_process(fieldset_t *fs)
{
if (!file) {
return EXIT_SUCCESS;
}
for (int i=0; i < fs->len; i++) {
field_t *f = &(fs->fields[i]);
if (i) {

2
src/output_modules/output_modules.h
View File

@ -13,7 +13,7 @@
#include "../fieldset.h"
// called at scanner initialization
typedef int (*output_init_cb)(struct state_conf *, fielddefset_t *fds);
typedef int (*output_init_cb)(struct state_conf *, char **fields, int fieldslen);
// called on packet receipt
typedef int (*output_packet_cb)(fieldset_t *fs);