X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=rnet_encode.c;h=fb869422046b461cc8450a8761341a821646d21d;hb=26951e1d5160db32441fe6fbac6fb05bb2666f8a;hp=dae61c621589baa0cde2115a1de74a07d76f9713;hpb=f2a268097531bee5f7ad9d737fda11c06162d9a5;p=cascardo%2Frnetclient.git

diff --git a/rnet_encode.c b/rnet_encode.c
index dae61c6..fb86942 100644
--- a/rnet_encode.c
+++ b/rnet_encode.c
@@ -1,5 +1,6 @@
 /*
- *  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
@@ -38,12 +39,24 @@ int rnet_encode(struct rnet_decfile *decfile, struct rnet_message **msg)
 	char *exerc;
 	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) {
 		return -ENOMEM;
 	}
 
+	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);
 	id_dec = strtoul(rnet_decfile_get_header_field(decfile, "hash"), NULL, 10);
@@ -52,6 +65,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;
@@ -60,24 +90,34 @@ 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);
 	r = rnet_message_add_ascii(msg, "uf", uf);
 	r = rnet_message_add_u8(msg, "vrs_des_pa", 0);
 	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;