1 files changed, 65 insertions, 68 deletions

diff --git a/vchat-connection.c b/vchat-connection.c
index 5ab4dd4..01cf2c2 100644
--- a/vchat-connection.c
+++ b/vchat-connection.c
@@ -10,27 +10,27 @@
  * without even the implied warranty of merchantability or fitness for a
  * particular purpose. In no event shall the copyright holder be liable for
  * any direct, indirect, incidental or special damages arising in any way out
- * of the use of this software. 
+ * of the use of this software.
  *
  */
 
-#include <stdlib.h>
+#include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
 #include <stddef.h>
-#include <string.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <errno.h>
-#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 /* For tilde_expand */
 #include <readline/readline.h>
 
-#include "vchat.h"
 #include "vchat-connection.h"
 #include "vchat-tls.h"
+#include "vchat.h"
 
 static int serverfd = -1;
 unsigned int want_tcp_keepalive = 0;
@@ -40,49 +40,49 @@ unsigned int want_tcp_keepalive = 0;
 extern int status;
 
 /* Generic tcp connector, blocking */
-static int connect_tcp_socket( const char *server, const char *port ) {
+static int connect_tcp_socket(const char *server, const char *port) {
   struct addrinfo hints, *res, *res0;
   int s, error;
 
   memset(&hints, 0, sizeof(hints));
   hints.ai_family = PF_UNSPEC;
   hints.ai_socktype = SOCK_STREAM;
-  error = getaddrinfo( server, port, &hints, &res0 );
-  if (error) return -1;
+  error = getaddrinfo(server, port, &hints, &res0);
+  if (error)
+    return -1;
   s = -1;
   for (res = res0; res; res = res->ai_next) {
     s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
-    if (s < 0) continue;
+    if (s < 0)
+      continue;
     if (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
       close(s);
       s = -1;
       continue;
     }
-    break;  /* okay we got one */
+    break; /* okay we got one */
   }
   freeaddrinfo(res0);
 
   if (want_tcp_keepalive) {
-    int one=1;
-    setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,&one,sizeof(one));
+    int one = 1;
+    setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one));
   }
   return s;
 }
 
 /* Return a tilde expanded path in a malloced buffer or NULL */
 static char *get_tilde_expanded(confopt opt) {
-  char *str = getstroption (opt);
+  char *str = getstroption(opt);
   if (!str)
     return str;
   if (str[0] == '~')
-    return tilde_expand (str);
+    return tilde_expand(str);
   return strdup(str);
 }
 
 /* connects to server */
-int
-vc_connect (const char *server, const char *port)
-{
+int vc_connect(const char *server, const char *port) {
   /* vchat connection x509 store */
   vc_x509store_t vc_store;
 
@@ -90,11 +90,11 @@ vc_connect (const char *server, const char *port)
   char *certfile, *cafile;
 
   /* Connect to the server */
-  serverfd = connect_tcp_socket( server, port );
-  if( serverfd < 0 ) {
+  serverfd = connect_tcp_socket(server, port);
+  if (serverfd < 0) {
     /* inform user */
-    snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_CANTCONNECT), server, port );
-    writechan (tmpstr);
+    snprintf(tmpstr, TMPSTRSIZE, getformatstr(FS_CANTCONNECT), server, port);
+    writechan(tmpstr);
     return -1;
   }
 
@@ -105,11 +105,11 @@ vc_connect (const char *server, const char *port)
   vc_init_x509store(&vc_store);
 
   /* get name of certificate file */
-  certfile = get_tilde_expanded (CF_CERTFILE);
+  certfile = get_tilde_expanded(CF_CERTFILE);
   /* do we have a certificate file? */
   if (certfile) {
     /* get name of key file */
-    char *keyfile = get_tilde_expanded (CF_KEYFILE);
+    char *keyfile = get_tilde_expanded(CF_KEYFILE);
 
     vc_x509store_setcertfile(&vc_store, certfile);
     vc_x509store_set_pkeycb(&vc_store, (vc_askpass_cb_t)passprompt);
@@ -122,13 +122,13 @@ vc_connect (const char *server, const char *port)
   }
 
   /* get name of ca file */
-  cafile = get_tilde_expanded (CF_CAFILE);
+  cafile = get_tilde_expanded(CF_CAFILE);
   if (cafile && !access(cafile, F_OK))
     vc_x509store_setcafile(&vc_store, cafile);
   free(cafile);
 
   /* upgrade our plain BIO to ssl */
-  int result = vc_tls_connect( serverfd, &vc_store );
+  int result = vc_tls_connect(serverfd, &vc_store);
   vc_cleanup_x509store(&vc_store);
 
   if (result) {
@@ -136,17 +136,17 @@ vc_connect (const char *server, const char *port)
     serverfd = -1;
     errno = EIO;
     vc_tls_cleanup();
-    snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_CANTCONNECT), server, port );
-    writechan (tmpstr);
+    snprintf(tmpstr, TMPSTRSIZE, getformatstr(FS_CANTCONNECT), server, port);
+    writechan(tmpstr);
     return -1;
   }
 
   /* inform user */
-  snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_CONNECTED), server, port);
-  writechan (tmpstr);
+  snprintf(tmpstr, TMPSTRSIZE, getformatstr(FS_CONNECTED), server, port);
+  writechan(tmpstr);
 
 #ifdef DEBUG
