diff options
| author | David Timber <mieabby@gmail.com> | 2021-07-19 12:30:35 +1000 |
|---|---|---|
| committer | David Timber <mieabby@gmail.com> | 2021-07-19 12:30:35 +1000 |
| commit | a9dfe7f6055de66742f389d13adbb71101f9c8c0 (patch) | |
| tree | 159e14cb760382e1904572ea6d88088e7bcd7b79 /src/proone-resolv.c | |
| parent | 5c70a63e02ae26bdfae14444d91f5f96bf74f505 (diff) | |
Fix resolv ...
* Fix mbedtls_ssl_read() is not called repeatedly until no data is
returned
* Impl exit code of proone-resolv
* Add test for resolv
Diffstat (limited to 'src/proone-resolv.c')
| -rw-r--r-- | src/proone-resolv.c | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/proone-resolv.c b/src/proone-resolv.c index d27df4f..94759b8 100644 --- a/src/proone-resolv.c +++ b/src/proone-resolv.c @@ -38,6 +38,11 @@ pth_cond_t prm_cond = PTH_COND_INIT; prne_pth_cv_t prm_cv = { &prm_lock, &prm_cond, false }; prne_resolv_t *resolv = NULL; +struct { + bool parse_err; + bool query_err; + bool proc; +} exec_result; static void proc_prompt_line (char *line, const size_t line_len) { static regmatch_t rm[3]; @@ -93,6 +98,7 @@ static void proc_prompt_line (char *line, const size_t line_len) { (prne_llist_element_t)prm) != NULL); } else { + exec_result.query_err = true; perror("* Queue failed"); prne_resolv_free_prm(prm); prne_free(prm); @@ -101,6 +107,7 @@ static void proc_prompt_line (char *line, const size_t line_len) { else if (line_len > 0 && regexec(&empty_line_regex, line, 0, NULL, 0) != 0) { + exec_result.parse_err = true; fprintf(stderr, "* Line not recognised.\n"); } } @@ -148,6 +155,7 @@ static void *stdin_wkr_entry (void *ctx) { else { line_buf_cnt = 0; if (!missed_line) { + exec_result.parse_err = true; fprintf(stderr, "* Line too long!\n"); } missed_line = true; @@ -194,8 +202,12 @@ static void *stdout_wkr_entry (void *ctx) { if (prm->fut->qr == PRNE_RESOLV_QR_OK || prm->fut->qr == PRNE_RESOLV_QR_STATUS) { + exec_result.proc = true; status_str = prne_resolv_rcode_tostr(prm->fut->status); } + else { + exec_result.query_err = true; + } if (status_str == NULL) { status_str = ""; } @@ -299,10 +311,10 @@ int main (void) { &prmpt_regex, "(A|AAAA|TXT)\\s+([a-z0-9\\-\\.]+)", REG_ICASE | REG_EXTENDED) == 0); - // org regex: ^\s+$ + // org regex: (^[#;].*)|(^(\s+)?$) prne_assert(regcomp( &empty_line_regex, - "^\\s+$", + "(^[#;].*)|(^(\\s+)?$)", REG_NOSUB | REG_EXTENDED) == 0); prne_mbedtls_entropy_init(&entropy); mbedtls_ctr_drbg_init(&rnd); @@ -363,5 +375,14 @@ int main (void) { } prne_free_llist(&prm_list); - return 0; + if (exec_result.proc) { + if (exec_result.parse_err || exec_result.query_err) { + return 3; + } + return 0; + } + if (exec_result.parse_err) { + return 2; + } + return 1; } |