aiden
/
freshtomato-arm
mirror of https://bitbucket.org/pedro311/freshtomato-arm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xl2tpd: update to 1.3.18

Browse Source
arm-master
pedro 3 years ago
parent 94f0d5159c
commit 212ae995a8
25 changed files with 142 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
release/src-rt-6.x.4708/router/patches/xl2tpd/101-tomato-specific.patch
Unescape Escape View File

@ -168,7 +168,7 @@
port = htons (port);
hp = gethostbyname (host);
if (!hp)
@@ -1921,3 +1931,95 @@ int main (int argc, char *argv[])
@@ -1929,3 +1939,95 @@ int main (int argc, char *argv[])
network_thread ();
return 0;
}

27
release/src-rt-6.x.4708/router/xl2tpd/.github/ISSUE_TEMPLATE/bug_report.md vendored
Unescape Escape View File

@ -0,0 +1,27 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**l2tp detail:**
- x2ltpd version: [e.g. 1.3.18]
**xl2tpd.conf**
Copy/paste the relevant xl2tpd config

12
release/src-rt-6.x.4708/router/xl2tpd/.travis.yml
Unescape Escape View File

@ -2,12 +2,6 @@ language: c
jobs:
include:
- os: linux
dist: xenial
compiler: gcc
- os: linux
dist: xenial
compiler: clang
- os: linux
dist: bionic
compiler: gcc
@ -20,6 +14,12 @@ jobs:
- os: linux
dist: focal
compiler: clang
- os: linux
dist: jammy
compiler: gcc
- os: linux
dist: jammy
compiler: clang
sudo: false

22
release/src-rt-6.x.4708/router/xl2tpd/CHANGES
Unescape Escape View File

@ -1,3 +1,25 @@
v1.3.18 (Nov 01, 2022)
* Set default debian branch [Samuel Thibault]
* watch: Turn rc version piece into ~rc [Samuel Thibault]
* upload [Samuel Thibault]
* Fix changelog [Samuel Thibault]
* control: Make Multi-Arch: foreign [Samuel Thibault]
* Add support for Ubuntu Jammy (22.04) when testing with travis.yml [Samir Hussain]
* Update control.c [Lőrinczy, Zsigmond]
* Update issue templates [Samir]
* Add compatability information for Watchguard Firewall [Samir Hussain]
* Adding documentation on common scnerios and how to address them [Samir Hussain]
* Fix issue where in some cases xl2tpd stops trying to connect if it can not resolve server name (DNS failure or WAN temporarily unavailable), even if autodial and redial options are set. [Samir Hussain]
* Modify debian/xl2tpd.service to use network-online.target [Samir Hussain]
* man page: leave the original phrasing for what xl2tpd is [Alexander Naumov]
* typo fix [Alexander Naumov]
* update man-pages [Alexander Naumov]
* Updating README.md [Samir Hussain]
* Add documentation to warn users to comment out: Wants=ipsec.service in the xl2pd.service file [Samir Hussain]
* Update VERSION to 1.3.18dev1 [Samir Hussain]
* control: Bump Standards-Version to 4.6.0 (no change) [Samuel Thibault]
* Play cat and mice again with lintian warning suppression [Samuel Thibault]
v1.3.17 (Jan 20, 2022)
* debian: Add systemd .service [Will Thompson]
* Update TODO file to specify branch work that needs to be completed [Samir Hussain]

16
release/src-rt-6.x.4708/router/xl2tpd/COMPATIBILITY_ISSUES
Unescape Escape View File

@ -27,3 +27,19 @@ There are reports of problems connecting to Miktrotik server.
Github user reported that the following configuration works for them:
https://github.com/xelerance/xl2tpd/issues/156#issuecomment-678674101
* Out of order control packet on tunnel
Some users are reporting when stablishing a tunnel with with Watchguard
Firewall, they get "Out of order control packet on tunnel" error messages.
If that is the case, please add the following to the DFLAGS section in Makefile
and compile:
-DCONFIG_WATCHDOG_FIREWALL
* Some ISP use l2tp without IPsec.
If the ISP being used by end user does not use IPsec, please comment out the
following in debian/xl2tpd.service file:
After=ipsec.service
Wants=ipsec.service

2
release/src-rt-6.x.4708/router/xl2tpd/Makefile.ver
Unescape Escape View File

@ -1 +1 @@
XL2TPDVERSION=1.3.17
XL2TPDVERSION=1.3.18

2
release/src-rt-6.x.4708/router/xl2tpd/README.md
Unescape Escape View File

