From owner-p4-projects@FreeBSD.ORG Sun Jun 24 22:15:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4617516A46C; Sun, 24 Jun 2007 22:15:58 +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 F3D8416A421 for ; Sun, 24 Jun 2007 22:15:57 +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 E450413C46C for ; Sun, 24 Jun 2007 22:15:57 +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 l5OMFvJu003431 for ; Sun, 24 Jun 2007 22:15:57 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5OMFvcJ003428 for perforce@freebsd.org; Sun, 24 Jun 2007 22:15:57 GMT (envelope-from mharvan@FreeBSD.org) Date: Sun, 24 Jun 2007 22:15:57 GMT Message-Id: <200706242215.l5OMFvcJ003428@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 122248 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, 24 Jun 2007 22:15:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=122248 Change 122248 by mharvan@mharvan_home on 2007/06/24 22:15:37 bugfix for the server - correctly update current_pl s/AF_UNSPEC/AF_INET/g Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#3 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#3 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_udp.c#3 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#3 edit Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#3 (text+ko) ==== @@ -19,7 +19,7 @@ gcc $(CFLAGS) -shared -o plugin_udp.so plugin_udp.c clean: - rm -f tunneld plugin_tcp.so plugin_udp.so + rm -f tunneld plugin_tcp.so plugin_udp.so *.core backup: rsync -a `pwd` meat:backup/ ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#3 (text+ko) ==== @@ -44,7 +44,8 @@ memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_PASSIVE; - hints.ai_family = AF_UNSPEC; + //hints.ai_family = AF_UNSPEC; + hints.ai_family = AF_INET; hints.ai_socktype = SOCK_STREAM; n = getaddrinfo(NULL, port, &hints, &ai_list); @@ -131,7 +132,8 @@ struct timeval tv; memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; + //hints.ai_family = AF_UNSPEC; + hints.ai_family = AF_INET; hints.ai_socktype = SOCK_STREAM; n = getaddrinfo(host, port, &hints, &ai_list); ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_udp.c#3 (text+ko) ==== @@ -35,7 +35,8 @@ int n, fd = 0; memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; + //hints.ai_family = AF_UNSPEC; + hints.ai_family = AF_INET; hints.ai_socktype = SOCK_DGRAM; n = getaddrinfo(host, port, &hints, &ai_list); @@ -82,7 +83,8 @@ memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_PASSIVE; - hints.ai_family = AF_UNSPEC; + //hints.ai_family = AF_UNSPEC; + hints.ai_family = AF_INET; hints.ai_socktype = SOCK_DGRAM; n = getaddrinfo(NULL, port, &hints, &ai_list); ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#3 (text+ko) ==== @@ -192,6 +192,9 @@ */ void process_data_from_plugin(plugint *pl, char *data, int len) { + if (len > 0) { + current_pl = pl; + } tun_send(data, len); } @@ -205,13 +208,13 @@ if (current_pl == NULL) { fprintf(stderr, "no plugin connected yet, discarding tun data\n"); report_plugin_error(NULL, PLUGIN_ERROR_BOOTSTRAP); - } + } else { + n = current_pl->send(current_pl, data, len); - n = current_pl->send(current_pl, data, len); - - if (n < len) { - fprintf(stderr, "process_data_from_tun: plugind sent less " - "bytes (%d) than requested (%d)\n", n, len); + if (n < len) { + fprintf(stderr, "process_data_from_tun: plugind sent less " + "bytes (%d) than requested (%d)\n", n, len); + } } }