need to fix this commit

diff --git a/rnetclient.c b/rnetclient.c
index 6c8c20b..681f6e3 100644 (file)
--- a/rnetclient.c
+++ b/rnetclient.c
@@ -80,12 +80,42 @@ static int deflateRecord(char *buffer, size_t len, char **out, size_t *olen)
        return 0;
 }
 
+static int inflateRecord(char *buffer, size_t len, char **out, size_t *olen)
+{
+       z_stream zstrm;
+       int r;
+       zstrm.zalloc = Z_NULL;
+       zstrm.zfree = Z_NULL;
+       zstrm.opaque = Z_NULL;
+       if ((r = inflateInit(&zstrm)) != Z_OK)
+               return -1;
+       *olen = (buffer[3] << 8 & buffer[4]);
+       *out = malloc(*olen);
+       if (!out) {
+               inflateEnd(&zstrm);
+               return -1;
+       }
+       zstrm.next_in = buffer + 6;
+       zstrm.avail_in = len - 6;
+       zstrm.next_out = *out;
+       zstrm.avail_out = *olen;
+       while ((r = inflate(&zstrm, Z_FINISH)) != Z_STREAM_END &&
+               zstrm.avail_out > 0);
+       if ((r = inflate(&zstrm, Z_FINISH)) != Z_STREAM_END) {
+               inflateEnd(&zstrm);
+               free(*out);
+               return -1;
+       }
+       inflateEnd(&zstrm);
+       return 0;
+}
+
 int main(int argc, char **argv)
 {
        struct sockaddr_in saddr;
        int c;
        int r;
-       char buffer[256];
+       char buffer[1024];
        char *out;
        size_t olen;
        gnutls_session_t session;
@@ -111,10 +141,10 @@ int main(int argc, char **argv)
                                gnutls_strerror(r));
        else
                fprintf(stderr, "handshake ok\n");
-       buffer[0] = 0x40;
-       deflateRecord(buffer, 1, &out, &olen);
-       gnutls_record_send(session, out, olen);
-       free(out);
+       r = read(0, buffer, sizeof(buffer));
+       //deflateRecord(buffer, r, &out, &olen);
+       gnutls_record_send(session, buffer, r);
+       //free(out);
        while ((r = gnutls_record_recv(session, buffer, sizeof(buffer))) > 0)
                write(1, buffer, r);
        close(c);

diff --git a/rnetserver.c b/rnetserver.c
index 5796ca6..8e21aae 100644 (file)
--- a/rnetserver.c
+++ b/rnetserver.c
@@ -49,6 +49,9 @@ static void session_new(gnutls_session_t *session)
 }
 #undef DH_BITS
 
+
+static char response[65536];
+
 int main(int argc, char **argv)
 {
        int s;
@@ -56,10 +59,14 @@ int main(int argc, char **argv)
        int c;
        int r;
        char buffer[256];
+       int resp_size;
+       int count = 0;
+       int val = 1;
        gnutls_session_t session;
        gnutls_global_init();
        session_new(&session);
        s = socket(PF_INET, SOCK_STREAM, 0);
+       setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
        saddr.sin_family = AF_INET;
        saddr.sin_port = htons(3456);
        saddr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -79,8 +86,14 @@ int main(int argc, char **argv)
                                gnutls_strerror(r));
        else
                fprintf(stderr, "handshake ok\n");
-       while ((r = gnutls_record_recv(session, buffer, sizeof(buffer))) > 0)
+       while ((r = gnutls_record_recv(session, buffer, sizeof(buffer))) > 0) {
                write(1, buffer, r);
+               count++;
+               if (count == 3) {
+                       resp_size = read(0, response, sizeof(response));
+                       gnutls_record_send(session, response, resp_size);
+               }
+       }
        close(c);
        gnutls_global_deinit();
        return 0;