From owner-p4-projects@FreeBSD.ORG  Mon Jul  9 23:56:45 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 D246716A421; Mon,  9 Jul 2007 23:56:44 +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 8718116A400
	for <perforce@FreeBSD.org>; Mon,  9 Jul 2007 23:56:44 +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 7865A13C469
	for <perforce@FreeBSD.org>; Mon,  9 Jul 2007 23:56:44 +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 l69Nuilj035836
	for <perforce@FreeBSD.org>; Mon, 9 Jul 2007 23:56:44 GMT
	(envelope-from mharvan@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l69Nui6D035833
	for perforce@freebsd.org; Mon, 9 Jul 2007 23:56:44 GMT
	(envelope-from mharvan@FreeBSD.org)
Date: Mon, 9 Jul 2007 23:56:44 GMT
Message-Id: <200707092356.l69Nui6D035833@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 123241 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: Mon, 09 Jul 2007 23:56:45 -0000

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

Change 123241 by mharvan@mharvan_twoflower on 2007/07/09 23:56:29

	initial version of the ICMP plugin

Affected files ...

.. //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#5 edit
.. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_icmp.c#1 add
.. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#6 edit

Differences ...

==== //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#5 (text+ko) ====

@@ -1,12 +1,13 @@
+LIBS+= -levent
+LIBS+=-L/usr/local/lib
 # Linux needs -ldl
-#LIBS+= -ldl
+#LIBS+= -ldl -levent
 
-LIBS=-L/usr/local/lib -levent
 CFLAGS=-Wall -rdynamic
 CFLAGS+=-g
 CFLAGS+=-I/usr/local/include
 
-all: tunneld plugin_tcp.so plugin_udp.so
+all: tunneld plugin_tcp.so plugin_udp.so plugin_icmp.so
 
 tunneld: tunneld.h tunneld.c tun_dev.c
 	gcc $(CFLAGS) $(LIBS) -o tunneld tunneld.c tun_dev.c
@@ -18,8 +19,11 @@
 plugin_udp.so: tunneld.h plugin.h plugin_udp.c
 	gcc $(CFLAGS) -shared  -o plugin_udp.so plugin_udp.c
 
+plugin_icmp.so: tunneld.h plugin.h plugin_icmp.c
+	gcc $(CFLAGS) -shared  -o plugin_icmp.so plugin_icmp.c
+
 clean:
-	rm -f tunneld plugin_tcp.so plugin_udp.so *.core
+	rm -f tunneld plugin_tcp.so plugin_udp.so plugin_icmp.so *.core
 
 backup:
 	rsync -a `pwd` meat:backup/

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

@@ -421,10 +421,10 @@
 	system("ifconfig tun0 mtu 1400 192.168.0.1 192.168.0.2");
     } else {
 	/* FeeBSD */
-	//system("ifconfig tun0 mtu 1400 192.168.0.2 192.168.0.1");
+	system("ifconfig tun0 mtu 1400 192.168.0.2 192.168.0.1");
 	/* Linux */
-	system("ifconfig tun0 mtu 1400 192.168.0.2");
-	system("route add 192.168.0.1 tun0");
+	//system("ifconfig tun0 mtu 1400 192.168.0.2");
+	//system("route add 192.168.0.1 tun0");
     }
 
     signal(SIGHUP, sigcb);
@@ -444,6 +444,8 @@
     plugins->name = "tcp_2222";
     load_plugin("./plugin_tcp.so");
     plugins->name = "tcp_3333";
+    load_plugin("./plugin_icmp.so");
+    plugins->name = "icmp";
 
     if (server) {
 	/* initialize all plugins */