From owner-p4-projects@FreeBSD.ORG Sun Aug 19 09:23:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52EAB16A41B; Sun, 19 Aug 2007 09:23:55 +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 1629616A418 for ; Sun, 19 Aug 2007 09:23:55 +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 0497413C442 for ; Sun, 19 Aug 2007 09:23:55 +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 l7J9Nsnt000321 for ; Sun, 19 Aug 2007 09:23:54 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7J9Ns0K000318 for perforce@freebsd.org; Sun, 19 Aug 2007 09:23:54 GMT (envelope-from mharvan@FreeBSD.org) Date: Sun, 19 Aug 2007 09:23:54 GMT Message-Id: <200708190923.l7J9Ns0K000318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 125337 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Aug 2007 09:23:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=125337 Change 125337 by mharvan@mharvan_bike-planet on 2007/08/19 09:23:27 UDP catchall plugin Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#10 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/mtund.c#6 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#14 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_udp_catchall.c#1 add Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#10 (text+ko) ==== @@ -8,7 +8,7 @@ CFLAGS+=-g CFLAGS+=-I/usr/local/include -all: mtund plugin_tcp.so plugin_udp.so plugin_icmp.so +all: mtund plugin_tcp.so plugin_udp.so plugin_udp_catchall.so plugin_icmp.so mtund: mtund.h mtund.c tun_dev.c gcc $(CFLAGS) $(LIBS) -o mtund mtund.c tun_dev.c @@ -19,11 +19,14 @@ plugin_udp.so: mtund.h plugin.h plugin_udp.c gcc $(CFLAGS) -shared -o plugin_udp.so plugin_udp.c +plugin_udp_catchall.so: mtund.h plugin.h plugin_udp_catchall.c + gcc $(CFLAGS) -shared -o plugin_udp_catchall.so plugin_udp_catchall.c + plugin_icmp.so: mtund.h plugin.h plugin_icmp.c gcc $(CFLAGS) -shared -o plugin_icmp.so plugin_icmp.c clean: - rm -f mtund plugin_tcp.so plugin_udp.so plugin_icmp.so *.core + rm -f mtund *.so *.core backup: rsync -a `pwd` meat:backup/ ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/mtund.c#6 (text+ko) ==== @@ -1185,15 +1185,18 @@ signal(SIGINT, sigcb); signal(SIGTERM, sigcb); - /* load the plugins */ - pl = load_plugin("./plugin_udp.so"); - pl->name = "udp_53"; -/* pl = load_plugin("./plugin_udp.so"); */ -/* pl->name = "udp_catchall_1234"; */ - pl = load_plugin("./plugin_tcp.so"); - pl->name = "tcp_1234"; - pl = load_plugin("./plugin_icmp.so"); - pl->name = "icmp"; + /* load the plugins */ + if (server) { + pl = load_plugin("./plugin_udp_catchall.so"); + pl->name = "udp_catchall"; + } else { /* client */ + pl = load_plugin("./plugin_udp.so"); + pl->name = "udp_53"; + } +/* pl = load_plugin("./plugin_tcp.so"); */ +/* pl->name = "tcp_1234"; */ +/* pl = load_plugin("./plugin_icmp.so"); */ +/* pl->name = "icmp"; */ if (server) { /* initialize all plugins */ ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#14 (text+ko) ==== @@ -285,6 +285,7 @@ data->tmpconns[i].status = CONN_STATUS_FREE; data->tmpconns[i].fd = -1; data->tmpconns[i].data = data; + data->tmpconns[i].clid = 0; } data->conn = NULL; @@ -496,7 +497,7 @@ recv_error: /* connection broke down or client disconnected */ conn_discard(conn); - plugin_report(data->pl, clid, REPORT_ERROR_RECEIVE); + //plugin_report(data->pl, conn->clid, REPORT_ERROR_RECEIVE); } int