/*
- * Copyright (C) 2013 Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
+ * Copyright (C) 2013-2014 Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
+ * Copyright (C) 2014 Alexandre Oliva <lxoliva@fsfla.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
uint64_t file_len;
char *hash;
char *header;
+ uint8_t ret;
+
+ size_t header_size, header_head, header_tail;
*msg = rnet_message_new();
if (*msg == NULL) {
exerc = rnet_decfile_get_header_field(decfile, "exerc");
uf = rnet_decfile_get_header_field(decfile, "uf");
versao_pgd = strtoul(rnet_decfile_get_header_field(decfile, "nr_versao"), NULL, 10);
+ ret = strtoul(rnet_decfile_get_header_field(decfile, "in_ret"), NULL, 10);
+
+ if (!strcmp(exerc, "2014")) {
+ header_size = RNET_HEADER_SIZE_2014;
+ header_head = RNET_HEADER_HEAD_2014;
+ header_tail = RNET_HEADER_TAIL_2014;
+ } else if (!strcmp(exerc, "2013")) {
+ header_size = RNET_HEADER_SIZE_2013;
+ header_head = RNET_HEADER_HEAD_2013;
+ header_tail = RNET_HEADER_TAIL_2013;
+ } else {
+ return -EINVAL;
+ }
+
+ /* This was already checked at parse time. */
+ if (strlen (header) != header_size)
+ abort ();
(*msg)->buffer[0] = 0x40;
(*msg)->len = 1;
r = rnet_message_add_ascii(msg, "tp_ni", "CPF");
r = rnet_message_add_u8(msg, "num_ass", 0);
r = rnet_message_add_u32(msg, "p_comp", 0);
- r = rnet_message_add_u8(msg, "ret", 0);
+ r = rnet_message_add_u8(msg, "ret", ret);
r = rnet_message_add_u64(msg, "tam_arq", file_len);
r = rnet_message_add_u64(msg, "tam_assinado", file_len);
r = rnet_message_add_u64(msg, "tam_trans", file_len);
r = rnet_message_add_u16(msg, "versao_pgd", versao_pgd);
r = rnet_message_add_u8(msg, "critica_validador", 0x06);
r = rnet_message_add_ascii(msg, "ip_loc", "127.0.0.1");
- r = rnet_message_add_ascii(msg, "versao_java", "1.7.0_03-icedtea;OpenJDK Runtime Environment");
+ r = rnet_message_add_ascii(msg, "versao_java", "1.5.0-gij;Free Software rnetclient pretending to be GNU Interpreter for Java");
r = rnet_message_add_ascii(msg, "origem", "JA2R");
r = rnet_message_add_ascii(msg, "so", "GNU");
- r = rnet_message_add_ascii(msg, "cliente", "201104");
- r = rnet_message_add_buffer(msg, "dados_val", header + 111, 750 - 111);
+ r = rnet_message_add_ascii(msg, "cliente", "201105");
+ r = rnet_message_add_buffer(msg, "dados_val",
+ header + header_head,
+ header_size - header_tail - header_head);
r = rnet_message_add_u32(msg, "tam_dados_val", 0);
r = rnet_message_add_u32(msg, "tam_dados_val_chave", 0);
r = rnet_message_add_u32(msg, "arquivos_restantes", 0);