-  dumpfile = fopen( "dumpfile", "a");
+  dumpfile = fopen("dumpfile", "a");
 #endif
 
   /* if we didn't fail until now, we've got a connection. */
@@ -154,25 +154,24 @@ vc_connect (const char *server, const char *port)
 }
 
 /* Poll for activity on the socket or stdin */
-int vc_poll (int timeout_seconds) {
+int vc_poll(int timeout_seconds) {
   fd_set readfds;
-  FD_ZERO (&readfds);
-  FD_SET (0, &readfds);
+  FD_ZERO(&readfds);
+  FD_SET(0, &readfds);
   if (serverfd != -1)
-    FD_SET (serverfd, &readfds);
-  struct timeval tv = { timeout_seconds, 0};
-  int result = select (serverfd + 2, &readfds, NULL, NULL, &tv);
+    FD_SET(serverfd, &readfds);
+  struct timeval tv = {timeout_seconds, 0};
+  int result = select(serverfd + 2, &readfds, NULL, NULL, &tv);
   if (result <= 0)
     return result;
-  result = FD_ISSET (0, &readfds) ? 1 : 0;
+  result = FD_ISSET(0, &readfds) ? 1 : 0;
   if (serverfd != -1)
-    result += FD_ISSET (serverfd, &readfds) ? 2 : 0;
+    result += FD_ISSET(serverfd, &readfds) ? 2 : 0;
   return result;
 }
 
 /* disconnect from server */
-void
-vc_disconnect () {
+void vc_disconnect() {
   if (serverfd > 0) {
     close(serverfd);
     serverfd = -1;
@@ -183,21 +182,19 @@ vc_disconnect () {
 
 #define STAGINGSIZE 16384
 static char _staging[STAGINGSIZE];
-void
-vc_sendmessage (const char *msg)
-{
+void vc_sendmessage(const char *msg) {
   size_t sent, len = snprintf(_staging, sizeof(_staging), "%s\r\n", msg);
 #ifdef DEBUG
   /* debugging? log network output! */
-  fprintf (dumpfile, ">| (%zd) %s\n", len - 2, msg);
+  fprintf(dumpfile, ">| (%zd) %s\n", len - 2, msg);
 #endif
 
   if (getintoption(CF_USESSL))
-    sent = vc_tls_sendmessage (_staging, len);
+    sent = vc_tls_sendmessage(_staging, len);
   else
-    sent = write (serverfd, _staging, len);
+    sent = write(serverfd, _staging, len);
   if (sent != len)
-    writecf (FS_ERR,"Message sending fuzzy.");
+    writecf(FS_ERR, "Message sending fuzzy.");
 }
 
 /* offset in buffer (for linebreaks at packet borders) */
@@ -206,9 +203,7 @@ static char _buf[BUFSIZE];
 static size_t _buf_fill;
 
 /* get data from servers connection */
-void
-vc_receive (void)
-{
+void vc_receive(void) {
   char *endmsg;
   size_t freebytes = BUFSIZE - _buf_fill;
   ssize_t bytes;
@@ -218,26 +213,27 @@ vc_receive (void)
   else
     bytes = vc_tls_receivemessage(_buf + _buf_fill, freebytes);
 
-  /* Our tls functions may require retries with handshakes etc, this is signalled by -2 */
+  /* Our tls functions may require retries with handshakes etc, this is
+   * signalled by -2 */
   if (bytes == -2)
     return;
 
   /* Error on the socket read? raise error message, bail out */
   if (bytes == -1) {
-      snprintf (tmpstr, TMPSTRSIZE, "Receive fails, %s.", strerror(errno));
-      snprintf (errstr, ERRSTRSIZE, "Receive fails, %s.\n", strerror(errno));
-      writecf (FS_ERR,tmpstr);
-      status = 0;
-      return;
+    snprintf(tmpstr, TMPSTRSIZE, "Receive fails, %s.", strerror(errno));
+    snprintf(errstr, ERRSTRSIZE, "Receive fails, %s.\n", strerror(errno));
+    writecf(FS_ERR, tmpstr);
+    status = 0;
+    return;
   }
 
   /* end of file from server? */
   if (bytes == 0) {
-      /* inform user, bail out */
-      writecf (FS_SERV, "* EOF from server.");
-      snprintf (errstr, ERRSTRSIZE, "* EOF from server.\n");
-      status = 0;
-      return;
+    /* inform user, bail out */
+    writecf(FS_SERV, "* EOF from server.");
+    snprintf(errstr, ERRSTRSIZE, "* EOF from server.\n");
+    status = 0;
+    return;
   }
 
   _buf_fill += bytes;
@@ -249,13 +245,14 @@ vc_receive (void)
       endmsg[0] = 0;
       if (endmsg[-1] == '\r')
         endmsg[-1] = 0;
-      /* If terminating and chomping left us with a message, give it to line handler */
+      /* If terminating and chomping left us with a message, give it to line
+       * handler */
       if (_buf[0]) {
 #ifdef DEBUG
         /* debugging? log network input! */
-        fprintf (stderr, "<| %s\n", _buf);
+        fprintf(stderr, "<| %s\n", _buf);
 #endif
-        protocol_parsemsg (_buf);
+        protocol_parsemsg(_buf);
       }
     }
     _buf_fill -= 1 + endmsg - _buf;