head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.166 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.164 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.162 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.160 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.158 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.156 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.154 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.152 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.150 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.148 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.146 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.144 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.142 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.140 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.138 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.136 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.134 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.132 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.130 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.128 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.126 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.124 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.122 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.118 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.98 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.120 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.116 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.114 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.112 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.110 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.108 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.106 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.104 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.102 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.100 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.96 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.94 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.92 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.90 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.88 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.86 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.84 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.82 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.80 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.78 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.76 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.74 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.72 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.70 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.68 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.66 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.64 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.62 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.60 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.58 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.56 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.54 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.52 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.50 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.46 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.44 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.42 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.40 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.38 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.36 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.34 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.32 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.30 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.28 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.26 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.24 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.22 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.20 pkgsrc-2008Q1:1.3.0.18 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.16 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.14 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.12 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.10 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.8 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2006.03.14.13.53.57; author rillig; state Exp; branches; next 1.2; 1.2 date 2000.04.10.01.24.39; author jtk; state Exp; branches; next 1.1; 1.1 date 2000.04.10.01.14.02; author jtk; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.04.10.01.14.02; author jtk; state Exp; branches; next ; desc @@ 1.3 log @Updated pptp to 1.7.0. Release 1.7.0: (27th July 2005) - silently discard packets not for the call [Cameron/Jenkins] - adopt sigpipe for use with SIGALRM on control connection [Wolter/Cameron] - fixes known valgrind heap violations in 1.6.0 [Cameron/Thorne] - properly report control connection echo reply loss [Wolter] Release 1.6.0: (18th February 2005) - fix double-free on stop control connection reply [Kivity] - add --idle-wait option [Cameron] - fix segfault on fatal connection error [Kivity] - prevent a possible signal race [Kivity] - prevent kill of init [Shurdeek] - portability fix for non-Linux systems [Quinot] - rename package from pptp-linux to pptp [Cameron] Release 1.5.0: (22nd June 2004) - fix statistics when buffering disabled [Wilson] - do not inherit the GRE socket [Cameron] - fix a case of non-shutdown of call manager [Klazes] - add --nobuffer option to eliminate all buffering of packets [Wilson] - fix corruption of command line as shown by ps [Howarth] - fix CPU loop after pppd killed [Cameron] - fix compile for ARM architecture [Hopf] - add documentation for command-line options [Wilson] - do not hang when a connection is refused [McCurdy] - better describe a cause of EMSGSIZE [Cameron] Release 1.4.0: (2nd January 2004) - support options before hostname [Wilson] - defer OCRQ until after SCCRP [Cameron] - include uninstall target [Pieter] - only issue a warning if sync mode is different to pppd [Klazes] - reformat and tidy code [Klazes] - reduce transmitted ack-only packets from 40% to 0.8% [Klazes] Release 1.3.1: (11th June 2003) - fixed bug introduced since 1.2.0 that prevented simultaneous tunnels. Release 1.3.0: (10th June 2003) - rewrite command usage text. - increase call disconnect notification log message verbosity. - inherit more make command line options. - remove execute permissions on man page. - fixed inefficient acknowledgement immediately followed by data packet. - added statistics for link quality monitoring. - remove include of callmgr, do separate compile. - remove duplicate messages caused by code in header file. - compilation fixes for Apple MacOS X. - support multiple clients on alias IP addresses. Release 1.2.0: (14th February 2003) - subsecond packet timeout to improve performance on fast links. - rewrite INSTALL. - add man page to install target. - fix response to dropped packets. - fix man page, address must be before options. - adopt man page contributed by Thomas Quinot. - close stderr to prevent holding open ssh sessions. - minor hint added in case of EIO on read() of pty. - support synchronous HDLC ppp encoding. Synchronous mode results in an important improvement of the CPU efficiency. - handle out-of-order packets arriving on the GRE socket by buffering. - bind GRE socket early to prevent ICMP Unreachable response by client. Release 1.1.0: (20th March 2002) - New release engineer. - allow activation as a psuedo-tty child process from pppd. This allows on demand pptp links or automatically reconnect. - ADSL modem quirks handler by mulix@@actcom.co.il. Workarounds for Orckit ADSL modem. - workaround for Cisco PIX connection drop after 60 seconds. - enhance bad FCS error message. - ported to FreeBSD and NetBSD. - integrated call manager into pptp binary. - many bugfixes improving stability. Release 1.0.3: (7th May 2001) - New maintaining team. - Various bug fixes from the Debian package and FreeBSD port. - Incorporate patch to support erroneous return code with Alcatel ADSL 1000 modems. - Fix incorrect call id error. - New command line option: --phone (specify phone number). (Needed by the Dutch Mxstream ADSL service.) Contributed by Rein Klazes @ text @$NetBSD: patch-ad,v 1.2 2000/04/10 01:24:39 jtk Exp $ Added more logging. --- pptp_gre.c.orig 2005-07-28 03:15:11.000000000 +0200 +++ pptp_gre.c 2006-03-14 14:15:51.000000000 +0100 @@@@ -44,12 +44,12 @@@@ int dequeue_gre(callback_t callback, int #if 1 #include -void print_packet(int fd, void *pack, unsigned int len) +void print_packet(int fd, void *pack, unsigned int len, const char *msg) { unsigned char *b = (unsigned char *)pack; unsigned int i,j; FILE *out = fdopen(fd, "w"); - fprintf(out,"-- begin packet (%u) --\n", len); + fprintf(out,"-- begin %s packet (%u) --\n", msg, len); for (i = 0; i < len; i += 16) { for (j = 0; j < 8; j++) if (i + 2 * j + 1 < len) @@@@ -234,6 +234,8 @@@@ int decaps_hdlc(int fd, int (*cb)(int cl if ( start + len <= end) if ((status = cb (cl, buffer + start, len)) < 0) return status; /* error-check */ + if (status == 0) + return -1; /* avoid an endless loop */ start += len; } return 0; @@@@ -329,6 +331,7 @@@@ int decaps_gre (int fd, callback_t callb if ((buffer[0] & 0xF0) == 0x40) ip_len = (buffer[0] & 0xF) * 4; header = (struct pptp_gre_header *)(buffer + ip_len); + /* print_packet(2, buffer, status, "in"); */ /* verify packet (else discard) */ if ( /* version should be 1 */ ((ntoh8(header->ver) & 0x7F) != PPTP_GRE_VER) || @@@@ -508,7 +511,7 @@@@ int encaps_gre (int fd, void *pack, unsi /* record and increment sequence numbers */ seq_sent = seq; seq++; /* write this baby out to the net */ - /* print_packet(2, u.buffer, header_len + len); */ + /* print_packet(2, u.buffer, header_len + len, "out"); */ rc = write(fd, u.buffer, header_len + len); if (rc < 0) { stats.tx_failed++; @ 1.2 log @whoops, remove an unwanted RCS ID from patch-ad @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 5 Index: pptp_gre.c --- pptp_gre.c.orig Wed Feb 18 17:42:14 1998 +++ pptp_gre.c Sun Apr 9 21:21:00 2000 @@@@ -6,8 +6,8 @@@@ */ a8 8 +#include #include #include #include -#include #include #include @@@@ -35,10 +35,10 @@@@ d11 37 a47 43 -void print_packet(int fd, void *pack, unsigned len) { +void print_packet(int fd, void *pack, unsigned len, const char *msg) { unsigned char *b = (unsigned char *)pack; unsigned i,j; FILE *out = fdopen(fd, "w"); - fprintf(out,"-- begin packet (%u) --\n", len); + fprintf(out,"-- begin %s packet (%u) --\n", msg, len); for (i=0; i=end) { if ((status=read(fd,buffer,sizeof(buffer)))<0) return status; + if (status == 0) + return -1; /* FD is closed */ end = status; start = 0; } @@@@ -199,4 +201,5 @@@@ header = (struct pptp_gre_header *)(buffer+ip_len); +/* print_packet(2, buffer, status, "in");*/ /* verify packet (else discard) */ if (((ntoh8(header->ver)&0x7F)!=PPTP_GRE_VER) || /* version should be 1 */ @@@@ -259,5 +262,5 @@@@ /* special case ACK with no payload */ - if (pack==NULL) + if (pack==NULL) { if (ack_sent != seq_recv) { u.header.ver |= hton8(PPTP_GRE_FLAG_A); @@@@ -267,4 +270,5 @@@@ return write(fd, &u.header, sizeof(u.header)-sizeof(u.header.seq)); } else return 0; /* we don't need to send ACK */ + } /* send packet with payload */ u.header.flags |= hton8(PPTP_GRE_FLAG_S); @@@@ -284,5 +288,5 @@@@ seq_sent = seq; seq++; /* write this baby out to the net */ - /* print_packet(2, u.buffer, header_len+len); */ +/* print_packet(2, u.buffer, header_len+len, "out");*/ return write(fd, u.buffer, header_len+len); } @ 1.1 log @Initial revision @ text @d4 3 a6 4 --- pptp_gre.c.orig 1998/09/02 14:40:54 +++ pptp_gre.c 1999/02/12 14:23:29 @@@@ -5,10 +5,10 @@@@ * $Id: pptp_gre.c,v 1.5 1997/12/15 10:11:38 cananian Exp $ d16 1 a16 3 #include @@@@ -34,12 +34,12 @@@@ d29 1 a29 3 if (i+2*j+1protocol)!=PPTP_GRE_PROTO)|| /* GRE protocol for PPTP */ @@@@ -258,7 +261,7 @@@@ u.header.call_id = hton16(pptp_gre_call_id); d49 1 a49 3 u.header.payload_len = hton16(0); @@@@ -266,6 +269,7 @@@@ ack_sent = seq_recv; d55 1 a55 3 u.header.seq = hton32(seq); @@@@ -283,7 +287,7 @@@@ /* record and increment sequence numbers */ a61 1 @ 1.1.1.1 log @PPTP (Point-to-Point Tunneling Protocol) client package, from linux-pptp-1.0.2 No encryption (yet). Tested with one Microsoft PPTP server, YMMV? @ text @@