summaryrefslogtreecommitdiff
path: root/accel-pppd/ctrl/l2tp/l2tp.c
AgeCommit message (Collapse)Author
2013-04-17l2tp: Handle incoming hidden AVPsGuillaume Nault
Decode hidden AVPs on reception. This is transparent for functions in l2tp.c (except for the presence of the Random Vector AVP). Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-04-17l2tp: Store length of conf_secretGuillaume Nault
Secret length is used quite often especially when handling hidden AVPs. Store conf_secret length together with conf_secret to avoid calling strlen(conf_secret) every time. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Add general packet processing log messagesGuillaume Nault
Use "info2" log messages to inform about packets sent or processed. For HELLO and ZLB messages, the log level is set to "debug" as these are transmitted quite often and don't bring much information (this same logging policy is used for logging packets when conf_verbose is on). Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Log packet retransmission informationGuillaume Nault
Log message for any packet retransmission action using log_tunnel() and level "info2". Remove l2tp_conn_log() since it is no longer used. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Log all discarded messages in the same wayGuillaume Nault
Add a log message (warn level) for any discarded message type. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Log session establishment/disconnection informationGuillaume Nault
Use info1 messages to log information about main session establishment and disconnection steps. These messages are: * establishment requests and their origin (CLI, ICRQ or OCRQ) * establishment confirmation (when session is really established) * PPP establishment * disconnection requests and their reason Other information of interest use info2. These include: * Peer Session ID setting * Session internal structure freeing Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Log tunnel establishment/disconnection informationGuillaume Nault
Use info1 messages to log information about main tunnel establishment and disconnection steps. These messages are: * establishment requests and their origin (CLI or SCCRQ) * establishment confirmation (when tunnel is really established) * disconnection requests and their reason Other information of interest use info2. These include: * Peer port update * Peer Tunnel ID setting * Tunnel internal structure freeing Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Use consistent packet logging policyGuillaume Nault
Adapt packet logging policy to make it consistent across L2TP packet handling functions: * Don't log messages if conf_verbose is off. * Log HELLO and ZLB messages with log_debug and use log_info2 for any other message type. * Log retransmissions with log_info2, no matter the message type. * Log outgoing messages right before sending them. * Log incoming messages right before analysing their message type. This unifies the way l2tp_conn_read() and l2tp_udp_read() log incoming messages. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Handle WEN messagesGuillaume Nault
Implement minimal WEN messages processing, so that they get properly acknowledged. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Avoid tunnel destruction when possibleGuillaume Nault
Handle incomming messages differently depending on their Message Type: * Close tunnel only when handling tunnel establishment messages fails (SCCRP and SCCCN) and everytime a StopCCN is received. * Never close tunnel after reception of HELLO, SLI or session establishment messages (ICRQ and OCRQ). * Ignore messages with invalid first attribute type. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Parse incoming CDN messagesGuillaume Nault
Interpret AVPs present in CDN to provide user with better diagnostic. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Handle allocation failure in l2tp_session_connect()Guillaume Nault
Allocate PPP channel name using the string size to be stored and check for allocation failure. Use two snprintf() and a _malloc() instead of asprintf() so that allocated memory will be visible by memdebug. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Use consistent return values for l2tp_{recv, send}*()Guillaume Nault
In all reception or sending functions, return 0 on success or if incomming message has been ignored (l2tp_recv_*() only). Return -1 upon any processing error. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Remove some redundant log messagesGuillaume Nault
There is no need to warn about missing Challenge when handling SCCRQ comming from a host for which a secret exists: this will be done automatically upon SCCRP generation (by l2tp_tunnel_genchallresp()). Using the log message from l2tp_tunnel_genchallresp() has the advantage of working for missing Challenge AVPs in both SCCRQ and SCCRP messages. This patch also removes a redundant log message in l2tp_session_recv() when handling unknown message types. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-28l2tp: Simplify some function call sequencesGuillaume Nault
* Avoid retrieving tunnel and session contexts manually; use l2tp_{tunnel,session}_self() instead. * Use l2tp_session_disconnect() instead of using an l2tp_send_CDN(); l2tp_session_free() sequence. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Don't close tunnel upon error on HELLOGuillaume Nault
If a HELLO message can't be acknowledged just log an error as tunnel doesn't need to get closed. If too many HELLO messages aren't acknowledged, the peer will close the tunnel itself. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Notify peer upon tunnel/session timeoutGuillaume Nault
If tunnel or session establishment timeout expires, send StopCCN or CDN to notify peer before closing tunnel/session. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Don't depent on StopCCN for tunnel disconnectionGuillaume Nault
Always disconnect tunnel once l2tp_tunnel_disconnect() is called, even if sending StopCCN failed. Change the way unknown message types are handled to comply with new l2tp_tunnel_disconnect() signature. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Improve error handling of duplicate messagesGuillaume Nault
Don't terminate tunnel in case of error while handling a duplicate message. Such errors aren't critical enough to justify termination of a tunnel and all of its sessions. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Free tunnels that couldn't startGuillaume Nault
When starting a tunnel created upon user request, free it in case of error. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Fix early message sending during tunnel establishmentGuillaume Nault
A side effect of setting peer port to zero when sending SCCRQ messages is that the tunnel can't send any new message before receiving first peer's answer (this doesn't apply to retransmissions as peer port is set in the original packet). It is then impossible to send StopCCN messages within this time frame. This patch fixes this issue using a new tunnel flag which indicates if tunnel's peer port has a default value or if it has been set after reception of peer's first message. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Centralise management of tunnel establishment timersGuillaume Nault
Handle tunnel timeout timers in l2tp_tunnel_start() and l2tp_tunnel_connect(). This avoids timer code duplication across functions that are spectific to the tunnel establishment mode. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Centralise management of session establishment timersGuillaume Nault
Start and stop session timeout timers in l2tp_tunnel_start_session() and l2tp_session_connect(). This unifies timers management across the four different ways of creating sessions. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Dedicated function for replying to incomming callsGuillaume Nault
Define l2tp_session_incall_reply() which can be used as parameter for l2tp_tunnel_start_session(). This removes the need for updating session's state in l2tp_send_ICRP() and normalises the way incomming and outgoing sessions are handled. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Merge incomming and outgoing session startingGuillaume Nault
Define l2tp_session_place_call() which can start either an incomming or outgoing session depending on the 'sess->lns_mode' flag. This removes the need for testing session mode before calling l2tp_tunnel_start_session(). Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Centralise new session launchingGuillaume Nault
Creating new sessions always involves the same steps: * Create new session context * Call session's first function in this context * Start session establishment timer This patch starts centralising the first two steps in l2tp_tunnel_confirm_session() (renamed l2tp_tunnel_start_session() in order to use similar ways for starting tunnels and sessions). Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Send CDN in tunnel contextGuillaume Nault
Handling ICRQ or OCRQ requests occurs in tunnel context, but if session creation is rejected, a CDN has to be sent. However, l2tp_send_CDN() is supposed to be called in session context. This means that it uselessly switches to tunnel context before sending messages and requires a session structure to work on. This patch creates a new function for sending CDN from tunnel context. It gets the session and peer session IDs from its arguments and calls l2tp_tunnel_send() directly. The l2tp_recv_ICRQ() and l2tp_recv_OCRQ() functions are modified to take advantage of this new function and will now send CDN even upon early message processing error. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-16l2tp: Use tunnel/session specific sending functionsGuillaume Nault
Define the l2tp_{tunnel,session}_send() functions for sending messages in tunnel or session context. Session messages have their session ID automatically set and switch to tunnel context for sending messages. Though the 'debug' parameter is removed from function prototypes, the logging mechanism is respected: HELLO and ZLB are displayed as 'debug' messages while other message types use 'info2'. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-15l2tp: Display error message when tunnel creation fails (CLI)Guillaume Nault
Print details about errors that can occur when using the "l2tp create tunnel" command line. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-15l2tp: Display error message when session creation fails (CLI)Guillaume Nault
Print details about errors that can occur when using the "l2tp create session" command line. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-15l2tp: Strict error management in start_udp_server()Guillaume Nault
Check for errors in start_udp_server() and return exit status to calling function. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-15l2tp: Allocate memory with functions from memdebug.hGuillaume Nault
Use memdebug variants of {m,re}alloc() so that the corresponding _free() will work correctly if MEMDEBUG is defined. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-15l2tp: Handle l2tp_session_free() failuresGuillaume Nault
Update l2tp_session_free's prototype to return its error status. Do the opposite for l2tp_tunnel_cancel_session (make it return void) as it never fails. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-03-15l2tp: Use tunnel/session logging functionsGuillaume Nault
Define macros for logging tunnel or session messages with automatic context information display. Use these macros to replace most existing error messages + add missing ones. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Flush ack-ed messages from retransmission queueGuillaume Nault
When several messages are sent consecutively, the peer can reply with a single ZLB to acknowledge all messages. In this case, removing only the first message from the retransmission queue isn't enough (acknowledged messages left in the queue will be retransmitted). This case can happen when replying to an outgoing call request, wich is handled by sending two messages in a row (an OCRP and an OCCN). This patch avoids useless retransmissions by removing all messages acknowledged by peer from the retransmission queue. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Implement outgoing call receptionGuillaume Nault
Handle OCRQ requests when operating as LAC. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Fix Result Code AVP byte orderGuillaume Nault
Send the Result and Error fields of StopCCN and CDN messages in network byte order. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Take StopCCN's AVPs into accountGuillaume Nault
Use the Assigned Tunnel ID and Result Code AVPs when handling StopCCN messages. The Result Code AVP is used to improve log messages, while the Assigned Tunnel ID is used to set the tunnel's peer-tid field. Setting peer-tid makes the ZLB to be sent to the right tunnel in case no Assigned Tunnel ID had been received yet (this happens when the host sends an SCCRQ but the peer directly rejects the connection with StopCCN). Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Acknowledge SLI messagesGuillaume Nault
Send a ZLB after reception of Set-Link-Info (SLI) messages to avoid retransmissions from the LNS. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Declare message receptions attributes as constGuillaume Nault
Add const qualifier to attributes pointers used for parsing incoming L2TP messages. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Define message type attribute as constantGuillaume Nault
Add const qualifier to the Message Type variable used by the generic L2TP reception functions. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Define packet as constant in reception functionsGuillaume Nault
Add const qualifier to packet passed to l2tp_recv_*() functions. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Define option variables as constantGuillaume Nault
Add const qualifiers to the string used for reading configuration. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Check for IP range before creating new tunnelsGuillaume Nault
Refuse to initiate tunnel creation to peers not defined in the "client-ip-range" configuration section. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-13l2tp: Fix challenge response with no secretGuillaume Nault
Don't call strlen() if conf_secret is NULL. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-12l2tp: Add support for placing incomming callsGuillaume Nault
Implement incomming call placement for tunnels operating as LAC. A user can place incomming calls using the command line interface. For example, the following command will place a call on tunnel 1: accel-ppp# l2tp create session tid 1 Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-12l2tp: Implement on demand tunnel creationGuillaume Nault
Add the "l2tp create tunnel" command to initiate new tunnels. This command accepts three parameters: * peer-addr (mandatory): IPv4 address of the remote tunnel end. * host-addr (optional): IPv4 address of the local tunnel end. By default the "l2tp bind" configuration option is used (if defined). * mode (optional): tunnel operating mode: lac (default) or lns. Example with the telnet interface: accel-ppp# l2tp create tunnel peer-addr 192.0.2.1 host-addr 192.0.2.2 The above command tells accel-ppp to establish a new tunnel with the peer at 192.0.2.1. The local address will be 192.0.2.2 and the tunnel will operate as lac. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-12l2tp: Connect to peer once first reply receivedGuillaume Nault
When peer's port isn't known (i.e. right after a tunnel establishment request has been sent), use the source port of the first peer's response as the destination port of any future L2TP message sent over that tunnel. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-12l2tp: Replace the lns_addr tunnel field by host_addrGuillaume Nault
Rename field lns_addr, as it identifies the host address, whether it be a LAC or a LNS. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
2013-02-12l2tp: Replace the lac_addr tunnel field by peer_addrGuillaume Nault
Rename field lac_addr, as it identifies the peer address, whether it be a LAC or a LNS. Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 06:08:22 +0000