X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=0025dd83e01c23a88eaca1bd79173609c0bb3c3f;hp=7a68d9d2c072d18ec33c26be3c31eaca7ca445f8;hb=161f917dd03c174742fb8c6722f430a93b506cb1;hpb=5fc1ed17f41f0c535cf57a4b7e00cd6d45759503

diff --git a/src/meta.c b/src/meta.c
index 7a68d9d2..0025dd83 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: meta.c,v 1.1.2.28 2002/09/09 19:39:58 guus Exp $
+    $Id: meta.c,v 1.1.2.31 2002/09/10 09:40:25 guus Exp $
 */
 
 #include "config.h"
@@ -41,171 +41,158 @@
 
 int send_meta(connection_t *c, char *buffer, int length)
 {
-  char *bufp;
-  int outlen;
-  char outbuf[MAXBUFSIZE];
-  cp();
-  if(debug_lvl >= DEBUG_META)
-    syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
-           c->name, c->hostname);
-
-  if(c->status.encryptout)
-    {
-      EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length);
-      bufp = outbuf;
-      length = outlen;
-    }
-  else
-      bufp = buffer;
-
-  if(write(c->socket, bufp, length) < 0)
-    {
-      syslog(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name, c->hostname, strerror(errno));
-      return -1;
-    }
-  cp();
-  return 0;
+	char *bufp;
+	int outlen;
+	char outbuf[MAXBUFSIZE];
+
+	cp();
+
+	if(debug_lvl >= DEBUG_META)
+		syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
+			   c->name, c->hostname);
+
+	if(c->status.encryptout) {
+		EVP_EncryptUpdate(c->outctx, outbuf, &outlen, buffer, length);
+		bufp = outbuf;
+		length = outlen;
+	} else
+		bufp = buffer;
+
+	if(write(c->socket, bufp, length) < 0) {
+		syslog(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
+			   c->hostname, strerror(errno));
+		return -1;
+	}
+
+	return 0;
 }
 
 void broadcast_meta(connection_t *from, char *buffer, int length)
 {
-  avl_node_t *node;
-  connection_t *c;
-  cp();
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      c = (connection_t *)node->data;
-      if(c != from && c->status.active)
-        send_meta(c, buffer, length);
-    }
-  cp();
+	avl_node_t *node;
+	connection_t *c;
+
+	cp();
+
+	for(node = connection_tree->head; node; node = node->next) {
+		c = (connection_t *) node->data;
+
+		if(c != from && c->status.active)
+			send_meta(c, buffer, length);
+	}
 }
 
 int receive_meta(connection_t *c)
 {
-  int x, l = sizeof(x);
-  int oldlen, i;
-  int lenin, reqlen;
-  int decrypted = 0;
-  char inbuf[MAXBUFSIZE];
-  cp();
-  if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
-    {
-      syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%s %s (%s)"), __FILE__, __LINE__, c->socket, strerror(errno),
-             c->name, c->hostname);
-      return -1;
-    }
-  if(x)
-    {
-      syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
-             c->name, c->hostname, strerror(x));
-      return -1;
-    }
-
-  /* Strategy:
-     - Read as much as possible from the TCP socket in one go.
-     - Decrypt it.
-     - Check if a full request is in the input buffer.
-       - If yes, process request and remove it from the buffer,
-         then check again.
-       - If not, keep stuff in buffer and exit.
-   */
-
-  lenin = read(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen);
-
-  if(lenin<=0)
-    {
-      if(lenin==0)
-        {
-          if(debug_lvl >= DEBUG_CONNECTIONS)
-            syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
-                c->name, c->hostname);
-        }
-      else
-        if(errno==EINTR)
-          return 0;      
-        else
-          syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),
-                 c->name, c->hostname, strerror(errno));
-
-      return -1;
-    }
-
-  oldlen = c->buflen;
-  c->buflen += lenin;
-
-  while(lenin)
-    {
-      /* Decrypt */
-
-      if(c->status.decryptin && !decrypted)
-        {
-          EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
-          memcpy(c->buffer + oldlen, inbuf, lenin);
-          decrypted = 1;
-        }
-
-      /* Are we receiving a TCPpacket? */
-
-      if(c->tcplen)
-        {
-          if(c->tcplen <= c->buflen)
-            {
-              receive_tcppacket(c, c->buffer, c->tcplen);
-
-              c->buflen -= c->tcplen;
-              lenin -= c->tcplen;
-              memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
-              oldlen = 0;
-              c->tcplen = 0;
-              continue;
-            }
-          else
-            {
-              break;
-            }
-        }
-
-      /* Otherwise we are waiting for a request */
-
-      reqlen = 0;
-
-      for(i = oldlen; i < c->buflen; i++)
-        {
-          if(c->buffer[i] == '\n')
-            {
-              c->buffer[i] = '\0';  /* replace end-of-line by end-of-string so we can use sscanf */
-              reqlen = i + 1;
-              break;
-            }
-        }
-
-      if(reqlen)
-        {
-          c->reqlen = reqlen;
-          if(receive_request(c))
-            return -1;
-
-          c->buflen -= reqlen;
-          lenin -= reqlen;
-          memmove(c->buffer, c->buffer + reqlen, c->buflen);
-          oldlen = 0;
-          continue;
-        }
-      else
-        {
-          break;
-        }
-    }
-
-  if(c->buflen >= MAXBUFSIZE)
-    {
-      syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
-	     c->name, c->hostname);
-      return -1;
-    }
-
-  c->last_ping_time = now;
-  cp();
-  return 0;
+	int x;
+	socklen_t l = sizeof(x);
+	int oldlen, i;
+	int lenin, reqlen;
+	int decrypted = 0;
+	char inbuf[MAXBUFSIZE];
+
+	cp();
+
+	if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
+		syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%s %s (%s)"), __FILE__,
+			   __LINE__, c->socket, strerror(errno), c->name, c->hostname);
+		return -1;
+	}
+
+	if(x) {
+		syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
+			   c->name, c->hostname, strerror(x));
+		return -1;
+	}
+
+	/* Strategy:
+	   - Read as much as possible from the TCP socket in one go.
+	   - Decrypt it.
+	   - Check if a full request is in the input buffer.
+	   - If yes, process request and remove it from the buffer,
+	   then check again.
+	   - If not, keep stuff in buffer and exit.
+	 */
+
+	lenin = read(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen);
+
+	if(lenin <= 0) {
+		if(lenin == 0) {
+			if(debug_lvl >= DEBUG_CONNECTIONS)
+				syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
+					   c->name, c->hostname);
+		} else if(errno == EINTR)
+			return 0;
+		else
+			syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),
+				   c->name, c->hostname, strerror(errno));
+
+		return -1;
+	}
+
+	oldlen = c->buflen;
+	c->buflen += lenin;
+
+	while(lenin) {
+		/* Decrypt */
+
+		if(c->status.decryptin && !decrypted) {
+			EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
+			memcpy(c->buffer + oldlen, inbuf, lenin);
+			decrypted = 1;
+		}
+
+		/* Are we receiving a TCPpacket? */
+
+		if(c->tcplen) {
+			if(c->tcplen <= c->buflen) {
+				receive_tcppacket(c, c->buffer, c->tcplen);
+
+				c->buflen -= c->tcplen;
+				lenin -= c->tcplen;
+				memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
+				oldlen = 0;
+				c->tcplen = 0;
+				continue;
+			} else {
+				break;
+			}
+		}
+
+		/* Otherwise we are waiting for a request */
+
+		reqlen = 0;
+
+		for(i = oldlen; i < c->buflen; i++) {
+			if(c->buffer[i] == '\n') {
+				c->buffer[i] = '\0';	/* replace end-of-line by end-of-string so we can use sscanf */
+				reqlen = i + 1;
+				break;
+			}
+		}
+
+		if(reqlen) {
+			c->reqlen = reqlen;
+			if(receive_request(c))
+				return -1;
+
+			c->buflen -= reqlen;
+			lenin -= reqlen;
+			memmove(c->buffer, c->buffer + reqlen, c->buflen);
+			oldlen = 0;
+			continue;
+		} else {
+			break;
+		}
+	}
+
+	if(c->buflen >= MAXBUFSIZE) {
+		syslog(LOG_ERR, _("Metadata read buffer overflow for %s (%s)"),
+			   c->name, c->hostname);
+		return -1;
+	}
+
+	c->last_ping_time = now;
+
+	return 0;
 }