From owner-p4-projects@FreeBSD.ORG  Wed Aug  8 10:48:53 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E88E516A420; Wed,  8 Aug 2007 10:48:52 +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 AFE3516A418
	for <perforce@FreeBSD.org>; Wed,  8 Aug 2007 10:48:52 +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 9B28D13C459
	for <perforce@FreeBSD.org>; Wed,  8 Aug 2007 10:48:52 +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 l78Amqvr031550
	for <perforce@FreeBSD.org>; Wed, 8 Aug 2007 10:48:52 GMT
	(envelope-from mharvan@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l78Amq8W031547
	for perforce@freebsd.org; Wed, 8 Aug 2007 10:48:52 GMT
	(envelope-from mharvan@FreeBSD.org)
Date: Wed, 8 Aug 2007 10:48:52 GMT
Message-Id: <200708081048.l78Amq8W031547@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 124890 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: Wed, 08 Aug 2007 10:48:53 -0000

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

Change 124890 by mharvan@mharvan_bike-planet on 2007/08/08 10:48:32

	TCP plugin should send the packet length and the packet itself in one go

Affected files ...

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

Differences ...

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

@@ -328,21 +328,30 @@
 int plugin_send(plugint *pl, char *data, int len, int data_type) {
     plugin_tcp_datat *datapl = (plugin_tcp_datat*) pl->data;
     int n = 0;
+    char *ldata;
 
     if (datapl->state != PLUGIN_STATE_CONNECTED) {
 	fprintf(stderr, "no client connected yet, discarding data\n");
 	return 0;
     } else {
+	ldata = malloc(len+sizeof(len));
+	if (ldata == NULL)
+	    return (SEND_ERROR_MALLOC);
+	memcpy(ldata, &len, sizeof(len));
+	memcpy(ldata + sizeof(len), data, len);
+	n = write(datapl->fd, ldata, sizeof(len) + len);
+	free(ldata);
+	
 	//n = write(datapl->fd, data, len);
-	// TODO: we should use on buffer only as the current
+	// TODO: we should use one buffer only as the current
 	//       approach generates two packets
-	n = send(datapl->fd, &len, sizeof(len), 0);
-	n = send(datapl->fd, data, len, 0);
+	//n = send(datapl->fd, &len, sizeof(len), 0);
+	//n = send(datapl->fd, data, len, 0);
 	//fprintf(stderr, "plugin_send: fd: %d\n", datapl->fd);
 	//fprintf(stderr, "plugin_send: write returned %d\n", n);
     }
     if (n < 0 || (len != 0 && n == 0) ) {
-	plugin_report(pl, REPORT_ERROR_RECEIVE);
+	plugin_report(pl, REPORT_ERROR_SEND);
     }
     //return n;
     return SEND_PKT_SENT;