X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flibreceita.git;a=blobdiff_plain;f=rnet_encode.c;h=f423be41fda025ec6af96034290aaa28c83f4086;hp=9800ec6740cc0bf8d5318c290f8d02f7c397ce7b;hb=6829681fd0c77efa1da391637cd4d53e93ed8d65;hpb=9cc129999c4236370e638dc9ef69c25f1793fd78

diff --git a/rnet_encode.c b/rnet_encode.c
index 9800ec6..f423be4 100644
--- a/rnet_encode.c
+++ b/rnet_encode.c
@@ -39,6 +39,11 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	char *uf;
 	uint16_t versao_pgd;
 	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) {
@@ -46,6 +51,10 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	}
 
 	file_len = rnet_decfile_get_file(decfile)->len;
+	hash = rnet_decfile_get_file_hash(decfile);
+	if (!hash)
+		return -1;
+	header = rnet_decfile_get_header(decfile);
 
 	codigo_recnet = rnet_decfile_get_header_field(decfile, "codigo_recnet");
 	tp_arq = strtoul(codigo_recnet, NULL, 10);
@@ -55,6 +64,23 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	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;
@@ -63,11 +89,13 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	r = rnet_message_add_u32(msg, "id_dec", id_dec);
 	r = rnet_message_add_ascii(msg, "exercicio", ano);
 	r = rnet_message_add_ascii(msg, "exercicio_pgd", exerc);
+	r = rnet_message_add_buffer(msg, "hash_arq", hash, 16);
+	r = rnet_message_add_buffer(msg, "hash_trans", hash, 16);
 	r = rnet_message_add_ascii(msg, "ni", cpf);
-	r = rnet_message_add_ascii(msg, "tipo_ni", "CPF");
+	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);
@@ -76,14 +104,19 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	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_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_u64(msg, "tam_dados_val_chave", 0);
+	r = rnet_message_add_u32(msg, "tam_dados_val_chave", 0);
 	r = rnet_message_add_u32(msg, "arquivos_restantes", 0);
 
+	free(hash);
+
 	if (r < 0)
 		return r;
 	return 0;