X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fprotocol_misc.c;h=b2f6ddc5f3f0e3b8e4ea3cd41d09ec54b1f10ec8;hb=228e7a5c8f0e517dcede50f886965a44fca39853;hp=25a86abe4ec0d62bd6440468662a7faade82b619;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713;p=tinc

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 25a86abe..b2f6ddc5 100644
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -1,7 +1,7 @@
 /*
     protocol_misc.c -- handle the meta-protocol, miscellaneous functions
-    Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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: protocol_misc.c,v 1.1.4.12 2003/07/22 20:55:20 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -31,9 +31,11 @@
 #include "protocol.h"
 #include "utils.h"
 
+int maxoutbufsize = 0;
+
 /* Status and error notification routines */
 
-bool send_status(connection_t *c, int statusno, char *statusstring)
+bool send_status(connection_t *c, int statusno, const char *statusstring)
 {
 	cp();
 
@@ -62,7 +64,7 @@ bool status_h(connection_t *c)
 	return true;
 }
 
-bool send_error(connection_t *c, int err, char *errstring)
+bool send_error(connection_t *c, int err, const char *errstring)
 {
 	cp();
 
@@ -153,7 +155,10 @@ bool send_tcppacket(connection_t *c, vpn_packet_t *packet)
 {
 	cp();
 
-	/* Evil hack. */
+	/* If there already is a lot of data in the outbuf buffer, discard this packet. */
+
+	if(c->outbuflen > maxoutbufsize)
+		return true;
 
 	if(!send_request(c, "%d %hd", PACKET, packet->len))
 		return false;