From owner-p4-projects@FreeBSD.ORG  Sun Jun 24 23:46:50 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AF08F16A46C; Sun, 24 Jun 2007 23:46:50 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6CE5E16A469
	for <perforce@FreeBSD.org>; Sun, 24 Jun 2007 23:46:50 +0000 (UTC)
	(envelope-from mharvan@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5DA2E13C465
	for <perforce@FreeBSD.org>; Sun, 24 Jun 2007 23:46:50 +0000 (UTC)
	(envelope-from mharvan@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5ONko6v011335
	for <perforce@FreeBSD.org>; Sun, 24 Jun 2007 23:46:50 GMT
	(envelope-from mharvan@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5ONkoll011332
	for perforce@freebsd.org; Sun, 24 Jun 2007 23:46:50 GMT
	(envelope-from mharvan@FreeBSD.org)
Date: Sun, 24 Jun 2007 23:46:50 GMT
Message-Id: <200706242346.l5ONkoll011332@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mharvan@FreeBSD.org using -f
From: Matus Harvan <mharvan@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 122249 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jun 2007 23:46:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=122249

Change 122249 by mharvan@mharvan_home on 2007/06/24 23:46:47

	server should not segfault when client disconnects

Affected files ...

.. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#4 edit
.. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#4 edit

Differences ...

==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#4 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 typedef struct {
-    int fd; /* udp socket to the other endpoint */
+    int fd; /* tcp socket to the other endpoint */
     int state; /* is a client connected? */
 } plugin_tcp_datat;
 
@@ -253,6 +253,7 @@
     if (! (data->state == PLUGIN_STATE_CONNECTED
 	   || data->state == PLUGIN_STATE_INITIALIZED)) {
 	report_plugin_error(pl, PLUGIN_ERROR_RECEIVE);
+	return;
     }
 
     //fprintf(stderr, "data on plugin fd\n");

==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#4 (text+ko) ====

@@ -80,7 +80,7 @@
 	    *q = p->next;
 
 	    //event_set(&nfdl->ev, fd, EV_READ, ev_callback, arg);
-	    event_set(&p->ev, fd, EV_READ, NULL, NULL);
+	    //event_set(&p->ev, fd, EV_READ, NULL, NULL);
 	    event_del(&p->ev);
 
 	    free(p);