summaryrefslogtreecommitdiff
path: root/packages/linux-kernel/patches/accel-ppp/0001-L2TP-Include-Calling-Number-to-Calling-Station-ID-RA.patch
diff options
context:
space:
mode:
Diffstat (limited to 'packages/linux-kernel/patches/accel-ppp/0001-L2TP-Include-Calling-Number-to-Calling-Station-ID-RA.patch')
-rw-r--r--packages/linux-kernel/patches/accel-ppp/0001-L2TP-Include-Calling-Number-to-Calling-Station-ID-RA.patch183
1 files changed, 0 insertions, 183 deletions
diff --git a/packages/linux-kernel/patches/accel-ppp/0001-L2TP-Include-Calling-Number-to-Calling-Station-ID-RA.patch b/packages/linux-kernel/patches/accel-ppp/0001-L2TP-Include-Calling-Number-to-Calling-Station-ID-RA.patch
deleted file mode 100644
index 0c3141a0..00000000
--- a/packages/linux-kernel/patches/accel-ppp/0001-L2TP-Include-Calling-Number-to-Calling-Station-ID-RA.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 12778d1e9296b6dbf190a80dcf407b24f9821f95 Mon Sep 17 00:00:00 2001
-From: zsdc <taras@vyos.io>
-Date: Tue, 4 Apr 2023 11:15:26 +0300
-Subject: [PATCH] L2TP: Include Calling-Number to Calling-Station-ID RADIUS
- attribute
-
-Patch authored by Alexander Serkin from
-https://phabricator.accel-ppp.org/T59
----
- accel-pppd/ctrl/l2tp/l2tp.c | 112 ++++++++++++++++++++++++++++++------
- 1 file changed, 93 insertions(+), 19 deletions(-)
-
-diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c
-index 027d710..c541c60 100644
---- a/accel-pppd/ctrl/l2tp/l2tp.c
-+++ b/accel-pppd/ctrl/l2tp/l2tp.c
-@@ -123,6 +123,11 @@ struct l2tp_sess_t
- struct l2tp_conn_t *paren_conn;
- uint16_t sid;
- uint16_t peer_sid;
-+/* We will keep l2tp attributes Calling-Number/Called-Number and their length while the session exists */
-+ char *calling_num;
-+ int calling_num_len;
-+ char *called_num;
-+ int called_num_len;
-
- unsigned int ref_count;
- int state1;
-@@ -979,6 +984,10 @@ static void __session_destroy(struct l2tp_sess_t *sess)
- _free(sess->ctrl.calling_station_id);
- if (sess->ctrl.called_station_id)
- _free(sess->ctrl.called_station_id);
-+ if (sess->calling_num)
-+ _free(sess->calling_num);
-+ if (sess->called_num)
-+ _free(sess->called_num);
-
- log_session(log_info2, sess, "session destroyed\n");
-
-@@ -1771,25 +1780,52 @@ static int l2tp_session_start_data_channel(struct l2tp_sess_t *sess)
- sess->ctrl.max_mtu = conf_ppp_max_mtu;
- sess->ctrl.mppe = conf_mppe;
-
-- sess->ctrl.calling_station_id = _malloc(17);
-- if (sess->ctrl.calling_station_id == NULL) {
-- log_session(log_error, sess,
-- "impossible to start data channel:"
-- " allocation of calling station ID failed\n");
-- goto err;
-+ /* If l2tp calling number avp exists, we use it, otherwise we use lac ip */
-+ if (sess->calling_num != NULL) {
-+ sess->ctrl.calling_station_id = _malloc(sess->calling_num_len+1);
-+ if (sess->ctrl.calling_station_id == NULL) {
-+ log_session(log_error, sess,
-+ "impossible to start data channel:"
-+ " allocation of calling station ID failed\n");
-+ goto err;
-+ }else {
-+ strcpy(sess->ctrl.calling_station_id, sess->calling_num);
-+ }
-+ } else {
-+ sess->ctrl.calling_station_id = _malloc(17);
-+ if (sess->ctrl.calling_station_id == NULL) {
-+ log_session(log_error, sess,
-+ "impossible to start data channel:"
-+ " allocation of calling station ID failed\n");
-+ goto err;
-+ } else {
-+ u_inet_ntoa(sess->paren_conn->peer_addr.sin_addr.s_addr,
-+ sess->ctrl.calling_station_id);
-+ }
- }
-- u_inet_ntoa(sess->paren_conn->peer_addr.sin_addr.s_addr,
-- sess->ctrl.calling_station_id);
--
-- sess->ctrl.called_station_id = _malloc(17);
-- if (sess->ctrl.called_station_id == NULL) {
-- log_session(log_error, sess,
-- "impossible to start data channel:"
-- " allocation of called station ID failed\n");
-- goto err;
-+ /* If l2tp called number avp exists, we use it, otherwise we use my ip */
-+ if (sess->called_num != NULL) {
-+ sess->ctrl.called_station_id = _malloc(sess->called_num_len+1);
-+ if (sess->ctrl.called_station_id == NULL) {
-+ log_session(log_error, sess,
-+ "impossible to start data channel:"
-+ " allocation of called station ID failed\n");
-+ goto err;
-+ } else {
-+ strcpy(sess->ctrl.called_station_id, sess->called_num);
-+ }
-+ } else {
-+ sess->ctrl.called_station_id = _malloc(17);
-+ if (sess->ctrl.called_station_id == NULL) {
-+ log_session(log_error, sess,
-+ "impossible to start data channel:"
-+ " allocation of called station ID failed\n");
-+ goto err;
-+ } else {
-+ u_inet_ntoa(sess->paren_conn->host_addr.sin_addr.s_addr,
-+ sess->ctrl.called_station_id);
-+ }
- }
-- u_inet_ntoa(sess->paren_conn->host_addr.sin_addr.s_addr,
-- sess->ctrl.called_station_id);
-
- if (conf_ip_pool) {
- sess->ppp.ses.ipv4_pool_name = _strdup(conf_ip_pool);
-@@ -3295,6 +3331,10 @@ static int l2tp_recv_ICRQ(struct l2tp_conn_t *conn,
- uint16_t sid = 0;
- uint16_t res = 0;
- uint16_t err = 0;
-+ uint8_t *calling[254] = {0};
-+ uint8_t *called[254] = {0};
-+ int n = 0;
-+ int m = 0;
-
- if (conn->state != STATE_ESTB && conn->lns_mode) {
- log_tunnel(log_warn, conn, "discarding unexpected ICRQ\n");
-@@ -3332,7 +3372,17 @@ static int l2tp_recv_ICRQ(struct l2tp_conn_t *conn,
- case Call_Serial_Number:
- case Bearer_Type:
- case Calling_Number:
-+ /* Save Calling-Number L2TP attribute locally */
-+ if (attr->attr->id == Calling_Number) {
-+ n = attr->length;
-+ memcpy(calling,attr->val.octets,n);
-+ }
- case Called_Number:
-+ /* Save Called-Number L2TP attribute locally */
-+ if (attr->attr->id == Called_Number) {
-+ m = attr->length;
-+ memcpy(called,attr->val.octets,m);
-+ }
- case Sub_Address:
- case Physical_Channel_ID:
- break;
-@@ -3371,6 +3421,30 @@ static int l2tp_recv_ICRQ(struct l2tp_conn_t *conn,
- sess->peer_sid = peer_sid;
- sid = sess->sid;
-
-+ /* Allocate memory for Calling-Number if exists, and put it to l2tp_sess_t structure */
-+ if (calling != NULL && n > 0) {
-+ sess->calling_num = _malloc(n+1);
-+ if (sess->calling_num == NULL) {
-+ log_tunnel(log_warn, conn, "can't allocate memory for Calling Number attribute. Will use LAC IP instead\n");
-+ }else{
-+ memcpy(sess->calling_num, calling, n);
-+ sess->calling_num[n] = '\0';
-+ sess->calling_num_len = n;
-+ }
-+ }
-+
-+ /* Allocate memory for Called-Number if exists, and put it to l2tp_sess_t structure */
-+ if (called != NULL && m > 1) {
-+ sess->called_num = _malloc(m+1);
-+ if (sess->called_num == NULL) {
-+ log_tunnel(log_warn, conn, "can't allocate memory for Called Number attribute. Will use my IP instead\n");
-+ } else {
-+ memcpy(sess->called_num, called, m);
-+ sess->called_num[m] = '\0';
-+ sess->called_num_len = m;
-+ }
-+ }
-+
- if (unknown_attr) {
- log_tunnel(log_error, conn, "impossible to handle ICRQ:"
- " unknown mandatory attribute type %i,"
-@@ -3390,8 +3464,8 @@ static int l2tp_recv_ICRQ(struct l2tp_conn_t *conn,
- goto out_reject;
- }
-
-- log_tunnel(log_info1, conn, "new session %hu-%hu created following"
-- " reception of ICRQ\n", sid, peer_sid);
-+ log_tunnel(log_info1, conn, "new session %hu-%hu with calling num %s len %d, called num %s len %d created following"
-+ " reception of ICRQ\n", sid, peer_sid, sess->calling_num, sess->calling_num_len, sess->called_num, sess->called_num_len);
-
- return 0;
-
---
-2.34.1
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 03:41:17 +0000