From owner-p4-projects@FreeBSD.ORG  Sat Aug 25 13:55:37 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E9CC816A420; Sat, 25 Aug 2007 13:55:36 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BCDF616A417
	for <perforce@FreeBSD.org>; Sat, 25 Aug 2007 13:55:36 +0000 (UTC)
	(envelope-from mharvan@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A56C513C457
	for <perforce@FreeBSD.org>; Sat, 25 Aug 2007 13:55:36 +0000 (UTC)
	(envelope-from mharvan@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7PDtaqu061377
	for <perforce@FreeBSD.org>; Sat, 25 Aug 2007 13:55:36 GMT
	(envelope-from mharvan@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7PDta8u061374
	for perforce@freebsd.org; Sat, 25 Aug 2007 13:55:36 GMT
	(envelope-from mharvan@FreeBSD.org)
Date: Sat, 25 Aug 2007 13:55:36 GMT
Message-Id: <200708251355.l7PDta8u061374@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 125664 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: Sat, 25 Aug 2007 13:55:37 -0000

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

Change 125664 by mharvan@mharvan_bike-planet on 2007/08/25 13:55:31

	UDP plugin: plugin_send() cleanup

Affected files ...

.. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_udp.c#14 edit

Differences ...

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

@@ -303,32 +303,22 @@
 	struct plugin_udp_data *datapl = (struct plugin_udp_data*) pl->data;
 	int nwrite = 0;
 	struct conn *conn = &(datapl->conns[clid]);
-	*consumed = 0;
 
 	if (server) {
 		nwrite = sendto(datapl->fd, data, len, 0,
 			     (struct sockaddr*)&conn->addr,
 			     conn->addrlen);
-		if (nwrite == len) {
-			*consumed = nwrite;
-			return (SEND_PKT_SENT);
-		} else {
-			warn("plugin_send: send returned %d", nwrite);
-			return (SEND_ERROR);
-		}
 	} else { /* client */
-		if (datapl->state != PLUGIN_STATE_CONNECTED) {
-			debug("not connected yet, discarding data\n");
-			return (SEND_ERROR);
-		}
 		nwrite = send(datapl->fd, data, len, 0);
-		if (nwrite == len) {
-			*consumed = nwrite;
-			return (SEND_PKT_SENT);
-		} else {
-			warn("plugin_send: send returned %d", nwrite);
-			return (SEND_ERROR);
-		}
+	}
+	
+	if (nwrite == len) {
+		*consumed = nwrite;
+		return (SEND_PKT_SENT);
+	} else {
+		*consumed = 0;
+		warn("plugin_send: send returned %d", nwrite);
+		return (SEND_ERROR);
 	}
 }