From owner-p4-projects@FreeBSD.ORG  Sat Jun  9 07:46:21 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 08ABE16A468; Sat,  9 Jun 2007 07:46:21 +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 B1F9216A421
	for <perforce@freebsd.org>; Sat,  9 Jun 2007 07:46:20 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D3AD13C44B
	for <perforce@freebsd.org>; Sat,  9 Jun 2007 07:46:20 +0000 (UTC)
	(envelope-from andrew@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 l597kK7p014318
	for <perforce@freebsd.org>; Sat, 9 Jun 2007 07:46:20 GMT
	(envelope-from andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l597kKv2014292
	for perforce@freebsd.org; Sat, 9 Jun 2007 07:46:20 GMT
	(envelope-from andrew@freebsd.org)
Date: Sat, 9 Jun 2007 07:46:20 GMT
Message-Id: <200706090746.l597kKv2014292@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andrew@freebsd.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 121251 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, 09 Jun 2007 07:46:21 -0000

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

Change 121251 by andrew@andrew_hermies on 2007/06/09 07:45:46

	- Listen for a close of element signal from libbsdxml
	- Send a server close message when the connection is being closed by the client
	- Comment out the returning the send data element

Affected files ...

.. //depot/projects/soc2007/andrew-update/lib/facund_server.c#3 edit

Differences ...

==== //depot/projects/soc2007/andrew-update/lib/facund_server.c#3 (text+ko) ====

@@ -35,6 +35,7 @@
 #define BUF_SIZE	128
 
 static void facund_server_start_tag(void *, const XML_Char *, const XML_Char**);
+static void facund_server_end_tag(void *, const XML_Char *);
 
 /*
  * Waits for a client to connect and send the start message
@@ -54,6 +55,7 @@
 
 	XML_SetUserData(conn->parser, conn);
 	XML_SetStartElementHandler(conn->parser, facund_server_start_tag);
+	XML_SetEndElementHandler(conn->parser, facund_server_end_tag);
 
 	str = "<facund-server version=\"0\">";
 	facund_send(conn, str, strlen(str));
@@ -106,11 +108,29 @@
     const XML_Char **attrs __unused)
 {
 	struct facund_conn *conn;
+	//char str[1024];
+
+	printf("> %s\n", name);
+	conn = data;
+
+	//snprintf(str, 1024, "<data val=\"%s\"/>", name);
+	//facund_send(conn, str, strlen(str));
+}
+
+static void
+facund_server_end_tag(void *data, const XML_Char *name)
+{
+	struct facund_conn *conn;
 	char str[1024];
 
-	printf("> %s\n", name);
+	printf("< %s\n", name);
 	conn = data;
 
-	snprintf(str, 1024, "<data val=\"%s\"/>", name);
-	facund_send(conn, str, strlen(str));
+	if (strcmp(name, "facund-client") == 0) {
+		snprintf(str, 1024, "</facund-server>");
+		facund_send(conn, str, strlen(str));
+	} else {
+		snprintf(str, 1024, "<data val=\"%s\"/>", name);
+		facund_send(conn, str, strlen(str));
+	}
 }