Date: Sun, 19 Aug 2007 09:23:54 GMT From: Matus Harvan <mharvan@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 125337 for review Message-ID: <200708190923.l7J9Ns0K000318@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200708190923.l7J9Ns0K000318>