Merge branch 'spelling-error-in-binary' into 'master'
(main): Fix typo and misspellings errors See merge request l2tpns/l2tpns!6
This commit is contained in:
Julien Rabier
commit
1a39e37ac9
7 changed files with 37 additions and 37 deletions
6
Changes
6
Changes
|
|
@ -366,7 +366,7 @@
|
|||
- Allow LCP re-negotiation after connection completes (thanks Yuri).
|
||||
|
||||
* Mon Nov 15 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.7
|
||||
- Fix socket creation in host_unreachable() (thanks to Bjørn Augestad)
|
||||
- Fix socket creation in host_unreachable() (thanks to Bjørn Augestad)
|
||||
- Don't assume BGP peer sends back negotiated hold time, pick smallest
|
||||
|
||||
* Thu Nov 11 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.6
|
||||
|
|
@ -374,7 +374,7 @@
|
|||
- Revise BGP config to use "router bgp AS" syntax (requires libcli >= 1.8.2)
|
||||
|
||||
* Tue Nov 9 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.5
|
||||
- Handle routing properly in lone-master case
|
||||
- Handle routing properly in lone-master case
|
||||
- Fix intercepts: don't double-snoop throttled customers, ensure
|
||||
byte/packet counts are only updated once
|
||||
- Add a callback to allow plugins to fetch values from the running config
|
||||
|
|
@ -402,7 +402,7 @@
|
|||
- Shared_malloc returns NULL on failure
|
||||
- Sync changes
|
||||
- Unfsck 4->8 indenting change
|
||||
- Use 2 seperate u16 values for throttle rate in/out
|
||||
- Use 2 separate u16 values for throttle rate in/out
|
||||
- Defer adding radius fds to the select loop until become_master
|
||||
|
||||
* Thu Sep 02 2004 David Parrish <david@dparrish.com> 2.0.2
|
||||
|
|
|
|||
|
|
@ -192,14 +192,14 @@ one will not be sent.
|
|||
|
||||
<LI><B>primary_radius</B> (ip address)
|
||||
<LI><B>secondary_radius</B> (ip address)<BR>
|
||||
Sets the RADIUS servers used for both authentication and accounting.
|
||||
Sets the RADIUS servers used for both authentication and accounting.
|
||||
If the primary server does not respond, then the secondary RADIUS
|
||||
server will be tried.<br>
|
||||
<strong>Note:</strong> in addition to the source IP address and
|
||||
identifier, the RADIUS server <strong>must</strong> include the source
|
||||
port when detecting duplicates to supress (in order to cope with a
|
||||
large number of sessions comming on-line simultaneously l2tpns uses a
|
||||
set of udp sockets, each with a seperate identifier).
|
||||
port when detecting duplicates to suppress (in order to cope with a
|
||||
large number of sessions coming on-line simultaneously l2tpns uses a
|
||||
set of udp sockets, each with a separate identifier).
|
||||
</LI>
|
||||
|
||||
<LI><B>primary_radius_port</B> (short)
|
||||
|
|
@ -248,7 +248,7 @@ If no address is given to iftun_address and bind_address, 1.1.1.1 is used.
|
|||
</LI>
|
||||
|
||||
<LI><B>bind_multi_address</B> (ip address)<BR>
|
||||
This parameter permit to listen several addresss of the l2tp udp protocol
|
||||
This parameter permit on to listen several address of the l2tp udp protocol
|
||||
(and set several address to the tun interface).
|
||||
<BR>
|
||||
WHEN this parameter is set, It OVERWRITE the parameters "bind_address"
|
||||
|
|
@ -274,14 +274,14 @@ Address to send to clients as the default gateway.
|
|||
|
||||
<LI><B>send_garp</B> (boolean)<BR>
|
||||
Determines whether or not to send a gratuitous ARP for the
|
||||
bind_address when the server is ready to handle traffic (default:
|
||||
bind_address when the server is ready to handle traffic (default:
|
||||
true).<BR>
|
||||
This value is ignored if BGP is configured.
|
||||
</LI>
|
||||
|
||||
<LI><B>throttle_speed</B> (int)<BR>
|
||||
Sets the default speed (in kbits/s) which sessions will be limited to.
|
||||
If this is set to 0, then throttling will not be used at all. Note:
|
||||
Sets the default speed (in kbits/s) which sessions will be limited to.
|
||||
If this is set to 0, then throttling will not be used at all. Note:
|
||||
You can set this by the CLI, but changes will not affect currently
|
||||
connected users.
|
||||
</LI>
|
||||
|
|
@ -294,7 +294,7 @@ session requires two buckets (in and out).
|
|||
<LI><B>accounting_dir</B> (string)<BR>
|
||||
If set to a directory, then every 5 minutes the current usage for
|
||||
every connected use will be dumped to a file in this directory. Each
|
||||
file dumped begins with a header, where each line is prefixed by #.
|
||||
file dumped begins with a header, where each line is prefixed by #.
|
||||
Following the header is a single line for every connected user, fields
|
||||
separated by a space.<BR> The fields are username, ip, qos,
|
||||
uptxoctets, downrxoctets, origin (optional). The qos field is 1 if a standard user, and
|
||||
|
|
@ -321,7 +321,7 @@ unnecessary system call overhead of select on busy servers.
|
|||
<LI><B>scheduler_fifo</B> (boolean)<BR>
|
||||
Sets the scheduling policy for the l2tpns process to SCHED_FIFO. This
|
||||
causes the kernel to immediately preempt any currently running SCHED_OTHER
|
||||
(normal) process in favour of l2tpns when it becomes runnable.
|
||||
(normal) process in favour of l2tpns when it becomes runnable.
|
||||
Ignored on uniprocessor systems.
|
||||
</LI>
|
||||
|
||||
|
|
@ -335,7 +335,7 @@ Maximum number of host unreachable ICMP packets to send per second.
|
|||
|
||||
<LI><B>packet_limit</B> (int><BR>
|
||||
Maximum number of packets of downstream traffic to be handled each
|
||||
tenth of a second per session. If zero, no limit is applied (default:
|
||||
tenth of a second per session. If zero, no limit is applied (default:
|
||||
0). Intended as a DoS prevention mechanism and not a general
|
||||
throttling control (packets are dropped, not queued).
|
||||
</LI>
|
||||
|
|
@ -428,7 +428,7 @@ where <I>PORT</I> specifies the L2TP Port of the remote LNS
|
|||
(Normally should be 1701) (ex: 1701).</BR>
|
||||
where <I>SECRET</I> specifies the secret password the remote LNS (ex: mysecret).</BR>
|
||||
</BR>
|
||||
The static Remote LNS configuration can be used when the friend ISP not
|
||||
The static Remote LNS configuration can be used when the friend ISP not
|
||||
have a proxied Radius.</BR>
|
||||
If the proxied Radius is used, It will return the RADIUS attributes:</BR>
|
||||
Tunnel-Type: 1 = L2TP</BR>
|
||||
|
|
@ -440,7 +440,7 @@ If the proxied Radius is used, It will return the RADIUS attributes:</BR>
|
|||
Tunnel-Medium-Type: 2 = IPv4</BR>
|
||||
Tunnel-Password: 2 = "LESECRETL2TP"</BR>
|
||||
Tunnel-Server-Endpoint: 2 = "88.xx.xx.x2"</BR>
|
||||
Tunnel-Assignment-Id: 2 = "friendisp_lns2"</BR>
|
||||
Tunnel-Assignment-Id: 2 = "friendisp_lns2"</BR>
|
||||
|
||||
<P><U><B>PPPOE configuration</B></U></P>
|
||||
|
||||
|
|
@ -584,7 +584,7 @@ when it receives them.
|
|||
|
||||
<H3 ID="Command-LineInterface">Command-Line Interface</H3>
|
||||
|
||||
You can access the command line interface by telnet'ing to port 23.
|
||||
You can access the command line interface by telnet'ing to port 23.
|
||||
There is no IP address restriction, so it's a good idea to firewall
|
||||
this port off from anyone who doesn't need access to it. See
|
||||
<A HREF="#users">users</A> for information on restricting access based
|
||||
|
|
@ -784,7 +784,7 @@ These counters are updated every second.
|
|||
</LI>
|
||||
|
||||
<LI><B>configure terminal</B><BR>
|
||||
Enter configuration mode. Use <EM>exit</EM> or ^Z to exit this mode.
|
||||
Enter configuration mode. Use <EM>exit</EM> or ^Z to exit this mode.
|
||||
The following commands are valid in this mode:<P>
|
||||
</LI>
|
||||
|
||||
|
|
@ -1137,7 +1137,7 @@ contain those session and tunnel changes since the last heartbeat.<P>
|
|||
When a slave has not seen a heartbeat within
|
||||
<B>cluster_hb_timeout</B>/10 seconds it "elects" a new master by
|
||||
examining the list of peers it has seen pings from and determines
|
||||
which of these and itself is the "best" candidate to be master.
|
||||
which of these and itself is the "best" candidate to be master.
|
||||
"Best" in this context means the server with the highest uptime (the
|
||||
highest IP address is used as a tie-breaker in the case of equal
|
||||
uptimes).<P>
|
||||
|
|
|
|||
|
|
@ -320,11 +320,11 @@ set boolean true
|
|||
<para>
|
||||
In addition to the source IP address and identifier,
|
||||
the RADIUS server <emphasis>must</emphasis> include
|
||||
the source port when detecting duplicates to supress
|
||||
the source port when detecting duplicates to suppress
|
||||
(in order to cope with a large number of sessions
|
||||
comming on-line simultaneously
|
||||
coming on-line simultaneously
|
||||
<command>l2tpns</command> uses a set of udp sockets,
|
||||
each with a seperate identifier).
|
||||
each with a separate identifier).
|
||||
</para>
|
||||
</note>
|
||||
</para>
|
||||
|
|
@ -1908,7 +1908,7 @@ char *plugin_control_help[] = { <replaceable>...</replaceable>, NULL };
|
|||
<entry><code>char **argc</code></entry>
|
||||
</row>
|
||||
<row>
|
||||
<entry><code>int reponse</code></entry>
|
||||
<entry><code>int response</code></entry>
|
||||
<entry>
|
||||
Response from control message (if handled): should be
|
||||
either <code>NSCTL_RES_OK</code> or
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ startup\-config \- configuration file for l2tpns
|
|||
\&\fBstartup-config\fR is the configuration file for \fBl2tpns\fR
|
||||
.PP
|
||||
The format is plain text, in the same format as accepted by
|
||||
the configuration mode of l2tpns's telnet administrative
|
||||
the configuration mode of l2tpns's telnet administrative
|
||||
interface. Comments are indicated by either the character # or !.
|
||||
.SS "\s-1SETTINGS\s0"
|
||||
.IX Subsection "SETTINGS"
|
||||
|
|
@ -187,7 +187,7 @@ This parameter authorize to change the source \s-1IP\s0 of the tunnels l2tp. Thi
|
|||
It's the listen address of the l2tp udp protocol sent and received to \s-1LAC.\s0 This address is also assigned to the tun interface if no iftun_address is specified. Packets containing user traffic should be routed via this address if given, otherwise the primary address of the machine.
|
||||
.IP "\fBbind_multi_address\fR (ip address)" 4
|
||||
.IX Item "bind_multi_address (ip address)"
|
||||
This parameter permit to listen several addresss of the l2tp udp protocol (and set several address to the tun interface).
|
||||
This parameter permit on to listen several address of the l2tp udp protocol (and set several address to the tun interface).
|
||||
.Sp
|
||||
\&\s-1WHEN\s0 this parameter is set, It \s-1OVERWRITE\s0 the parameters \*(L"bind_address\*(R" and \*(L"iftun_address\*(R".
|
||||
.Sp
|
||||
|
|
@ -312,7 +312,7 @@ Whenever a \s-1PPP\s0 connection is established, \s-1DNS\s0 servers will be sent
|
|||
.IX Item "primary_radius (ip address), secondary_radius (ip address)"
|
||||
Sets the \s-1RADIUS\s0 servers used for both authentication and accounting. If the primary server does not respond, then the secondary \s-1RADIUS\s0 server will be tried.
|
||||
.Sp
|
||||
Note: in addition to the source \s-1IP\s0 address and identifier, the \s-1RADIUS\s0 server must include the source port when detecting duplicates to supress (in order to cope with a large number of sessions comming on-line simultaneously l2tpns uses a set of udp sockets, each with a seperate identifier).
|
||||
Note: in addition to the source \s-1IP\s0 address and identifier, the \s-1RADIUS\s0 server must include the source port when detecting duplicates to suppress (in order to cope with a large number of sessions coming on-line simultaneously l2tpns uses a set of udp sockets, each with a separate identifier).
|
||||
.IP "\fBprimary_radius_port\fR (short), \fBsecondary_radius_port\fR (short)" 4
|
||||
.IX Item "primary_radius_port (short), secondary_radius_port (short)"
|
||||
Sets the authentication ports for the primary and secondary \s-1RADIUS\s0 servers. The accounting port is one more than the authentication port. If no \s-1RADIUS\s0 ports are given, the authentication port defaults to 1645, and the accounting port to 1646.
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ startup-config - configuration file for l2tpns
|
|||
B<startup-config> is the configuration file for B<l2tpns>
|
||||
|
||||
The format is plain text, in the same format as accepted by
|
||||
the configuration mode of l2tpns's telnet administrative
|
||||
the configuration mode of l2tpns's telnet administrative
|
||||
interface. Comments are indicated by either the character # or !.
|
||||
|
||||
=head2 SETTINGS
|
||||
|
|
@ -66,7 +66,7 @@ It's the listen address of the l2tp udp protocol sent and received to LAC. This
|
|||
|
||||
=item B<bind_multi_address> (ip address)
|
||||
|
||||
This parameter permit to listen several addresss of the l2tp udp protocol (and set several address to the tun interface).
|
||||
This parameter permit one to listen several address of the l2tp udp protocol (and set several address to the tun interface).
|
||||
|
||||
WHEN this parameter is set, It OVERWRITE the parameters "bind_address" and "iftun_address".
|
||||
|
||||
|
|
@ -214,7 +214,7 @@ Whenever a PPP connection is established, DNS servers will be sent to the user,
|
|||
|
||||
Sets the RADIUS servers used for both authentication and accounting. If the primary server does not respond, then the secondary RADIUS server will be tried.
|
||||
|
||||
Note: in addition to the source IP address and identifier, the RADIUS server must include the source port when detecting duplicates to supress (in order to cope with a large number of sessions comming on-line simultaneously l2tpns uses a set of udp sockets, each with a seperate identifier).
|
||||
Note: in addition to the source IP address and identifier, the RADIUS server must include the source port when detecting duplicates to suppress (in order to cope with a large number of sessions coming on-line simultaneously l2tpns uses a set of udp sockets, each with a separate identifier).
|
||||
|
||||
=item B<primary_radius_port> (short), B<secondary_radius_port> (short)
|
||||
|
||||
|
|
@ -288,7 +288,7 @@ DUID Based on Link-layer Address (DUID-LL) (see rfc3315).
|
|||
|
||||
=item B<primary_ipv6_dns>, B<secondary_ipv6_dns> (Ipv6 address)
|
||||
|
||||
IPv6 DNS servers will be sent to the user (see rfc3646).
|
||||
IPv6 DNS servers will be sent to the user (see rfc3646).
|
||||
|
||||
=item B<default_ipv6_domain_list> (string)
|
||||
|
||||
|
|
@ -328,7 +328,7 @@ where PORT specifies the L2TP Port of the remote LNS (Normally should be 1701) (
|
|||
|
||||
where SECRET specifies the secret password the remote LNS (ex: mysecret).
|
||||
|
||||
=back
|
||||
=back
|
||||
|
||||
The static REMOTE LNS configuration can be used when the friend ISP not have a proxied Radius.
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ int lac_conf_forwardtoremotelns(sessionidt s, char * puser);
|
|||
void lac_calc_rlns_auth(tunnelidt t, uint8_t id, uint8_t *out);
|
||||
int lac_addremotelns(char *mask, char *IP_RemoteLNS, char *Port_RemoteLNS, char *SecretRemoteLNS);
|
||||
|
||||
/* Function for Tunnels creating from radius reponses */
|
||||
/* Function for Tunnels creating from radius responses */
|
||||
void lac_reset_rad_tag_tunnel_ctxt();
|
||||
void lac_set_rad_tag_tunnel_type(uint8_t tag, uint32_t tunnel_type);
|
||||
void lac_set_rad_tag_tunnel_medium_type(uint8_t tag, uint32_t tunnel_medium_type);
|
||||
|
|
|
|||
10
radius.c
10
radius.c
|
|
@ -394,7 +394,7 @@ void radiussend(uint16_t r, uint8_t state)
|
|||
p[1] = 6;
|
||||
*(uint32_t *) (p + 2) = htonl((state == RADIUSJUSTAUTH ? 8 : 2)); // Authenticate only or Framed-User respectevily
|
||||
p += p[1];
|
||||
|
||||
|
||||
*p = 7; // Framed-Protocol
|
||||
p[1] = htonl((state == RADIUSJUSTAUTH ? 0 : 6));
|
||||
*(uint32_t *) (p + 2) = htonl((state == RADIUSJUSTAUTH ? 0 : 1)); // PPP
|
||||
|
|
@ -517,7 +517,7 @@ static void handle_avpair(sessionidt s, uint8_t *avp, int len)
|
|||
}
|
||||
else
|
||||
return;
|
||||
|
||||
|
||||
// Run hooks
|
||||
{
|
||||
struct param_radius_response p = { &tunnel[session[s].tunnel], &session[s], (char *) key, (char *) value };
|
||||
|
|
@ -709,7 +709,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
|
|||
{
|
||||
LOG(3, s, session[s].tunnel, " Radius reply contains route for %s/%d\n",
|
||||
fmtaddr(htonl(ip), 0), bits);
|
||||
|
||||
|
||||
session[s].route[routes].ip = ip;
|
||||
session[s].route[routes].prefixlen = bits;
|
||||
routes++;
|
||||
|
|
@ -895,7 +895,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
|
|||
memcpy(strtemp, (p + 3), lentemp);
|
||||
if (!rad_tunnel_pwdecode(strtemp, &lentemp, config->radiussecret, radius[r].auth))
|
||||
{
|
||||
LOG_HEX(3, "Error Decode Tunnel-Password, Dump Radius reponse:", p, p[1]);
|
||||
LOG_HEX(3, "Error Decode Tunnel-Password, Dump Radius response:", p, p[1]);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -1276,7 +1276,7 @@ void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen, struc
|
|||
|
||||
LOG(3, s, t, " DAE Change %d (%s)\n", s, session[s].user);
|
||||
r_code = CoAACK;
|
||||
|
||||
|
||||
// reset
|
||||
{
|
||||
struct param_radius_reset p = { &tunnel[session[s].tunnel], &session[s] };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue