Send right part of the header for 2014.

[cascardo/libreceita.git] / rnetclient.c

diff --git a/rnetclient.c b/rnetclient.c
index a9c75cd..a58b62b 100644 (file)
--- a/rnetclient.c
+++ b/rnetclient.c
@@ -31,6 +31,10 @@
 #include "rnet_message.h"
 #include "rnet_encode.h"
 
+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 +53,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;
@@ -80,7 +84,7 @@ static int deflateRecord(char *buffer, size_t len, char **out, size_t *olen)
        (*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 +98,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);
@@ -174,11 +178,11 @@ static void usage(void)
        exit(1);
 }
 
-static int rnet_send(gnutls_session_t session, char *buffer, size_t len)
+static int rnet_send(gnutls_session_t session, char *buffer, size_t len, int header)
 {
        char *out;
        size_t olen;
-       deflateRecord(buffer, len, &out, &olen);
+       deflateRecord(buffer, len, &out, &olen, header);
        gnutls_record_send(session, out, olen);
        free(out);
        return 0;
@@ -195,7 +199,7 @@ static int rnet_recv(gnutls_session_t session, struct rnet_message **message)
        buffer = (*message)->buffer;
        r = gnutls_record_recv(session, buffer, 6);
        if (buffer[0] == 0x01) {
-               len = (buffer[1] << 8 | buffer[2]);
+               len = chars2len(buffer+1);
                rnet_message_expand(message, len);
                buffer = (*message)->buffer + 6;
                r = gnutls_record_recv(session, buffer, len);
@@ -207,7 +211,7 @@ static int rnet_recv(gnutls_session_t session, struct rnet_message **message)
                (*message)->len = olen;
                free(out);
        } else {
-               len = (buffer[1] << 8 | buffer[2]);
+               len = chars2len(buffer+1);
                rnet_message_expand(message, len - 1);
                buffer = (*message)->buffer + 6;
                r = gnutls_record_recv(session, buffer, len - 1);
@@ -311,7 +315,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);
@@ -321,7 +325,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;
@@ -354,7 +358,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);