From owner-p4-projects@FreeBSD.ORG  Fri Aug 10 14:57: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 7B3CD16A41B; Fri, 10 Aug 2007 14:57:37 +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 169A216A419
	for <perforce@FreeBSD.org>; Fri, 10 Aug 2007 14:57:37 +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 058FE13C481
	for <perforce@FreeBSD.org>; Fri, 10 Aug 2007 14:57:37 +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 l7AEvac0038124
	for <perforce@FreeBSD.org>; Fri, 10 Aug 2007 14:57:36 GMT
	(envelope-from mharvan@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7AEvakQ038121
	for perforce@freebsd.org; Fri, 10 Aug 2007 14:57:36 GMT
	(envelope-from mharvan@FreeBSD.org)
Date: Fri, 10 Aug 2007 14:57:36 GMT
Message-Id: <200708101457.l7AEvakQ038121@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 125015 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: Fri, 10 Aug 2007 14:57:38 -0000

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

Change 125015 by mharvan@mharvan_bike-planet on 2007/08/10 14:57:03

	test program for UDP_CATCHALL was broken
	Well, it is still not fully funtional, but at least less broken.

Affected files ...

.. //depot/projects/soc2007/mharvan-mtund/sys.patches/catchall_tcp_udp/test_catchall/README#1 add
.. //depot/projects/soc2007/mharvan-mtund/sys.patches/catchall_tcp_udp/test_catchall/ucatchalld.c#2 edit

Differences ...

==== //depot/projects/soc2007/mharvan-mtund/sys.patches/catchall_tcp_udp/test_catchall/ucatchalld.c#2 (text+ko) ====

@@ -279,9 +279,14 @@
 {
     int fd;
     char *msg = "Welcome to catchalld\r\n";
-    int n, nwrite;
+    int n, nwrite, nread;
     int soval = 1;
     int count = 5;
+    char buf[1234];
+    struct sockaddr_storage from;
+    socklen_t fromlen = sizeof(from);
+    char host[NI_MAXHOST];
+    char serv[NI_MAXSERV];
     
     fd = udp_open("1234");
 
@@ -289,11 +294,33 @@
 	err(EX_UNAVAILABLE, "setsockopt(UDP_CATCHALL) failed");
     
     while (count > 0) {
+	nread = recvfrom(fd, buf, sizeof(buf), 0,
+			 (struct sockaddr *) &from, &fromlen);
+	if (nread < 0) {
+	    warn("recvfrom() returned %d", nread);
+	    continue;
+	}
+
+	if (getnameinfo((struct sockaddr *) &from, fromlen,
+			host, sizeof(host), serv, sizeof(serv),
+			NI_NUMERICHOST | NI_DGRAM) ) {
+	    fprintf(stderr, "getnameinfo failed: %s\n",
+		    gai_strerror(errno));
+	} else {
+	    fprintf(stderr, "received traffic from client %s:%s\n",
+		    host, serv);
+	}
+	
 	fprintf(stderr, "traffic on UDP socket \n");
 	n = 0;
 	nwrite = 0;
 	do {
-	    nwrite = send(fd, msg + n, strlen(msg) - n, 0);
+	    nwrite = sendto(fd, msg + n, strlen(msg) - n, 0,
+			    (struct sockaddr *) &from, fromlen);
+	    if (nwrite < 0)
+		warn("sendto() returned %d", nwrite);
+	    else if (nwrite == 0)
+		warnx("sendto() returned %d", nwrite);
 	    n += nwrite;
 	} while (n < strlen(msg) && nwrite > 0);
 	count--;