X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=rnetclient.c;h=aa650557a14a973b18479c9781e730bebe49d5d3;hb=2861a00f694d7322e1b2fd60ead0db8c39699307;hp=df46b799264cd35c71c43edf8aee6756135c0f6a;hpb=39d6c9b0b131ccce6844fc898ec4fc2ad09a867b;p=cascardo%2Frnetclient.git diff --git a/rnetclient.c b/rnetclient.c index df46b79..aa65055 100644 --- a/rnetclient.c +++ b/rnetclient.c @@ -27,10 +27,85 @@ #include #include #include +#include +#include "config.h" #include "decfile.h" #include "rnet_message.h" #include "rnet_encode.h" +/* Program version and bug report address. */ + +const char *argp_program_version = PACKAGE_VERSION; +const char *argp_program_bug_address = PACKAGE_BUGREPORT; + +/* Documentation strings. */ + +static const char rnetclient_doc[] = + "Send the Brazilian Income Tax Report to the Brazilian " + "Tax Authority"; +static const char rnetclient_args_doc[] = + "[-d|--declaration] FILE"; + +/* Description and definition of each option accepted by the program. */ + +static const struct argp_option rnetclient_options_desc[] = { + { "declaration", 'd', "FILE", OPTION_ARG_OPTIONAL, + "The Income Tax Report file that will be sent.", + 0 }, + + { NULL }, +}; + +struct rnetclient_args { + /* File representing the declaration. */ + char *input_file; +}; + +/* Parser for command line arguments. */ + +static error_t rnetclient_parse_opt(int key, char *arg, struct argp_state *state) +{ + struct rnetclient_args *a = state->input; + switch (key) { + case 'd': + /* The user has explicitly provided a filename through + the '-d' switch. */ + a->input_file = arg; + break; + + case ARGP_KEY_ARG: + /* The user has possibly provided a filename without + using any switches (e.g., by running './rnetclient + file'). */ + a->input_file = arg; + break; + + case ARGP_KEY_END: + /* We have reached the end of the argument parsing. + Let's check if the user has provided a filename. */ + if (a->input_file == NULL) + argp_error(state, + "You need to provide the Income Tax Declaration " + "filename."); + } + + return 0; +} + +/* Control struct used by argp. */ + +static struct argp rnetclient_argp = { + rnetclient_options_desc, + rnetclient_parse_opt, + rnetclient_args_doc, + rnetclient_doc, + NULL, NULL, NULL +}; + +static size_t chars2len (unsigned char buf[2]) { + return (buf[0] << 8 | buf[1]); +} + static void * get_creds(char *certfile) { static gnutls_certificate_credentials_t cred; @@ -49,7 +124,7 @@ static void session_new(gnutls_session_t *session) gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE, cred); } -static int deflateRecord(char *buffer, size_t len, char **out, size_t *olen) +static int deflateRecord(char *buffer, size_t len, char **out, size_t *olen, int header) { z_stream zstrm; int r; @@ -74,13 +149,13 @@ static int deflateRecord(char *buffer, size_t len, char **out, size_t *olen) free(*out); return -1; } - *olen = zstrm.avail_out + 6; + *olen = zstrm.total_out + 6; (*out)[0] = 0x1; - (*out)[1] = (zstrm.avail_out >> 8); - (*out)[2] = (zstrm.avail_out & 0xff); + (*out)[1] = (zstrm.total_out >> 8); + (*out)[2] = (zstrm.total_out & 0xff); (*out)[3] = (len >> 8); (*out)[4] = (len & 0xff); - (*out)[5] = 0x1; + (*out)[5] = header ? 0x01 : 0x0; deflateEnd(&zstrm); return 0; } @@ -94,7 +169,7 @@ static int inflateRecord(char *buffer, size_t len, char **out, size_t *olen) zstrm.opaque = Z_NULL; if ((r = inflateInit(&zstrm)) != Z_OK) return -1; - *olen = (buffer[3] << 8 | buffer[4]); + *olen = chars2len(buffer+3); *out = malloc(*olen); if (!out) { inflateEnd(&zstrm); @@ -157,8 +232,12 @@ static int handshake(int c) char buffer[16]; int r; buffer[0] = 1; - write(c, buffer, 1); - write(c, "00000000000000", 14); + r = write(c, buffer, 1); + if (r < 1) + return -1; + r = write(c, "00000000000000", 14); + if (r < 14) + return -1; r = read(c, buffer, 1); if (r != 1 && buffer[0] != 'E') return -1; @@ -168,20 +247,53 @@ static int handshake(int c) return 0; } -static void usage(void) +static int rnet_send(gnutls_session_t session, char *buffer, size_t len, int header) { - fprintf(stderr, "rnetclient [filename]\n"); - exit(1); -} + int r = 0; + /* Large files have to be uploaded as multiple + separately-deflated chunks, because the compressed and + uncompressed lengths in each record are encoded in unsigned + 16-bit integers each. -static int rnet_send(gnutls_session_t session, char *buffer, size_t len) -{ - char *out; - size_t olen; - deflateRecord(buffer, len, &out, &olen); - gnutls_record_send(session, out, olen); - free(out); - return 0; + The header can't be split into multiple chunks, and it + should never have to, since it won't ever get even close to + 64KiB. + + The uploaded file may be larger: to upload such large + files, it suffices to send multiple records till the entire + file is transferred, without waiting for a response. Since + we've alread informed the server of the file size in the + header, it knows exactly how much data to expect before + sending a response. It will only send an error message + before that if it times us out. + + Odds are that any reasonably large size will do, but it + can't be too close to 64KiB, otherwise there won't be room + for the compressed length should it not compress well, + which should never happen for capital-ASCII-only + declaration files, but who knows? + + This chunk size worked at the first try, uploading a + ~100KiB file, so let's stick with it. */ + const int maxc = 64472; + if (header && len > maxc) + return -1; + + do { + char *out = NULL; + size_t olen; + size_t clen = len < maxc ? len : maxc; + r = deflateRecord(buffer, clen, &out, &olen, header); + if (!r) { + size_t n = gnutls_record_send(session, out, olen); + if (n != olen) + r = -1; + } + free(out); + buffer += clen; + len -= clen; + } while (len && !r); + return r; } static int rnet_recv(gnutls_session_t session, struct rnet_message **message) @@ -194,17 +306,26 @@ static int rnet_recv(gnutls_session_t session, struct rnet_message **message) rnet_message_expand(message, 6); buffer = (*message)->buffer; r = gnutls_record_recv(session, buffer, 6); - len = (buffer[1] << 8 | buffer[2]); - rnet_message_expand(message, len); - buffer = (*message)->buffer + 6; - r = gnutls_record_recv(session, buffer, len); - inflateRecord(buffer - 6, len + 6, &out, &olen); - rnet_message_del(*message); - *message = NULL; - rnet_message_expand(message, olen); - memcpy((*message)->buffer, out, olen); - (*message)->len = olen; - free(out); + if (buffer[0] == 0x01) { + len = chars2len(buffer+1); + rnet_message_expand(message, len); + buffer = (*message)->buffer + 6; + r = gnutls_record_recv(session, buffer, len); + inflateRecord(buffer - 6, len + 6, &out, &olen); + rnet_message_del(*message); + *message = NULL; + rnet_message_expand(message, olen); + memcpy((*message)->buffer, out, olen); + (*message)->len = olen; + free(out); + } else { + len = chars2len(buffer+1); + rnet_message_expand(message, len - 1); + buffer = (*message)->buffer + 6; + r = gnutls_record_recv(session, buffer, len - 1); + (*message)->len = len + 4; + rnet_message_strip(*message, 4); + } return 0; } @@ -247,7 +368,7 @@ out: umask(mask); } -static void handle_response_already_found(char *cpf, struct rnet_message *message) +static void handle_response_text_and_file(char *cpf, struct rnet_message *message) { char *value; int vlen; @@ -257,6 +378,11 @@ static void handle_response_already_found(char *cpf, struct rnet_message *messag save_rec_file(cpf, value, vlen); } +static void handle_response_already_found(char *cpf, struct rnet_message *message) +{ + handle_response_text_and_file(cpf, message); +} + static void handle_response_error(struct rnet_message *message) { char *value; @@ -272,17 +398,28 @@ int main(int argc, char **argv) int r; struct rnet_decfile *decfile; struct rnet_message *message = NULL; + struct rnetclient_args rnet_args; gnutls_session_t session; int finish = 0; char *cpf; - - if (argc < 2) { - usage(); - } + error_t err; + + /* Parsing the command line arguments. The argp_parse + function calls exit() if there is some error during the + parsing process (e.g., the user has provided an unknown + flag or the parsing function has called argp_error). + However, if our internal parsing function returns something + different than zero, then argp_parse returns this value to + us. This is a bug, and should not happen in the current + state. */ + memset(&rnet_args, 0, sizeof (rnet_args)); + err = argp_parse (&rnetclient_argp, argc, argv, 0, NULL, &rnet_args); + if (err != 0) + fprintf(stderr, "internal error while parsing command line arguments."); - decfile = rnet_decfile_open(argv[1]); + decfile = rnet_decfile_open(rnet_args.input_file); if (!decfile) { - fprintf(stderr, "could not parse %s: %s\n", argv[1], strerror(errno)); + fprintf(stderr, "could not parse file \"%s\": %s\n", rnet_args.input_file, strerror(errno)); exit(1); } @@ -297,7 +434,7 @@ int main(int argc, char **argv) r == EAI_SYSTEM ? strerror(errno) : gai_strerror(r)); exit(1); } - gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t) c); + gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t)(intptr_t) c); r = handshake(c); if (r < 0) { exit(1); @@ -307,7 +444,7 @@ int main(int argc, char **argv) gnutls_strerror(r)); rnet_encode(decfile, &message); - rnet_send(session, message->buffer, message->len); + rnet_send(session, message->buffer, message->len, 1); rnet_message_del(message); message = NULL; @@ -318,6 +455,7 @@ int main(int argc, char **argv) } switch (message->buffer[0]) { case 1: /* go ahead */ + handle_response_text_and_file(cpf, message); break; case 3: /* error */ handle_response_error(message); @@ -329,6 +467,7 @@ int main(int argc, char **argv) break; case 2: case 5: + handle_response_text_and_file(cpf, message); finish = 1; break; } @@ -338,7 +477,7 @@ int main(int argc, char **argv) goto out; message = rnet_decfile_get_file(decfile); - rnet_send(session, message->buffer, message->len); + rnet_send(session, message->buffer, message->len, 0); message = NULL; r = rnet_recv(session, &message); @@ -354,6 +493,7 @@ int main(int argc, char **argv) case 4: case 5: case 1: + handle_response_text_and_file(cpf, message); break; }