X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=submit%2Fconnect.c;h=a15f17f7b2bb8e6b329b07c5f9e33367e5c282db;hb=7946316d0ce9f19d3e8093b3904fa9aeba985b10;hp=d0c83ffe47dac808d3a1a2c17d6e10c1223acd7c;hpb=4d6c0022e700db3c7584ad5b58bbda69090ecf0d;p=moe.git

diff --git a/submit/connect.c b/submit/connect.c
index d0c83ff..a15f17f 100644
--- a/submit/connect.c
+++ b/submit/connect.c
@@ -4,7 +4,7 @@
  *  (c) 2007 Martin Mares <mj@ucw.cz>
  */
 
-#include "lib/lib.h"
+#include "ucw/lib.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -26,7 +26,7 @@ tls_init(void)
 {
   int err;
 
-  log(L_INFO, "Initializing TLS");
+  msg(L_INFO, "Initializing TLS");
   gnutls_global_init();
   err = gnutls_certificate_allocate_credentials(&cert_cred);
   TLS_CHECK(gnutls_certificate_allocate_credentials);
@@ -74,7 +74,7 @@ tls_verify_cert(gnutls_session_t s)
   /* XXX: Neither we check host name */
 
   /* Check certificate purpose */
-  byte purp[256];
+  char purp[256];
   int purpi = 0;
   do
     {
@@ -100,7 +100,7 @@ tls_log_params(gnutls_session_t s)
   const char *comp = gnutls_compression_get_name(gnutls_compression_get(s));
   const char *cipher = gnutls_cipher_get_name(gnutls_cipher_get(s));
   const char *mac = gnutls_mac_get_name(gnutls_mac_get(s));
-  log(L_DEBUG, "TLS params: proto=%s kx=%s cert=%s comp=%s cipher=%s mac=%s",
+  msg(L_DEBUG, "TLS params: proto=%s kx=%s cert=%s comp=%s cipher=%s mac=%s",
     proto, kx, cert, comp, cipher, mac);
 }
 
@@ -112,7 +112,7 @@ int main(int argc UNUSED, char **argv UNUSED)
   if (sk < 0)
     die("socket: %m");
 
-  log(L_INFO, "Connecting to port %d", port);
+  msg(L_INFO, "Connecting to port %d", port);
   struct sockaddr_in sa;
   bzero(&sa, sizeof(sa));
   sa.sin_family = AF_INET;
@@ -121,23 +121,23 @@ int main(int argc UNUSED, char **argv UNUSED)
   if (connect(sk, (struct sockaddr *) &sa, sizeof(sa)) < 0)
     die("Cannot connect: %m");
 
-  log(L_INFO, "Waiting for initial message");
-  byte msg[256];
+  msg(L_INFO, "Waiting for initial message");
+  char mesg[256];
   int i = 0;
   do
     {
-      if (i >= (int)sizeof(msg))
+      if (i >= (int)sizeof(mesg))
 	die("Response too long");
-      int c = read(sk, msg+i, sizeof(msg)-i);
+      int c = read(sk, mesg+i, sizeof(mesg)-i);
       if (c <= 0)
 	die("Connection broken");
       i += c;
     }
-  while (msg[i-1] != '\n');
-  msg[i-1] = 0;
-  if (msg[0] != '+')
-    die("%s", msg);
-  log(L_INFO, "%s", msg);
+  while (mesg[i-1] != '\n');
+  mesg[i-1] = 0;
+  if (mesg[0] != '+')
+    die("%s", mesg);
+  msg(L_INFO, "%s", mesg);
 
   gnutls_session_t s;
   gnutls_init(&s, GNUTLS_CLIENT);
@@ -145,31 +145,47 @@ int main(int argc UNUSED, char **argv UNUSED)
   gnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE, cert_cred);
   gnutls_transport_set_ptr(s, (gnutls_transport_ptr_t) sk);
 
-  log(L_INFO, "Handshaking");
+  msg(L_INFO, "Handshaking");
   int err = gnutls_handshake(s); TLS_CHECK(gnutls_handshake);
   tls_log_params(s);
   const char *cert_err = tls_verify_cert(s);
   if (cert_err)
     die("Certificate verification failed: %s", cert_err);
 
-  log(L_INFO, "Session established");
+  msg(L_INFO, "Session established");
   for (;;)
     {
-      byte buf[1024];
-      if (!fgets(buf, sizeof(buf), stdin))
-	break;
-      int len = strlen(buf);
-      err = gnutls_record_send(s, buf, len); TLS_CHECK(gnutls_record_send);
-      err = gnutls_record_recv(s, buf, len); TLS_CHECK(gnutls_record_recv);
-      if (!err)
+      char buf[1024];
+      do
 	{
-	  log(L_INFO, "Connection closed");
-	  break;
+	  if (!fgets(buf, sizeof(buf), stdin))
+	    goto done;
+	  int len = strlen(buf);
+	  err = gnutls_record_send(s, buf, len); TLS_CHECK(gnutls_record_send);
 	}
-      fwrite(buf, 1, err, stdout);
+      while (buf[0] != '\n');
+      int last = 0;
+      for (;;)
+	{
+	  err = gnutls_record_recv(s, buf, sizeof(buf)); TLS_CHECK(gnutls_record_recv);
+	  if (!err)
+	    {
+	      msg(L_INFO, "Connection closed");
+	      break;
+	    }
+	  fwrite(buf, 1, err, stdout);
+	  for (int i=0; i<err; i++)
+	    {
+	      if (buf[i] == '\n' && last == '\n')
+		goto next;
+	      last = buf[i];
+	    }
+	}
+next:
       fflush(stdout);
     }
 
+done:
   gnutls_bye(s, GNUTLS_SHUT_RDWR);
   close(sk);
   gnutls_deinit(s);