Handle uncompressed messages.

[cascardo/libreceita.git] / rnetclient.c

diff --git a/rnetclient.c b/rnetclient.c
index 8afec90..a9c75cd 100644 (file)
--- a/rnetclient.c
+++ b/rnetclient.c
@@ -74,10 +74,10 @@ 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;
@@ -194,17 +194,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 = (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);
+       } else {
+               len = (buffer[1] << 8 | buffer[2]);
+               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 +256,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 +266,20 @@ 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;
+       int vlen;
+       if (!rnet_message_parse(message, "texto", &value, &vlen))
+               fprintf(stderr, "%.*s\n", vlen, value);
+       fprintf(stderr, "Error transmiting DEC file.\n");
+}
+
 int main(int argc, char **argv)
 {
        int c;
@@ -309,8 +332,10 @@ 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);
                finish = 1;
                break;
        case 4:
@@ -319,6 +344,7 @@ int main(int argc, char **argv)
                break;
        case 2:
        case 5:
+               handle_response_text_and_file(cpf, message);
                finish = 1;
                break;
        }
@@ -338,13 +364,13 @@ int main(int argc, char **argv)
        }
        switch (message->buffer[0]) {
        case 3: /* error */
-               finish = 1;
+               handle_response_error(message);
                break;
        case 2:
        case 4:
        case 5:
        case 1:
-               finish = 1;
+               handle_response_text_and_file(cpf, message);
                break;
        }