Age | Commit message (Collapse) | Author |
|
Pass a full string, instead of an array of words, to the "help" callback
of regexp command handlers. Also register these command handlers using
a regexp to apply on "help" commands, just like for exec commands. The
"help" callback will then be called only if the command matches the
"help" regexp.
As a side effect, the "help" word and its following spaces are skipped
before calling the "help" callback for both simple and regexp commands.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
* skip_word(): ensure the for() loop won't pass over a '\0' character
* split(): ensure the for() loop won't try to fill buf[MAX_CMD_ITEMS]
* split(): skip leading spaces.
* split(): fix exit value if no item is found (return 0 instead of 1)
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Split regexp and simple command handling from the generic command
processing function and handle regexp commands before simple ones.
This avoids splitting the original command line before processing
regexp command handlers, so that these handlers get the full command
line instead of only the first word.
The regexp command handlers are now only called when the command
matches the regexp (regexp handlers were called unconditionaly
before this patch). The rest of the processing properties should
remain unchanged.
Command processing summary:
-If the command starts with the "help" keyword, then all help
commands are called, starting with regexp help commands.
-Otherwise, regexp command handlers whose regexp matches the
command line are called. Then, simple command handlers whose
header matches the command line are called.
Any command handler that returns a value different from
CLI_CMD_OK stops the process, thus preventing the following
handlers from being called.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Process "help" commands in a separated function with no side effect
when the command doesn't match. This avoids splitting the input
command line if not necessary (regexp command handlers need to
receive the entire command line for being useful).
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
* Call pcre_compile2() with all mandatory arguments and
improve error message.
* Register regexp commands in regexp_cmd_list instead of
simple_cmd_list.
* Fix "help" function call.
* Interpret regexp command return codes (CLI_CMD_*) in the
same way as for simple commands.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Since it's not possible to mix incomming and outgoing states in
a session, the "state2" field isn't necessary.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Add the "l2tp create session" command to place an outgoing call.
For example, "l2tp create session tid 3" will send an OCRQ within
tunnel 3.
This allows the LNS to request establishment of a new session inside
an existing tunnel.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
This patch removes the automatic sending of a CDN message when
cancelling creation of new sessions. This is necessary in order
to give the possibility for a tunnel to create (and possibly cancel)
new sessions on its own (e.g. for placing outgoing calls). In such
cases, sending a CDN message would not make sense if the session gets
cancelled before any creation message was sent.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Define the u_readlong() function as a wrapper for strtol(). It performs
stricter checks on the input value and let the caller specify an interval
of acceptable values.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Move definition of ACCEL_PPP_VERSION from /accel-pppd/CMakeLists.txt
to /CMakeLists.txt so that it gets visible by any cmake file.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
|
|
ipoe: fixed DHCP Discover handling when session is in active state
|
|
|
|
|
|
|
|
|
|
This reverts commit cde7ee4d629b32c810ceac836b70a4289b4f00b3.
|
|
|
|
|
|
|
|
This reverts commit 2b9c6812f4558b74843c6e3740ee5319dc1df48d.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Explicitely interpret zero values when parsing boolean options. This
allows to unset boolean parameters such as "verbose" when reloading
the configuration.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
|
|
Retrieve the socket address size from the address passed to connect().
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Use l2tp_tunnel_alloc() cleanup code for handling TID assignment
failure. The previous manual cleanup did not close the triton handler
file descriptor.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Tunnel establishment may not be immediately followed by the creation of
a new session. In this case there is no message to send to the peer
after receiving an SCCCN; so it won't be acknowledged and the peer will
then have to retransmit it.
This patch makes the tunnel always acknowledge SCCCN by replying with a
ZLB, thus avoiding useless retransmission from the peer.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Send a ZLB upon reception of a CDN message.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Update call to l2tp_send_CDN() to avoid using the 0 result code
(reserved by RFC 2661).
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
The sessions timeout timers were registered in the triton context of
their parent tunnel. This patch uses the session's context instead
because the timer's callback function, l2tp_session_timeout(), expects
to be called from a session context.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
When a PPP session terminates on its own (i.e. not on behalf of a L2TP
tunnel/session request), the l2tp_ppp_finished() callback calls the
L2TP session disconnection function without updating the session's
state.
Session disconnection code then works like if the PPP session was still
up: it tries to disconnect the PPP by calling ap_session_terminate().
But since the PPP is already terminated, it returns immediately,
without calling the l2tp_ppp_finished() callback; so session cleanup
won't happen.
This patch updates the session's state upon PPP disconnection, so that
the session disconnection code won't try to disconnect the PPP in
__l2tp_session_free().
The stat_active counter is now updated inside the l2tp_ppp_finished()
callback so that it gets called upon any PPP disconnection.
Sending of the EV_CTRL_FINISHED event has also been moved. It is now
performed in the generic part of __l2tp_session_free() because it has
to be done every time the session really terminates.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
PPP and L2TP session contexts are the same. So since l2tp_ppp_finished()
is called within the PPP context, it doesn't need to switch to the
session context for calling l2tp_ppp_session_disconnect().
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Freeing a session requires four steps:
1-The session asynchronously requests its parent tunnel to
remove the session (the tunnel must start the process).
2-The parent tunnel removes its reference to this session,
then makes an asynchronous call to the session cleanup
function.
3-The session performs its cleanup, frees its memory and
asynchronously notifies its parent tunnel.
4-The parent tunnel decrements its sessions counter (so that
it knows when it doesn't have any session depending on it).
If two requests, A and B, for removing the same session, arrive
almost simultaneously, then the following scenario may occur:
1a-The session handles request A and transmits it to its
parent tunnel.
2a-The parent tunnel removes its reference to this session
and requests the session to perform cleanup.
1b-In the mean time, the session handles request B and
transmit it to its parent tunnel.
3a-The session continues to handle request A, cleans up the
session and frees memory.
2b-The parent tunnel handles request B: it removes its
reference to the session and tells it to perform cleanup.
But the session pointer used has just been freed at step 3a.
This patch modifies step 1, so that the session transmit the
session-id instead of a pointer to the session structure. That
way, the tunnel can check if the session has already been
deleted (or is pending deletion), without having to manipulate a
potentially invalid pointer.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
Use a session counter for each tunnel to avoid freeing a tunnel
while still having sessions depending on it.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
|
|
|
|
|
|
This reverts commit 3bff891eac97037c633be960b822c688e8629165.
|
|
|
|
This reverts commit 9f4f36169f03857b6910402028717210270a0339.
|
|
|
|
|
|
* l2tp: Fix allocation checking when adding octets AVP
* cli, tcp: Fix non-NULL terminated string reception
* Fix va_end() missing calls
* chap-secrets: implemented encryption
* auth_pap: make messages like other auth modules
* cli: check xmit_buf is not null at enter to write function
* pppoe: implemented regular expression support
* chap-secrets: implemented encryption
* ippool: fixed initialization order
* optional shaper compiling
* ppp: dns/wins code cleanup
|
|
session: don't accept new sessions in shutdown mode
|