@ -2,7 +2,7 @@
[![Build Status](https://travis-ci.org/xelerance/xl2tpd.svg?branch=1.3.16dev)](https://travis-ci.org/xelerance/xl2tpd)
xl2tpd is a **FREE** implementation of the Layer 2 Tunneling Protocol
xl2tpd is an implementation of the Layer 2 Tunneling Protocol
as defined by [RFC 2661](https://tools.ietf.org/rfc/rfc2661.txt).
L2TP allows you to tunnel PPP over UDP. Some ISPs use L2TP to tunnel user
sessions from dial-in servers (modem banks, ADSL DSLAMs) to back-end PPP

2
release/src-rt-6.x.4708/router/xl2tpd/control.c
Unescape Escape View File

@ -1640,7 +1640,7 @@ static inline int write_packet (struct buffer *buf, struct tunnel *t, struct cal
__FUNCTION__);
return -EINVAL;
}
else if ((size_t)err < 0)
else if ((ssize_t)err < 0)
{
if ((errno == EAGAIN) || (errno == EINTR))
{

16
release/src-rt-6.x.4708/router/xl2tpd/debian/changelog
Unescape Escape View File

@ -1,14 +1,22 @@
xl2tpd (1.3.17-1) UNRELEASED; urgency=medium
xl2tpd (1.3.18-1) unstable; urgency=medium
* New upstream release.
-- Samir Hussain <shussain@xelerance.com> Thu, 20 Jan 2022 14:35:21 -0500
-- Samir Hussain <shussain@xelerance.com> Tue, 01 Nov 2022 16:42:39 -0400
xl2tpd (1.3.16-2) UNRELEASED; urgency=medium
xl2tpd (1.3.17-1) unstable; urgency=medium
[ Samir Hussain ]
* New upstream release.
[ Samuel Thibault ]
* control: Fix branch of Vcs-Git.
* Play cat and mice again with lintian warning suppression.
* control: Bump Standards-Version to 4.6.0 (no change)
* control: Make Multi-Arch: foreign.
* watch: Turn rc version piece into ~rc.
-- Samuel Thibault <sthibault@debian.org> Mon, 20 Sep 2021 00:21:31 +0200
-- Samuel Thibault <sthibault@debian.org> Sat, 17 Sep 2022 21:37:04 +0200
xl2tpd (1.3.16-1) unstable; urgency=medium

3
release/src-rt-6.x.4708/router/xl2tpd/debian/control
Unescape Escape View File

@ -7,10 +7,11 @@ Homepage: https://www.xelerance.com/software/xl2tpd/
Vcs-Browser: https://github.com/xelerance/xl2tpd
Vcs-Git: https://github.com/xelerance/xl2tpd.git -b debian-sid
Build-Depends: debhelper-compat (= 12), libpcap0.8-dev
Standards-Version: 4.5.0
Standards-Version: 4.6.0
Package: xl2tpd
Architecture: any
Multi-Arch: foreign
Provides: l2tpd
Depends: ${shlibs:Depends}, ${misc:Depends}, ppp, lsb-base (>= 3.0-6)
Description: layer 2 tunneling protocol implementation

2
release/src-rt-6.x.4708/router/xl2tpd/debian/gbp.conf
Unescape Escape View File

@ -0,0 +1,2 @@
[DEFAULT]
debian-branch = debian-sid

2
release/src-rt-6.x.4708/router/xl2tpd/debian/lintian-overrides
Unescape Escape View File

@ -1,3 +1,3 @@
# The etc/xl2tpd/l2tp-secrets file must not be readable by non-root
xl2tpd: non-standard-file-perm etc/xl2tpd/l2tp-secrets 0600 != 0644
xl2tpd: non-standard-file-perm 0600 != 0644 [etc/xl2tpd/l2tp-secrets]

3
release/src-rt-6.x.4708/router/xl2tpd/debian/watch
Unescape Escape View File

@ -1,3 +1,4 @@
version=4
opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/xl2tpd-$1\.tar\.gz/ \
opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/xl2tpd-$1\.tar\.gz/,\
uversionmangle=s/(\d)(rc)/$1~$2/ \
https://github.com/xelerance/xl2tpd/tags .*/v?(\d\S+)\.tar\.gz

4
release/src-rt-6.x.4708/router/xl2tpd/debian/xl2tpd.service
Unescape Escape View File

@ -1,6 +1,8 @@
[Unit]
Description=Level 2 Tunnel Protocol Daemon (L2TP)
After=network.target
After=network-online.target
# Some ISPS use l2tp without IPsec. If that is the case for your ISP provider,
# comment out the two lines below
After=ipsec.service
Wants=ipsec.service

17
release/src-rt-6.x.4708/router/xl2tpd/doc/COMMON_SOLUTIONS
Unescape Escape View File

@ -0,0 +1,17 @@
Q. How do you deny connection to xl2tpd without IPsec encryption?
You can use iptables policy module like this:
iptables -A INPUT -p udp --dport 1701 -m policy --dir in --pol ipsec -j ACCEPT
iptables -A INPUT -p udp --dport 1701 -j DROP
Q. How to address low throughput?
Use rx bps and tx bps in xltpd.conf
A lot of examples use the following which is 10 times the default xl2tpd values:
tx bps = 100000000
rx bps = 100000000

18
release/src-rt-6.x.4708/router/xl2tpd/doc/l2tp-secrets.5
Unescape Escape View File

@ -1,6 +1,8 @@
.TH "l2tp-secrets" "5" "" "Jeff McAdams" ""
.TH "l2tp-secrets" "5" "Jan 2022" "Jeff McAdams" ""
.SH "NAME"
l2tp-secrets \- L2TPD secrets file
.SH "DESCRIPTION"
The l2tp-secrets file contains challenge-response authentication
information for xl2tpd, the implementation of l2tp protocol. The format
@ -24,18 +26,20 @@ probably be longer to ensure sufficient security. There is no minimum
length requirement, however.
.SH "FILES"
/etc/xl2tpd/xl2tpd.conf
/etc/xl2tpd/l2tp\-secrets
/var/run/xl2tpd/l2tp\-control
\fB\fR/etc/xl2tpd/xl2tpd.conf \fB\fR/etc/xl2tpd/l2tp\-secrets
\fB\fR/var/run/xl2tpd/l2tp\-control
.SH "BUGS"
Please send bugs and comment to xl2tpd@lists.xelerance.com
Please address bugs and comment to xl2tpd@lists.xelerance.com
.SH "SEE ALSO"
xl2tpd(8),
xl2tpd.conf(5)
\fB\fRxl2tpd(8)
\fB\fRxl2tpd.conf(5)
.SH "AUTHORS"
Michael Richardson <mcr@xelerance.com>
Paul Wouters <paul@xelerance.com>

2
release/src-rt-6.x.4708/router/xl2tpd/doc/xl2tpd-control.8
Unescape Escape View File

@ -1,4 +1,4 @@
.TH xl2tpd-control 8 "Sep 2020"
.TH xl2tpd-control 8 "Jan 2022"
.SH NAME
xl2tpd\-control \- xl2tpd control utility.

4
release/src-rt-6.x.4708/router/xl2tpd/doc/xl2tpd.8
Unescape Escape View File

@ -1,7 +1,7 @@
.TH xl2tpd 8 "Sep 2020"
.TH xl2tpd 8 "Jan 2022"
.SH NAME
xl2tpd \- Layer 2 Tunnelling Protocol Daemon.
xl2tpd \- Layer 2 Tunneling Protocol Daemon.
.SH DESCRIPTION
xl2tpd is an implementation of the Layer 2 Tunneling Protocol (RFC 2661).

2
release/src-rt-6.x.4708/router/xl2tpd/doc/xl2tpd.conf.5
Unescape Escape View File

@ -1,4 +1,4 @@
.TH xl2tpd.conf 5 "Sep 2020"
.TH xl2tpd.conf 5 "Jan 2022"
.SH NAME
xl2tpd.conf \- L2TPD configuration file
.SH DESCRIPTION

2
release/src-rt-6.x.4708/router/xl2tpd/l2tp.h
Unescape Escape View File

@ -59,7 +59,7 @@ typedef unsigned long long _u64;
#define CONTROL_PIPE_REQ_LNS_REMOVE 'w' /* Get status of LNS */
#define BINARY "xl2tpd"
#define SERVER_VERSION "xl2tpd-1.3.17"
#define SERVER_VERSION "xl2tpd-1.3.18"
#define VENDOR_NAME "xelerance.com"
#ifndef PPPD
#define PPPD "/usr/sbin/pppd"

2
release/src-rt-6.x.4708/router/xl2tpd/packaging/fedora/xl2tpd.spec
Unescape Escape View File

@ -1,6 +1,6 @@
Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
Name: xl2tpd
Version: 1.3.17
Version: 1.3.18
Release: 1%{?dist}
License: GPLv2
Url: http://www.xelerance.com/software/xl2tpd/

2
release/src-rt-6.x.4708/router/xl2tpd/packaging/openwrt/Makefile
Unescape Escape View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=xl2tpd
PKG_VERSION:=1.3.17
PKG_VERSION:=1.3.18
PKG_RELEASE:=1
PKG_MD5SUM:=ab5656eb5a3d1973f7f69b039675332e-NEEDSUPDATING

2
release/src-rt-6.x.4708/router/xl2tpd/packaging/suse/sles10.spec
Unescape Escape View File

@ -1,6 +1,6 @@
Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
Name: xl2tpd
Version: 1.3.17
Version: 1.3.18
Release: 1%{?dist}
License: GPLv2
Url: http://www.xelerance.com/software/xl2tpd/

2
release/src-rt-6.x.4708/router/xl2tpd/packaging/suse/xl2tpd.spec
Unescape Escape View File

@ -22,7 +22,7 @@
%define rundir /run
%endif
Name: xl2tpd
Version: 1.3.17
Version: 1.3.18
Release: 0
Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
License: GPL-2.0-only

8
release/src-rt-6.x.4708/router/xl2tpd/xl2tpd.c
Unescape Escape View File

@ -710,6 +710,14 @@ static struct tunnel *l2tp_call (char *host, int port, struct lac *lac,
{
l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n",
host);
if (lac->redial && (lac->rtimeout > 0) && !lac->rsched && lac->active)
{
struct timeval tv;
l2tp_log (LOG_INFO, "Will redial in %d seconds\n", lac->rtimeout);
tv.tv_sec = lac->rtimeout;
tv.tv_usec = 0;
lac->rsched = schedule (tv, magic_lac_dial, lac);
}
return NULL;
}
bcopy (hp->h_addr, &addr.s_addr, hp->h_length);

Write Preview
Loading…
Cancel
Save